rpms/lincity-ng/devel lincity-ng.spec,1.18,1.19

Tom Callaway spot at fedoraproject.org
Mon Jan 12 20:05:25 UTC 2009


Author: spot

Update of /cvs/extras/rpms/lincity-ng/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32359

Modified Files:
	lincity-ng.spec 
Log Message:
symlink to dejavu rather than local copy


Index: lincity-ng.spec
===================================================================
RCS file: /cvs/extras/rpms/lincity-ng/devel/lincity-ng.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- lincity-ng.spec	24 Dec 2008 03:50:56 -0000	1.18
+++ lincity-ng.spec	12 Jan 2009 20:04:55 -0000	1.19
@@ -1,6 +1,6 @@
 Name:		lincity-ng
 Version:	1.97
-Release:	0.1.beta%{?dist}
+Release:	0.2.beta%{?dist}
 License:	GPLv2+
 Group:		Amusements/Games
 Summary:	City Simulation Game
@@ -20,10 +20,11 @@
 
 %package data
 Summary:	Data files needed to run lincity-ng
-# Fonts are Bitstream Vera, data bits are dual licensed GPLv2+ or CC-BY-SA
-License:	(GPLv2+ or CC-BY-SA) and Bitstream Vera
+# data bits are dual licensed GPLv2+ or CC-BY-SA
+License:	GPLv2+ or CC-BY-SA
 Group:		Amusements/Games
 Requires:	%{name} = %{version}-%{release}
+Requires:	dejavu-fonts-sans
 
 %description data
 This package contains the data files (graphics, models, audio) necessary to
@@ -43,6 +44,10 @@
 rm -rf $RPM_BUILD_ROOT
 DESTDIR=$RPM_BUILD_ROOT jam install
 
+# Make a symlink to system font, rather than include a copy of DejaVu Sans
+rm -rf $RPM_BUILD_ROOT%{_datadir}/%{name}/fonts/sans.ttf
+ln -s %{_datadir}/fonts/dejavu/DejaVuSans.ttf $RPM_BUILD_ROOT%{_datadir}/%{name}/fonts/sans.ttf
+
 desktop-file-install --delete-original		\
   --vendor fedora				\
   --dir $RPM_BUILD_ROOT%{_datadir}/applications	\
@@ -65,6 +70,9 @@
 %{_datadir}/lincity-ng/
 
 %changelog
+* Mon Jan 12 2009 Tom "spot" Callaway <tcallawa at redhat.com> 1.97-0.2.beta
+- do not bundle font in data subpackage, use symlink and Requires: dejavu-fonts-sans
+
 * Tue Dec 23 2008 Tom "spot" Callaway <tcallawa at redhat.com> 1.97-0.1.beta
 - update to 1.97.beta
 




More information about the fedora-extras-commits mailing list