dist-git conversion

- Fix FTBFS (#511717)

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 $$/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-4.7.2-getline.patch

@@ -0,0 +1,84 @@
+diff -up xpilot-ng-4.7.2/src/client/textinterface.c~ xpilot-ng-4.7.2/src/client/textinterface.c
+--- xpilot-ng-4.7.2/src/client/textinterface.c~	2005-09-02 19:06:20.000000000 +0200
++++ xpilot-ng-4.7.2/src/client/textinterface.c	2010-01-15 12:34:07.000000000 +0100
+@@ -37,7 +37,7 @@ extern int		dgram_one_socket;	/* from da
+ /*
+  * just like fgets() but strips newlines like gets().
+  */
+-static char* getline(char* buf, int len, FILE* stream)
++static char* xp_getline(char* buf, int len, FILE* stream)
+ {
+     char		*nl;
+ 
+@@ -251,7 +251,7 @@ static bool Process_commands(sockbuf_t *
+ 	else if (!auto_connect) {
+ 	    printf("*** Server on %s. Enter command> ", conpar->server_name);
+ 
+-	    getline(linebuf, MAX_LINE, stdin);
++	    xp_getline(linebuf, MAX_LINE, stdin);
+ 	    if (feof(stdin)) {
+ 		puts("");
+ 		c = 'Q';
+@@ -338,7 +338,7 @@ static bool Process_commands(sockbuf_t *
+ 	    case 'K':
+ 		printf("Enter name of victim: ");
+ 		fflush(stdout);
+-		if (!getline(linebuf, MAX_LINE, stdin)) {
++		if (!xp_getline(linebuf, MAX_LINE, stdin)) {
+ 		    printf("Nothing changed.\n");
+ 		    continue;
+ 		}
+@@ -349,7 +349,7 @@ static bool Process_commands(sockbuf_t *
+ 	    case 'M':				/* Send a message to server. */
+ 		printf("Enter message: ");
+ 		fflush(stdout);
+-		if (!getline(linebuf, MAX_LINE, stdin) || !linebuf[0]) {
++		if (!xp_getline(linebuf, MAX_LINE, stdin) || !linebuf[0]) {
+ 		    printf("No message sent.\n");
+ 		    continue;
+ 		}
+@@ -364,7 +364,7 @@ static bool Process_commands(sockbuf_t *
+ 	    case 'D':				/* Shutdown */
+ 		if (!auto_shutdown) {
+ 		    printf("Enter delay in seconds or return for cancel: ");
+-		    getline(linebuf, MAX_LINE, stdin);
++		    xp_getline(linebuf, MAX_LINE, stdin);
+ 		    /*
+ 		     * No argument = cancel shutdown = arg_int=0
+ 		     */
+@@ -375,7 +375,7 @@ static bool Process_commands(sockbuf_t *
+ 			    delay = 1;
+ 
+ 		    printf("Enter reason: ");
+-		    getline(linebuf, MAX_LINE, stdin);
++		    xp_getline(linebuf, MAX_LINE, stdin);
+ 		} else {
+ 		    strlcpy(linebuf, shutdown_reason, sizeof(linebuf));
+ 		    delay = 60;
+@@ -388,7 +388,7 @@ static bool Process_commands(sockbuf_t *
+ 	    case 'O':				/* Tune an option. */
+ 		printf("Enter option: ");
+ 		fflush(stdout);
+-		if (!getline(linebuf, MAX_LINE, stdin)
++		if (!xp_getline(linebuf, MAX_LINE, stdin)
+ 		    || (len=strlen(linebuf)) == 0) {
+ 		    printf("Nothing changed.\n");
+ 		    continue;
+@@ -396,7 +396,7 @@ static bool Process_commands(sockbuf_t *
+ 		printf("Enter new value for %s: ", linebuf);
+ 		fflush(stdout);
+ 		strcat(linebuf, ":"); len++;
+-		if (!getline(&linebuf[len], MAX_LINE-len, stdin)
++		if (!xp_getline(&linebuf[len], MAX_LINE-len, stdin)
+ 		    || linebuf[len] == '\0') {
+ 		    printf("Nothing changed.\n");
+ 		    continue;
+@@ -450,7 +450,7 @@ static bool Process_commands(sockbuf_t *
+ 	    case 'T':				/* Set team. */
+ 		printf("Enter team: ");
+ 		fflush(stdout);
+-		if (!getline(linebuf, MAX_LINE, stdin)
++		if (!xp_getline(linebuf, MAX_LINE, stdin)
+ 		    || (len = strlen(linebuf)) == 0)
+ 		    printf("Nothing changed.\n");
+ 		else {

xpilot-ng.spec

@@ -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 server
 %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@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@lists.fedoraproject.org> - 4.7.2-17
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild