rpms/scorched3d/devel .cvsignore, 1.9, 1.10 scorched3d.spec, 1.32, 1.33 sources, 1.9, 1.10

[Hans de Goede]

Author: jwrdegoede

Update of /cvs/extras/rpms/scorched3d/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27738

Modified Files:
	.cvsignore scorched3d.spec sources 
Log Message:
* Sat Dec 27 2008 Hans de Goede <hdegoede at redhat.com> 41.3-4
- Replace included vera font with symlinks to dejavu (rh 477454)



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/scorched3d/devel/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore	22 Jan 2008 11:15:00 -0000	1.9
+++ .cvsignore	27 Dec 2008 15:16:51 -0000	1.10
@@ -1 +1 @@
-Scorched3D-41.3-src.tar.gz
+Scorched3D-41.3-src-clean.tar.gz


Index: scorched3d.spec
===================================================================
RCS file: /cvs/extras/rpms/scorched3d/devel/scorched3d.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- scorched3d.spec	8 Sep 2008 14:20:40 -0000	1.32
+++ scorched3d.spec	27 Dec 2008 15:16:51 -0000	1.33
@@ -1,6 +1,6 @@
 Name:           scorched3d
 Version:        41.3
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Game based loosely on the classic DOS game Scorched Earth
 Group:          Amusements/Games
 License:        GPLv2+
@@ -10,7 +10,8 @@
 # with the included glew removed as that contains files under the non free
 # SGI Free license B. Instead the system version is used, which has the
 # troublesome glew parts replaced
-Source0:        Scorched3D-%{version}-src.tar.gz
+# Also the included vera and the included Arial (bad!) fonts have been removed
+Source0:        Scorched3D-%{version}-src-clean.tar.gz
 Source1:        %{name}.desktop
 Patch1:         %{name}-syslibs.patch
 Patch2:         %{name}-help.patch
@@ -20,6 +21,7 @@
 BuildRequires:  expat-devel libvorbis-devel glew-devel fftw-devel libjpeg-devel
 BuildRequires:  ImageMagick desktop-file-utils
 Requires:       hicolor-icon-theme opengl-games-utils
+Requires:       dejavu-fonts-sans dejavu-fonts-sans-mono
 # Upstream naming compatibility
 Provides:       Scorched3D = %{version}-%{release}
 
@@ -53,6 +55,11 @@
 touch aclocal.m4
 touch configure
 touch `find -name Makefile.in`
+# stop the build from breaking on the removed fonts
+touch data/fonts/test.ttf
+touch data/fonts/vera.ttf
+touch data/fonts/veramobd.ttf
+touch data/fonts/VERA-COPYRIGHT.TXT
 
 
 %build
@@ -68,6 +75,14 @@
 ln -s opengl-game-wrapper.sh $RPM_BUILD_ROOT%{_bindir}/%{name}-wrapper
 rm -r $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
 
+ln -f -s ../../../fonts/dejavu/DejaVuSans-Oblique.ttf \
+  $RPM_BUILD_ROOT%{_datadir}/%{name}/data/fonts/test.ttf
+ln -f -s ../../../fonts/dejavu/DejaVuSans.ttf \
+  $RPM_BUILD_ROOT%{_datadir}/%{name}/data/fonts/vera.ttf
+ln -f -s ../../../fonts/dejavu/DejaVuSansMono-Bold.ttf \
+  $RPM_BUILD_ROOT%{_datadir}/%{name}/data/fonts/veramobd.ttf
+rm $RPM_BUILD_ROOT%{_datadir}/%{name}/data/fonts/VERA-COPYRIGHT.TXT
+
 # below is the desktop file and icon stuff.
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications
 desktop-file-install --vendor fedora            \
@@ -105,6 +120,9 @@
 
 
 %changelog
+* Sat Dec 27 2008 Hans de Goede <hdegoede at redhat.com> 41.3-4
+- Replace included vera font with symlinks to dejavu (rh 477454)
+
 * Sun Sep  7 2008 Hans de Goede <hdegoede at redhat.com> 41.3-3
 - Fix patch fuzz build failure
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/scorched3d/devel/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	22 Jan 2008 11:15:00 -0000	1.9
+++ sources	27 Dec 2008 15:16:51 -0000	1.10
@@ -1 +1 @@
-e9ec511b3876d61bc845e0ddff7adaf3  Scorched3D-41.3-src.tar.gz
+32ac89b61f4ce5679f84b5dc06a93634  Scorched3D-41.3-src-clean.tar.gz