bruno pushed to fillets-ng-data (f20). "Don't use bundled font files"

notifications at fedoraproject.org notifications at fedoraproject.org
Sat May 9 20:11:44 UTC 2015


From 91a925754fa80fddbdf2c6d7c3a2d39d487f60bf Mon Sep 17 00:00:00 2001
From: Bruno Wolff III <bruno at wolff.to>
Date: Sat, 9 May 2015 13:04:44 -0500
Subject: Don't use bundled font files


diff --git a/fillets-ng-data.spec b/fillets-ng-data.spec
index d2a0137..8504f5c 100644
--- a/fillets-ng-data.spec
+++ b/fillets-ng-data.spec
@@ -1,7 +1,7 @@
 Summary: Game data files for Fish Fillets Next Generation
 Name: fillets-ng-data
 Version: 1.0.1
-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")
@@ -10,6 +10,8 @@ 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
+# For the TTF file used, instead of duplicating it 3 times here
+Requires: gnu-free-sans-fonts
 Requires: fillets-ng >= 1.0.1
 Obsoletes: fillets-ng-data-cs <= 0.6.0
 BuildArch: noarch
@@ -38,6 +40,12 @@ This package contains the data files required to run the game.
 %{__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/gnu-free/FreeSansBold.ttf ${FONTFILE}
+done
 
 %clean
 %{__rm} -rf %{buildroot}
@@ -58,6 +66,7 @@ This package contains the data files required to run the game.
 %changelog
 * Sat May 09 2015 Bruno Wolff III <bruno at wolff.to> - 1.0.1-2
 - Fix files being listed twice by the spec file
+- Use proper fonts
 
 * Fri May 08 2015 Bruno Wolff III <bruno at wolff.to> - 1.0.1-1
 - Update to latest release
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/fillets-ng-data.git/commit/?h=f20&id=91a925754fa80fddbdf2c6d7c3a2d39d487f60bf


More information about the scm-commits mailing list