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

[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 at 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 at 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 ---