rpms/fillets-ng-data/devel fillets-ng-data.spec,1.8,1.9

[Matthias Saou]

Author: thias

Update of /cvs/extras/rpms/fillets-ng-data/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3171

Modified Files:
	fillets-ng-data.spec 
Log Message:
Replace the 3 identical bundled copies of the FreeSansBold font with symlinks to the original and require the freefont package (#477385).



Index: fillets-ng-data.spec
===================================================================
RCS file: /cvs/extras/rpms/fillets-ng-data/devel/fillets-ng-data.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- fillets-ng-data.spec	24 Feb 2008 12:52:41 -0000	1.8
+++ fillets-ng-data.spec	22 Dec 2008 21:07:30 -0000	1.9
@@ -1,16 +1,18 @@
 Summary: Game data files for Fish Fillets Next Generation
 Name: fillets-ng-data
 Version: 0.8.0
-Release: 1
+Release: 2
 # The GPLv2 is included and nothing indicates "any later version". Exceptions :
 # - images/menu/flags/ is Public Domain
-# - font/ is GPLv2+ (taken from "freefont")
+# - font/ is GPLv2+ (taken from "freefont") but we replace them anyway
 License: GPLv2
 Group: Amusements/Games
 URL: http://fillets.sourceforge.net/
 Source: http://downloads.sf.net/fillets/fillets-ng-data-%{version}.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 Requires: fillets-ng >= 0.7.4
+# For the TTF file used, instead of duplicating it 3 times here
+Requires: freefont
 Obsoletes: fillets-ng-data-cs <= 0.6.0
 BuildArch: noarch
 
@@ -38,6 +40,13 @@
 %{__mkdir_p} %{buildroot}%{_datadir}/fillets-ng
 %{__cp} -a * %{buildroot}%{_datadir}/fillets-ng/
 
+# Replace bundled copy of the fonts with symlinks to the original one
+%{__rm} -f %{buildroot}%{_datadir}/fillets-ng/font/copyright
+for FONTFILE in %{buildroot}%{_datadir}/fillets-ng/font/*.ttf; do
+    %{__rm} -f ${FONTFILE}
+    %{__ln_s} %{_datadir}/fonts/freefont/FreeSansBold.ttf ${FONTFILE}
+done
+
 
 %clean
 %{__rm} -rf %{buildroot}
@@ -51,6 +60,10 @@
 
 
 %changelog
+* Mon Dec 22 2008 Matthias Saou <http://freshrpms.net/> 0.8.0-2
+- Replace the 3 identical bundled copies of the FreeSansBold font with symlinks
+  to the original and require the freefont package (#477385).
+
 * Sun Feb 24 2008 Matthias Saou <http://freshrpms.net/> 0.8.0-1
 - Update to 0.8.0.