rpms/freedink/devel .cvsignore, 1.4, 1.5 freedink.spec, 1.8, 1.9 sources, 1.4, 1.5

[Sylvain Beucler]

Author: beuc

Update of /cvs/pkgs/rpms/freedink/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1689

Modified Files:
	.cvsignore freedink.spec sources 
Log Message:
Update to 1.08.20090916


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/freedink/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore	20 Jan 2009 21:10:30 -0000	1.4
+++ .cvsignore	16 Sep 2009 18:30:52 -0000	1.5
@@ -1 +1 @@
-freedink-1.08.20090120.tar.gz
+freedink-1.08.20090916.tar.gz


Index: freedink.spec
===================================================================
RCS file: /cvs/pkgs/rpms/freedink/devel/freedink.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- freedink.spec	24 Jul 2009 23:06:29 -0000	1.8
+++ freedink.spec	16 Sep 2009 18:30:52 -0000	1.9
@@ -1,6 +1,6 @@
 Name:		freedink
-Version:	1.08.20090120
-Release:	4%{?dist}
+Version:	1.08.20090916
+Release:	1%{?dist}
 Summary:	Adventure and role-playing game
 
 Group:		Amusements/Games
@@ -43,11 +43,17 @@ Requires:	freedink-data
 %if 0%{?suse_version}
 Requires: timidity
 %endif
+
+%if 0%{?with_included_liberation_font}
+# No dependency
+%else
+# Repect Fedora guidelines (see below)
 %if 0%{?fedora}
 Requires: liberation-sans-fonts
 %else
 Requires: liberation-fonts
 %endif
+%endif
 
 %description engine
 Dink Smallwood is an adventure/role-playing game, similar to Zelda,
@@ -88,7 +94,14 @@ desktop-file-validate %{buildroot}/%{_da
 # Policy insists on not installing a different version of "Liberation
 # Sans". Beware that the system version may be different than the
 # official FreeDink font, because Liberation changes regularly.
+%if 0%{?with_included_liberation_font}
+# Include it nonetheless for the sake of avoiding
+# liberation-fonts<->liberation-sans-fonts conflicts in the
+# freedink.org repository
+%else
+# Remove it for compliance with Fedore guidelines
 rm $RPM_BUILD_ROOT%{_datadir}/%{name}/LiberationSans-Regular.ttf
+%endif
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -108,6 +121,11 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Wed Sep 16 2009 Sylvain Beucler <beuc at beuc.net> - 1.08.20090916-1
+- New upstream release
+- Can optionaly bundle default font, to avoid liberation-fonts
+  vs. liberation-sans-fonts issues when building snapshot RPMs
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.08.20090120-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/freedink/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	20 Jan 2009 21:10:30 -0000	1.4
+++ sources	16 Sep 2009 18:30:52 -0000	1.5
@@ -1 +1 @@
-4c877567c85ac3433cc9ae9c2fc54135  freedink-1.08.20090120.tar.gz
+ccd45fb00faf04a3eefcc382d7f7ee9f  freedink-1.08.20090916.tar.gz