rpms/k9copy/F-12 k9copy-2.3.4-ffmpeg.patch, NONE, 1.1 .cvsignore, 1.9, 1.10 k9copy.spec, 1.16, 1.17 sources, 1.9, 1.10 k9copy-2.3.1-ffmpeg.patch, 1.1, NONE
by Rex Dieter
Author: rdieter
Update of /cvs/free/rpms/k9copy/F-12
In directory se02.es.rpmfusion.net:/tmp/cvs-serv1059
Modified Files:
.cvsignore k9copy.spec sources
Added Files:
k9copy-2.3.4-ffmpeg.patch
Removed Files:
k9copy-2.3.1-ffmpeg.patch
Log Message:
* Wed Dec 23 2009 Rex Dieter <rdieter(a)fedoraproject.org> 2.3.4-1
- k9copy-2.3.4
k9copy-2.3.4-ffmpeg.patch:
k9avidecode.cpp | 4 ++--
k9avidecode.h | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
--- NEW FILE k9copy-2.3.4-ffmpeg.patch ---
diff -up k9copy-2.3.4-Source/src/import/k9avidecode.cpp.ffmpeg k9copy-2.3.4-Source/src/import/k9avidecode.cpp
--- k9copy-2.3.4-Source/src/import/k9avidecode.cpp.ffmpeg 2009-12-06 04:13:36.000000000 -0600
+++ k9copy-2.3.4-Source/src/import/k9avidecode.cpp 2009-12-23 12:57:34.186559784 -0600
@@ -10,14 +10,14 @@
//
//
#include "k9avidecode.h"
-#include <avcodec.h>
+#include <libavcodec/avcodec.h>
#include <qimage.h>
#include <dlfcn.h>
#include <klocale.h>
#ifdef HAVE_SWSCALE
-#include "swscale.h"
+#include <libswscale/swscale.h>
static int sws_flags = SWS_BICUBIC;
diff -up k9copy-2.3.4-Source/src/import/k9avidecode.h.ffmpeg k9copy-2.3.4-Source/src/import/k9avidecode.h
--- k9copy-2.3.4-Source/src/import/k9avidecode.h.ffmpeg 2009-12-06 04:13:36.000000000 -0600
+++ k9copy-2.3.4-Source/src/import/k9avidecode.h 2009-12-23 12:56:18.225559575 -0600
@@ -14,12 +14,12 @@
#include "k9common.h"
#include <qobject.h>
-#include <avformat.h>
+#include <libavformat/avformat.h>
#include <qimage.h>
#include <cstdlib>
#include <QObject>
#ifdef HAVE_SWSCALE
-#include <swscale.h>
+#include <libswscale/swscale.h>
#endif
/**
@author Jean-Michel PETIT <k9copy(a)free.fr>
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/k9copy/F-12/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore 29 Aug 2009 18:23:04 -0000 1.9
+++ .cvsignore 23 Dec 2009 19:38:27 -0000 1.10
@@ -1 +1 @@
-k9copy-2.3.3-Source.tar.gz
+k9copy-2.3.4-Source.tar.gz
Index: k9copy.spec
===================================================================
RCS file: /cvs/free/rpms/k9copy/F-12/k9copy.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- k9copy.spec 29 Aug 2009 18:45:35 -0000 1.16
+++ k9copy.spec 23 Dec 2009 19:38:27 -0000 1.17
@@ -1,6 +1,6 @@
Name: k9copy
-Version: 2.3.3
+Version: 2.3.4
Release: 1%{?dist}
Summary: Video DVD backup and creation program
Group: Applications/Multimedia
@@ -9,7 +9,7 @@
Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}-Source.tar.gz
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Patch1: k9copy-2.3.1-ffmpeg.patch
+Patch1: k9copy-2.3.4-ffmpeg.patch
Patch2: k9copy-2.1.0-mimetype.patch
BuildRequires: cmake
@@ -104,6 +104,9 @@
%changelog
+* Wed Dec 23 2009 Rex Dieter <rdieter(a)fedoraproject.org> 2.3.4-1
+- k9copy-2.3.4
+
* Sat Aug 29 2009 Rex Dieter <rdieter(a)fedoraproject.org> 2.3.3-1
- k9copy-2.3.3
Index: sources
===================================================================
RCS file: /cvs/free/rpms/k9copy/F-12/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources 29 Aug 2009 18:23:04 -0000 1.9
+++ sources 23 Dec 2009 19:38:27 -0000 1.10
@@ -1 +1 @@
-8c3f3dc82949f9629cf619cd8aeb8160 k9copy-2.3.3-Source.tar.gz
+7b266bb548c4c649f3a691490ccae81c k9copy-2.3.4-Source.tar.gz
--- k9copy-2.3.1-ffmpeg.patch DELETED ---
14 years, 11 months
rpms/k9copy/devel k9copy-2.3.4-ffmpeg.patch, NONE, 1.1 .cvsignore, 1.9, 1.10 k9copy.spec, 1.16, 1.17 sources, 1.9, 1.10 k9copy-2.3.1-ffmpeg.patch, 1.1, NONE
by Rex Dieter
Author: rdieter
Update of /cvs/free/rpms/k9copy/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv826
Modified Files:
.cvsignore k9copy.spec sources
Added Files:
k9copy-2.3.4-ffmpeg.patch
Removed Files:
k9copy-2.3.1-ffmpeg.patch
Log Message:
* Wed Dec 23 2009 Rex Dieter <rdieter(a)fedoraproject.org> 2.3.4-1
- k9copy-2.3.4
k9copy-2.3.4-ffmpeg.patch:
k9avidecode.cpp | 4 ++--
k9avidecode.h | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
--- NEW FILE k9copy-2.3.4-ffmpeg.patch ---
diff -up k9copy-2.3.4-Source/src/import/k9avidecode.cpp.ffmpeg k9copy-2.3.4-Source/src/import/k9avidecode.cpp
--- k9copy-2.3.4-Source/src/import/k9avidecode.cpp.ffmpeg 2009-12-06 04:13:36.000000000 -0600
+++ k9copy-2.3.4-Source/src/import/k9avidecode.cpp 2009-12-23 12:57:34.186559784 -0600
@@ -10,14 +10,14 @@
//
//
#include "k9avidecode.h"
-#include <avcodec.h>
+#include <libavcodec/avcodec.h>
#include <qimage.h>
#include <dlfcn.h>
#include <klocale.h>
#ifdef HAVE_SWSCALE
-#include "swscale.h"
+#include <libswscale/swscale.h>
static int sws_flags = SWS_BICUBIC;
diff -up k9copy-2.3.4-Source/src/import/k9avidecode.h.ffmpeg k9copy-2.3.4-Source/src/import/k9avidecode.h
--- k9copy-2.3.4-Source/src/import/k9avidecode.h.ffmpeg 2009-12-06 04:13:36.000000000 -0600
+++ k9copy-2.3.4-Source/src/import/k9avidecode.h 2009-12-23 12:56:18.225559575 -0600
@@ -14,12 +14,12 @@
#include "k9common.h"
#include <qobject.h>
-#include <avformat.h>
+#include <libavformat/avformat.h>
#include <qimage.h>
#include <cstdlib>
#include <QObject>
#ifdef HAVE_SWSCALE
-#include <swscale.h>
+#include <libswscale/swscale.h>
#endif
/**
@author Jean-Michel PETIT <k9copy(a)free.fr>
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/k9copy/devel/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore 29 Aug 2009 18:23:04 -0000 1.9
+++ .cvsignore 23 Dec 2009 19:36:58 -0000 1.10
@@ -1 +1 @@
-k9copy-2.3.3-Source.tar.gz
+k9copy-2.3.4-Source.tar.gz
Index: k9copy.spec
===================================================================
RCS file: /cvs/free/rpms/k9copy/devel/k9copy.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- k9copy.spec 29 Aug 2009 18:45:35 -0000 1.16
+++ k9copy.spec 23 Dec 2009 19:36:58 -0000 1.17
@@ -1,6 +1,6 @@
Name: k9copy
-Version: 2.3.3
+Version: 2.3.4
Release: 1%{?dist}
Summary: Video DVD backup and creation program
Group: Applications/Multimedia
@@ -9,7 +9,7 @@
Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}-Source.tar.gz
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Patch1: k9copy-2.3.1-ffmpeg.patch
+Patch1: k9copy-2.3.4-ffmpeg.patch
Patch2: k9copy-2.1.0-mimetype.patch
BuildRequires: cmake
@@ -104,6 +104,9 @@
%changelog
+* Wed Dec 23 2009 Rex Dieter <rdieter(a)fedoraproject.org> 2.3.4-1
+- k9copy-2.3.4
+
* Sat Aug 29 2009 Rex Dieter <rdieter(a)fedoraproject.org> 2.3.3-1
- k9copy-2.3.3
Index: sources
===================================================================
RCS file: /cvs/free/rpms/k9copy/devel/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources 29 Aug 2009 18:23:04 -0000 1.9
+++ sources 23 Dec 2009 19:36:58 -0000 1.10
@@ -1 +1 @@
-8c3f3dc82949f9629cf619cd8aeb8160 k9copy-2.3.3-Source.tar.gz
+7b266bb548c4c649f3a691490ccae81c k9copy-2.3.4-Source.tar.gz
--- k9copy-2.3.1-ffmpeg.patch DELETED ---
14 years, 11 months
rpms/xsnow/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1
by Xavier Lamien
Author: laxathom
Update of /cvs/nonfree/rpms/xsnow/devel
In directory se02.es.rpmfusion.net:/home/rpmfusion/laxathom/nonfree/owners/tmpcvse15774/rpms/xsnow/devel
Added Files:
.cvsignore Makefile sources
Log Message:
Setup of module xsnow
--- NEW FILE .cvsignore ---
--- NEW FILE Makefile ---
# Makefile for source rpm: xsnow
# $Id: Makefile,v 1.1 2009/12/22 21:31:09 laxathom Exp $
NAME := xsnow
SPECFILE = $(firstword $(wildcard *.spec))
define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef
MAKEFILE_COMMON := $(shell $(find-makefile-common))
ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef
MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif
include $(MAKEFILE_COMMON)
--- NEW FILE sources ---
14 years, 11 months
rpms/xsnow Makefile,NONE,1.1 import.log,NONE,1.1 pkg.acl,NONE,1.1
by Xavier Lamien
Author: laxathom
Update of /cvs/nonfree/rpms/xsnow
In directory se02.es.rpmfusion.net:/home/rpmfusion/laxathom/nonfree/owners/tmpcvse15774/rpms/xsnow
Added Files:
Makefile import.log pkg.acl
Log Message:
Setup of module xsnow
--- NEW FILE Makefile ---
# Top level Makefile for module xsnow
all : CVS/Root common-update
@cvs update
common-update : common
@cd common && cvs update
common : CVS/Root
@cvs checkout common
CVS/Root :
@echo "ERROR: This does not look like a CVS checkout" && exit 1
clean :
@find . -type f -name *~ -exec rm -fv {} \;
--- NEW FILE import.log ---
--- NEW FILE pkg.acl ---
14 years, 11 months
rpms/xsnow - New directory
by Xavier Lamien
Author: laxathom
Update of /cvs/nonfree/rpms/xsnow
In directory se02.es.rpmfusion.net:/home/rpmfusion/laxathom/nonfree/owners/tmpcvse15774/rpms/xsnow
Log Message:
Directory /cvs/nonfree/rpms/xsnow added to the repository
14 years, 11 months
rpms/xsnow/devel - New directory
by Xavier Lamien
Author: laxathom
Update of /cvs/nonfree/rpms/xsnow/devel
In directory se02.es.rpmfusion.net:/home/rpmfusion/laxathom/nonfree/owners/tmpcvse15774/rpms/xsnow/devel
Log Message:
Directory /cvs/nonfree/rpms/xsnow/devel added to the repository
14 years, 11 months
rpms/ultrastardx/F-11 ultrastardx-fonts.ini-fedora.patch,NONE,1.1
by Felix Kaechele
Author: felix
Update of /cvs/free/rpms/ultrastardx/F-11
In directory se02.es.rpmfusion.net:/tmp/cvs-serv22321
Added Files:
ultrastardx-fonts.ini-fedora.patch
Log Message:
* Mon Dec 21 2009 Felix Kaechele <heffer(a)fedoraproject.org> - 1.1.1-1.9.r2052
- new snapshot
- now builds on F12 again
- improved specfile
- improved ultrastardx-snapshot.sh
ultrastardx-fonts.ini-fedora.patch:
fonts.ini | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
--- NEW FILE ultrastardx-fonts.ini-fedora.patch ---
diff -ruN ultrastardx.orig/game/fonts/fonts.ini ultrastardx/game/fonts/fonts.ini
--- ultrastardx.orig/game/fonts/fonts.ini 2009-12-21 21:38:54.560540217 +0100
+++ ultrastardx/game/fonts/fonts.ini 2009-12-21 21:39:14.862665570 +0100
@@ -1,11 +1,11 @@
[Normal]
-File=FreeSans/FreeSans.ttf
+File=/usr/share/fonts/liberation/LiberationSans-Regular.ttf
[Bold]
-File=FreeSans/FreeSansBold.ttf
+File=/usr/share/fonts/liberation/LiberationSans-Bold.ttf
[Outline1]
-File=DejaVu/DejaVuSans-Bold.ttf
+File=/usr/share/fonts/liberation/LiberationSans-Bold.ttf
[Outline2]
-File=FreeSans/FreeSansBold.ttf
+File=/usr/share/fonts/liberation/LiberationSans-Bold.ttf
14 years, 11 months
rpms/ultrastardx/F-11 .cvsignore, 1.5, 1.6 sources, 1.5, 1.6 ultrastardx-snapshot.sh, 1.1, 1.2 ultrastardx.spec, 1.8, 1.9
by Felix Kaechele
Author: felix
Update of /cvs/free/rpms/ultrastardx/F-11
In directory se02.es.rpmfusion.net:/tmp/cvs-serv22193
Modified Files:
.cvsignore sources ultrastardx-snapshot.sh ultrastardx.spec
Log Message:
* Mon Dec 21 2009 Felix Kaechele <heffer(a)fedoraproject.org> - 1.1.1-1.9.r2052
- new snapshot
- now builds on F12 again
- improved specfile
- improved ultrastardx-snapshot.sh
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/ultrastardx/F-11/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore 19 Jul 2009 21:15:50 -0000 1.5
+++ .cvsignore 21 Dec 2009 21:36:22 -0000 1.6
@@ -1 +1 @@
-ultrastardx-20090719.tar.lzma
+ultrastardx-r2052.tar.xz
Index: sources
===================================================================
RCS file: /cvs/free/rpms/ultrastardx/F-11/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources 19 Jul 2009 21:15:50 -0000 1.5
+++ sources 21 Dec 2009 21:36:22 -0000 1.6
@@ -1 +1 @@
-5fda615d86e759581ff5d2c3fdbb9933 ultrastardx-20090719.tar.lzma
+f181bdb984f4d386dd5cb3f51f892ae2 ultrastardx-r2052.tar.xz
Index: ultrastardx-snapshot.sh
===================================================================
RCS file: /cvs/free/rpms/ultrastardx/F-11/ultrastardx-snapshot.sh,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ultrastardx-snapshot.sh 3 Mar 2009 22:15:05 -0000 1.1
+++ ultrastardx-snapshot.sh 21 Dec 2009 21:36:22 -0000 1.2
@@ -12,22 +12,23 @@
unset CDPATH
pwd=$(pwd)
-svn=$(date +%Y%m%d)
+
cd "$tmp"
+svnpath=https://ultrastardx.svn.sourceforge.net/svnroot/ultrastardx/trunk
+svn=`svn info $svnpath | grep Revision | awk '{print $2}'`
-svn checkout -r {$svn} https://ultrastardx.svn.sourceforge.net/svnroot/ultrastardx/trunk ultrastardx-$svn
+svn export $svnpath ultrastardx-r$svn
-cd ultrastardx-$svn
-find . -type d -name .svn -print0 | xargs -0r rm -rf
+cd ultrastardx-r$svn
# remove installer stuff as it's not needed for linux
rm -rf installer*
# remove precompiled stuff
find . -name *.res -exec rm -rf {} \;
# remove fonts, fedora has it's own
-find game/fonts/ -name *.ttf -exec rm -rf {} \;
+rm -rf game/fonts/DejaVu game/fonts/FreeSans
cd ..
-tar --lzma -cf "$pwd"/ultrastardx-$svn.tar.lzma ultrastardx-$svn
+tar --xz -cf "$pwd"/ultrastardx-r$svn.tar.xz ultrastardx-r$svn
cd - >/dev/null
Index: ultrastardx.spec
===================================================================
RCS file: /cvs/free/rpms/ultrastardx/F-11/ultrastardx.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- ultrastardx.spec 19 Jul 2009 21:15:50 -0000 1.8
+++ ultrastardx.spec 21 Dec 2009 21:36:22 -0000 1.9
@@ -1,22 +1,24 @@
-%define prever 20090719
+%define prever r2052
Name: ultrastardx
Version: 1.1.1
-Release: 1%{?prever:.8.%{prever}}%{?dist}
+Release: 1%{?prever:.9.%{prever}}%{?dist}
Summary: Karaoke game inspired by a popular commercial karaoke game
Group: Amusements/Games
License: GPLv2+
URL: http://www.ultrastardeluxe.org
# Source0: svn snapshot; use supplied ultrastardx-snapshot.sh to get one
-Source0: ultrastardx%{?prever:-%{prever}}.tar.lzma
-Source1: ultrastardx-32x32.png
-Source2: ultrastardx-256x256.png
-Source100: ultrastardx-snapshot.sh
-Patch0: ultrastardx-desktop.patch
+Source0: %{name}%{?prever:-%{prever}}.tar.xz
+Source1: %{name}-32x32.png
+Source2: %{name}-256x256.png
+Source100: %{name}-snapshot.sh
+Patch0: %{name}-desktop.patch
+# This changes the font path to Liberation fonts
+Patch1: %{name}-fonts.ini-fedora.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Requires: bitstream-vera-sans-fonts gnu-free-sans-fonts
+Requires: liberation-sans-fonts
BuildRequires: fpc desktop-file-utils
BuildRequires: ffmpeg-devel freetype-devel libpng-devel libprojectM-devel
@@ -32,20 +34,12 @@
%prep
%setup -q -n %{name}%{?prever:-%{prever}}
%patch0 -p1
-
-# replace the font paths with Fedora's own
-sed -i 's|File=|File=%{_datadir}/fonts/|g' game/fonts/fontsTTF.ini
-sed -i 's|FreeSans|freefont/FreeSans|g' game/fonts/fontsTTF.ini
-sed -i 's|Vera|bitstream-vera/Vera|g' game/fonts/fontsTTF.ini
+%patch1 -p1
iconv -f iso-8859-1 -t utf-8 ChangeLog.GERMAN.txt > ChangeLog.GERMAN.txt.utf-8
touch -r ChangeLog.GERMAN.txt ChangeLog.GERMAN.txt.utf-8
mv ChangeLog.GERMAN.txt.utf-8 ChangeLog.GERMAN.txt
-tr -d \\r < COPYRIGHT.txt > COPYRIGHT.txt.unix
-touch -r COPYRIGHT.txt COPYRIGHT.txt.unix
-mv COPYRIGHT.txt.unix COPYRIGHT.txt
-
%build
%configure --with-libprojectM=nocheck libprojectM_VERSION=$(pkg-config --modversion libprojectM) libprojectM_INCLUDEDIR="/usr/include" libprojectM_DATADIR="/usr/share/projectM"
make %{?_smp_mflags} PFLAGS_EXTRA="-fPIC"
@@ -62,6 +56,8 @@
install -Dpm 644 %{SOURCE2} \
$RPM_BUILD_ROOT%{_datadir}/icons/hicolor/256x256/apps/%{name}.png
+# only used for UTF-8 unaware systems
+rm $RPM_BUILD_ROOT%{_datadir}/%{name}/languages/convert.sh
%clean
rm -rf $RPM_BUILD_ROOT
@@ -84,7 +80,7 @@
%files
%defattr(-,root,root,-)
%doc AUTHORS.txt ChangeLog.GERMAN.txt ChangeLog.txt COPYING.txt COPYRIGHT.txt
-%doc README.txt
+%doc README.txt RELEASEBLOCKERS.txt
%{_bindir}/%{name}
%{_datadir}/%{name}
%{_datadir}/applications/*.desktop
@@ -92,6 +88,12 @@
%changelog
+* Mon Dec 21 2009 Felix Kaechele <heffer(a)fedoraproject.org> - 1.1.1-1.9.r2052
+- new snapshot
+- now builds on F12 again
+- improved specfile
+- improved ultrastardx-snapshot.sh
+
* Sun Jul 19 2009 Felix Kaechele <heffer(a)fedoraproject.org> - 1.1.1-1.8.20090719
- new snapshot
- party mode works again, tested it today :)
14 years, 11 months
rpms/ultrastardx/F-12 ultrastardx-fonts.ini-fedora.patch, NONE, 1.1 .cvsignore, 1.5, 1.6 sources, 1.5, 1.6 ultrastardx-snapshot.sh, 1.1, 1.2 ultrastardx.spec, 1.9, 1.10 ultrastardx-ffmpeg-headers.patch, 1.1, NONE
by Felix Kaechele
Author: felix
Update of /cvs/free/rpms/ultrastardx/F-12
In directory se02.es.rpmfusion.net:/tmp/cvs-serv22066
Modified Files:
.cvsignore sources ultrastardx-snapshot.sh ultrastardx.spec
Added Files:
ultrastardx-fonts.ini-fedora.patch
Removed Files:
ultrastardx-ffmpeg-headers.patch
Log Message:
* Mon Dec 21 2009 Felix Kaechele <heffer(a)fedoraproject.org> - 1.1.1-2.9.r2052
- new snapshot
- now builds on F12 again
- improved specfile
- improved ultrastardx-snapshot.sh
ultrastardx-fonts.ini-fedora.patch:
fonts.ini | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
--- NEW FILE ultrastardx-fonts.ini-fedora.patch ---
diff -ruN ultrastardx.orig/game/fonts/fonts.ini ultrastardx/game/fonts/fonts.ini
--- ultrastardx.orig/game/fonts/fonts.ini 2009-12-21 21:38:54.560540217 +0100
+++ ultrastardx/game/fonts/fonts.ini 2009-12-21 21:39:14.862665570 +0100
@@ -1,11 +1,11 @@
[Normal]
-File=FreeSans/FreeSans.ttf
+File=/usr/share/fonts/liberation/LiberationSans-Regular.ttf
[Bold]
-File=FreeSans/FreeSansBold.ttf
+File=/usr/share/fonts/liberation/LiberationSans-Bold.ttf
[Outline1]
-File=DejaVu/DejaVuSans-Bold.ttf
+File=/usr/share/fonts/liberation/LiberationSans-Bold.ttf
[Outline2]
-File=FreeSans/FreeSansBold.ttf
+File=/usr/share/fonts/liberation/LiberationSans-Bold.ttf
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/ultrastardx/F-12/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore 19 Jul 2009 21:14:27 -0000 1.5
+++ .cvsignore 21 Dec 2009 21:35:33 -0000 1.6
@@ -1 +1 @@
-ultrastardx-20090719.tar.lzma
+ultrastardx-r2052.tar.xz
Index: sources
===================================================================
RCS file: /cvs/free/rpms/ultrastardx/F-12/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources 19 Jul 2009 21:14:27 -0000 1.5
+++ sources 21 Dec 2009 21:35:33 -0000 1.6
@@ -1 +1 @@
-5fda615d86e759581ff5d2c3fdbb9933 ultrastardx-20090719.tar.lzma
+f181bdb984f4d386dd5cb3f51f892ae2 ultrastardx-r2052.tar.xz
Index: ultrastardx-snapshot.sh
===================================================================
RCS file: /cvs/free/rpms/ultrastardx/F-12/ultrastardx-snapshot.sh,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ultrastardx-snapshot.sh 3 Mar 2009 22:15:05 -0000 1.1
+++ ultrastardx-snapshot.sh 21 Dec 2009 21:35:33 -0000 1.2
@@ -12,22 +12,23 @@
unset CDPATH
pwd=$(pwd)
-svn=$(date +%Y%m%d)
+
cd "$tmp"
+svnpath=https://ultrastardx.svn.sourceforge.net/svnroot/ultrastardx/trunk
+svn=`svn info $svnpath | grep Revision | awk '{print $2}'`
-svn checkout -r {$svn} https://ultrastardx.svn.sourceforge.net/svnroot/ultrastardx/trunk ultrastardx-$svn
+svn export $svnpath ultrastardx-r$svn
-cd ultrastardx-$svn
-find . -type d -name .svn -print0 | xargs -0r rm -rf
+cd ultrastardx-r$svn
# remove installer stuff as it's not needed for linux
rm -rf installer*
# remove precompiled stuff
find . -name *.res -exec rm -rf {} \;
# remove fonts, fedora has it's own
-find game/fonts/ -name *.ttf -exec rm -rf {} \;
+rm -rf game/fonts/DejaVu game/fonts/FreeSans
cd ..
-tar --lzma -cf "$pwd"/ultrastardx-$svn.tar.lzma ultrastardx-$svn
+tar --xz -cf "$pwd"/ultrastardx-r$svn.tar.xz ultrastardx-r$svn
cd - >/dev/null
Index: ultrastardx.spec
===================================================================
RCS file: /cvs/free/rpms/ultrastardx/F-12/ultrastardx.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- ultrastardx.spec 21 Oct 2009 13:31:40 -0000 1.9
+++ ultrastardx.spec 21 Dec 2009 21:35:33 -0000 1.10
@@ -1,22 +1,24 @@
-%define prever 20090719
+%define prever r2052
Name: ultrastardx
Version: 1.1.1
-Release: 2%{?prever:.8.%{prever}}%{?dist}
+Release: 2%{?prever:.9.%{prever}}%{?dist}
Summary: Karaoke game inspired by a popular commercial karaoke game
Group: Amusements/Games
License: GPLv2+
URL: http://www.ultrastardeluxe.org
# Source0: svn snapshot; use supplied ultrastardx-snapshot.sh to get one
-Source0: ultrastardx%{?prever:-%{prever}}.tar.lzma
-Source1: ultrastardx-32x32.png
-Source2: ultrastardx-256x256.png
-Source100: ultrastardx-snapshot.sh
-Patch0: ultrastardx-desktop.patch
+Source0: %{name}%{?prever:-%{prever}}.tar.xz
+Source1: %{name}-32x32.png
+Source2: %{name}-256x256.png
+Source100: %{name}-snapshot.sh
+Patch0: %{name}-desktop.patch
+# This changes the font path to Liberation fonts
+Patch1: %{name}-fonts.ini-fedora.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Requires: bitstream-vera-sans-fonts gnu-free-sans-fonts
+Requires: liberation-sans-fonts
BuildRequires: fpc desktop-file-utils
BuildRequires: ffmpeg-devel freetype-devel libpng-devel libprojectM-devel
@@ -32,20 +34,12 @@
%prep
%setup -q -n %{name}%{?prever:-%{prever}}
%patch0 -p1
-
-# replace the font paths with Fedora's own
-sed -i 's|File=|File=%{_datadir}/fonts/|g' game/fonts/fontsTTF.ini
-sed -i 's|FreeSans|freefont/FreeSans|g' game/fonts/fontsTTF.ini
-sed -i 's|Vera|bitstream-vera/Vera|g' game/fonts/fontsTTF.ini
+%patch1 -p1
iconv -f iso-8859-1 -t utf-8 ChangeLog.GERMAN.txt > ChangeLog.GERMAN.txt.utf-8
touch -r ChangeLog.GERMAN.txt ChangeLog.GERMAN.txt.utf-8
mv ChangeLog.GERMAN.txt.utf-8 ChangeLog.GERMAN.txt
-tr -d \\r < COPYRIGHT.txt > COPYRIGHT.txt.unix
-touch -r COPYRIGHT.txt COPYRIGHT.txt.unix
-mv COPYRIGHT.txt.unix COPYRIGHT.txt
-
%build
%configure --with-libprojectM=nocheck libprojectM_VERSION=$(pkg-config --modversion libprojectM) libprojectM_INCLUDEDIR="/usr/include" libprojectM_DATADIR="/usr/share/projectM"
make %{?_smp_mflags} PFLAGS_EXTRA="-fPIC"
@@ -62,6 +56,8 @@
install -Dpm 644 %{SOURCE2} \
$RPM_BUILD_ROOT%{_datadir}/icons/hicolor/256x256/apps/%{name}.png
+# only used for UTF-8 unaware systems
+rm $RPM_BUILD_ROOT%{_datadir}/%{name}/languages/convert.sh
%clean
rm -rf $RPM_BUILD_ROOT
@@ -84,7 +80,7 @@
%files
%defattr(-,root,root,-)
%doc AUTHORS.txt ChangeLog.GERMAN.txt ChangeLog.txt COPYING.txt COPYRIGHT.txt
-%doc README.txt
+%doc README.txt RELEASEBLOCKERS.txt
%{_bindir}/%{name}
%{_datadir}/%{name}
%{_datadir}/applications/*.desktop
@@ -92,6 +88,12 @@
%changelog
+* Mon Dec 21 2009 Felix Kaechele <heffer(a)fedoraproject.org> - 1.1.1-2.9.r2052
+- new snapshot
+- now builds on F12 again
+- improved specfile
+- improved ultrastardx-snapshot.sh
+
* Wed Oct 21 2009 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 1.1.1-2.8.20090719
- rebuild for new ffmpeg
--- ultrastardx-ffmpeg-headers.patch DELETED ---
14 years, 11 months
rpms/ultrastardx/devel ultrastardx-fonts.ini-fedora.patch,NONE,1.1
by Felix Kaechele
Author: felix
Update of /cvs/free/rpms/ultrastardx/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv20782
Added Files:
ultrastardx-fonts.ini-fedora.patch
Log Message:
* Mon Dec 21 2009 Felix Kaechele <heffer(a)fedoraproject.org> - 1.1.1-2.9.r2052
- new snapshot
- now builds on F12 again
- improved specfile
- improved ultrastardx-snapshot.sh
ultrastardx-fonts.ini-fedora.patch:
fonts.ini | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
--- NEW FILE ultrastardx-fonts.ini-fedora.patch ---
diff -ruN ultrastardx.orig/game/fonts/fonts.ini ultrastardx/game/fonts/fonts.ini
--- ultrastardx.orig/game/fonts/fonts.ini 2009-12-21 21:38:54.560540217 +0100
+++ ultrastardx/game/fonts/fonts.ini 2009-12-21 21:39:14.862665570 +0100
@@ -1,11 +1,11 @@
[Normal]
-File=FreeSans/FreeSans.ttf
+File=/usr/share/fonts/liberation/LiberationSans-Regular.ttf
[Bold]
-File=FreeSans/FreeSansBold.ttf
+File=/usr/share/fonts/liberation/LiberationSans-Bold.ttf
[Outline1]
-File=DejaVu/DejaVuSans-Bold.ttf
+File=/usr/share/fonts/liberation/LiberationSans-Bold.ttf
[Outline2]
-File=FreeSans/FreeSansBold.ttf
+File=/usr/share/fonts/liberation/LiberationSans-Bold.ttf
14 years, 11 months