rpms/wesnoth/devel wesnoth.spec,1.62,1.63

[Warren Togami 砥上勇]

Author: wtogami

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

Modified Files:
	wesnoth.spec 
Log Message:
- No longer ship Wesnoth's redundant copy of fonts.
  We now symlink to the Fedora packaged fonts that wesnoth expects.
  dejavu-fonts (Latin)
  sazanami-fonts-gothic (Japanese)
  wqy-zenhei-fonts (Chinese)
  We do not explicitly require these fonts.  Normally these fonts would be
  already installed by your system use that language.



Index: wesnoth.spec
===================================================================
RCS file: /cvs/pkgs/rpms/wesnoth/devel/wesnoth.spec,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -r1.62 -r1.63
--- wesnoth.spec	10 Dec 2008 20:46:15 -0000	1.62
+++ wesnoth.spec	14 Dec 2008 23:30:29 -0000	1.63
@@ -1,6 +1,6 @@
 Name:           wesnoth
 Version:        1.4.6
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Turn-based strategy game with a fantasy theme
 
 Group:          Amusements/Games
@@ -14,6 +14,7 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Requires:       wesnoth-data = %{version}
+Requires:       dejavu-fonts
 BuildRequires:	SDL_image-devel
 BuildRequires:	SDL_mixer-devel
 BuildRequires:  SDL_net-devel
@@ -119,6 +120,15 @@
 ln -sf ../wesnoth/icons/%{name}-icon.png $RPM_BUILD_ROOT/%{_datadir}/pixmaps
 ln -sf ../wesnoth/icons/%{name}_editor-icon.png $RPM_BUILD_ROOT/%{_datadir}/pixmaps
 
+# Wesnoth ships its own fonts, replace with Fedora packaged versions
+rm -f $RPM_BUILD_ROOT/%{_datadir}/%{name}/fonts/*
+# dejavu-fonts
+ln -s /usr/share/fonts/dejavu/DejaVuSans.ttf $RPM_BUILD_ROOT/%{_datadir}/%{name}/fonts/DejaVuSans.ttf
+# sazanami-fonts-gothic
+ln -s /usr/share/fonts/sazanami-fonts-gothic/sazanami-gothic.ttf $RPM_BUILD_ROOT/%{_datadir}/%{name}/fonts/sazanami-gothic.ttf
+# wqy-zenhei-fonts
+ln -s /usr/share/fonts/wqy-zenhei/wqy-zenhei.ttc $RPM_BUILD_ROOT/%{_datadir}/%{name}/fonts/wqy-zenhei-gb2312.ttf
+
 %find_lang %{name}.\*
 
 
@@ -233,6 +243,15 @@
 %endif
 
 %changelog
+* Sun Dec 14 2008 Warren Togami <wtogami at redhat.com> - 1.4.6-5
+- No longer ship Wesnoth's redundant copy of fonts.
+  We now symlink to the Fedora packaged fonts that wesnoth expects.
+  dejavu-fonts (Latin)
+  sazanami-fonts-gothic (Japanese)
+  wqy-zenhei-fonts (Chinese)
+  We do not explicitly require these fonts.  Normally these fonts would be 
+  already installed by your system use that language.
+
 * Wed Dec 10 2008 Jon Ciesla <limb at jcomserv.net> - 1.4.6-4
 - Rediffed fuzzy gcc43 patch.