rpms/xpilot-ng/F-12 xpilot-ng.spec,1.18,1.19

[Michael Thomas]

Author: wart

Update of /cvs/pkgs/rpms/xpilot-ng/F-12
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv25277

Modified Files:
	xpilot-ng.spec 
Log Message:
- Replace bundled fonts with system fonts (BZ #477487)
- Fix FTBFS (#511717)




Index: xpilot-ng.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xpilot-ng/F-12/xpilot-ng.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- xpilot-ng.spec	27 Jul 2009 08:41:45 -0000	1.18
+++ xpilot-ng.spec	26 Apr 2010 03:28:43 -0000	1.19
@@ -7,7 +7,7 @@
 
 Name:           xpilot-ng
 Version:        4.7.2
-Release:        17%{?dist}
+Release:        18%{?dist}
 Summary:        Multiplayer space arcade game
 
 Group:          Amusements/Games
@@ -28,12 +28,14 @@ Source11:       logwatch.script.xpilot
 Source12:       logwatch.serviceconf.xpilot
 Source13:       logwatch.shared.applyxpilotdate
 Patch0:         xpilot-ng-4.7.2-scoreassert.patch
+Patch1:         xpilot-ng-4.7.2-getline.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  desktop-file-utils
 BuildRequires:  expat-devel SDL_ttf-devel SDL_image-devel zlib-devel
 BuildRequires:  libXt-devel libGLU-devel libXxf86misc-devel
 BuildRequires:  selinux-policy-devel hardlink checkpolicy
+Requires:       dejavu-sans-fonts
 
 %description
 A highly addictive, infinitely configurable multiplayer space
@@ -79,6 +81,7 @@ logwatch scripts for the Xpilot game ser
 %prep
 %setup -q
 %patch0
+%patch1 -p1
 pushd doc/man
 iconv --from=ISO-8859-1 --to=UTF-8 xpilot-ng-server.man > xpilot-ng-server.man.new
 mv xpilot-ng-server.man.new xpilot-ng-server.man
@@ -133,6 +136,14 @@ install -p -D -m 644 %{SOURCE6} \
 install -p -D -m 644 lib/defaults.txt $RPM_BUILD_ROOT/%{_sysconfdir}/%{name}/defaults.txt
 install -p -D -m 600 lib/password.txt $RPM_BUILD_ROOT/%{_sysconfdir}/%{name}/password.txt
 
+# Replace bundled fonts with system fonts
+
+rm $RPM_BUILD_ROOT%{_datadir}/%{name}/fonts/FreeSansBoldOblique.ttf
+ln -s %{_datadir}/fonts/dejavu/DejaVuSans-BoldOblique.ttf $RPM_BUILD_ROOT%{_datadir}/%{name}/fonts/FreeSansBoldOblique.ttf
+rm $RPM_BUILD_ROOT%{_datadir}/%{name}/fonts/VeraMoBd.ttf
+ln -s %{_datadir}/fonts/dejavu/DejaVuSansMono-Bold.ttf $RPM_BUILD_ROOT%{_datadir}/%{name}/fonts/VeraMoBd.ttf
+
+
 # Install logwatch files
 install -pD -m 0644 %{SOURCE10} $RPM_BUILD_ROOT%{logwatch_conf}/logfiles/%{name}.conf
 install -pD -m 0755 %{SOURCE11} $RPM_BUILD_ROOT%{logwatch_scripts}/services/%{name}
@@ -267,6 +278,10 @@ rm -rf $RPM_BUILD_ROOT
 %{logwatch_scripts}/shared/applyxpilotdate
 
 %changelog
+* Sun Apr 25 2010 Wart <wart at kobold.org> - 4.7.2-18
+- Replace bundled fonts with system fonts (BZ #477487)
+- Fix FTBFS (#511717)
+
 * Mon Jul 27 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 4.7.2-17
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild