dist-git conversion

Makefile

@@ -1,21 +0,0 @@
-# Makefile for source rpm: xpilot-ng
-# $Id$
-NAME := xpilot-ng
-SPECFILE = $(firstword $(wildcard *.spec))
-
-define find-makefile-common
-for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
-endef
-
-MAKEFILE_COMMON := $(shell $(find-makefile-common))
-
-ifeq ($(MAKEFILE_COMMON),)
-# attept a checkout
-define checkout-makefile-common
-test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
-endef
-
-MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
-endif
-
-include $(MAKEFILE_COMMON)

xpilot-ng.spec

@@ -7,7 +7,7 @@
 
 Name:           xpilot-ng
 Version:        4.7.2
-Release:        18%{?dist}
+Release:        19%{?dist}
 Summary:        Multiplayer space arcade game
 
 Group:          Amusements/Games
@@ -35,6 +35,7 @@ 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
@@ -135,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}
@@ -269,6 +278,9 @@ rm -rf $RPM_BUILD_ROOT
 %{logwatch_scripts}/shared/applyxpilotdate
 
 %changelog
+* Sun Apr 25 2010 Wart <wart@kobold.org> - 4.7.2-19
+- Replace bundled fonts with system fonts (BZ #477487)
+
 * Fri Jan 15 2010 Hans de Goede <hdegoede@redhat.com> - 4.7.2-18
 - Fix FTBFS (#511717)