From 6bc96666e3b185f1a5fa831eaa5bb82991786070 Mon Sep 17 00:00:00 2001 From: Michael Thomas Date: Thu, 9 Aug 2007 22:27:36 +0000 Subject: [PATCH 01/60] Fix version and category fields in .desktop files --- xpilot-ng-sdl.desktop | 4 ++-- xpilot-ng-x11.desktop | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/xpilot-ng-sdl.desktop b/xpilot-ng-sdl.desktop index 90f287c..c2dbbb8 100644 --- a/xpilot-ng-sdl.desktop +++ b/xpilot-ng-sdl.desktop @@ -7,5 +7,5 @@ Exec=xpilot-ng-sdl Icon=xpilot-ng.png Terminal=false Type=Application -Categories=Application;Game; -Version=4.7.2 +Categories=Application;Game;ArcadeGame; +Version=1.0 diff --git a/xpilot-ng-x11.desktop b/xpilot-ng-x11.desktop index 6946df1..5c93cfa 100644 --- a/xpilot-ng-x11.desktop +++ b/xpilot-ng-x11.desktop @@ -7,5 +7,5 @@ Exec=xpilot-ng-x11 Icon=xpilot-ng.png Terminal=false Type=Application -Categories=Application;Game; -Version=4.7.2 +Categories=Application;Game;ArcadeGame; +Version=1.0 From 64cce0623cf18ed2493432bda8826a516feb816d Mon Sep 17 00:00:00 2001 From: Michael Thomas Date: Sun, 26 Aug 2007 03:16:00 +0000 Subject: [PATCH 02/60] Minor selinux modifications for rawhide --- xpilotd.te | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xpilotd.te b/xpilotd.te index 5d06db7..119eba1 100644 --- a/xpilotd.te +++ b/xpilotd.te @@ -50,7 +50,7 @@ allow xpilotd_t var_log_t:file rw_file_perms ; ## Networking basics (adjust to your needs!) sysnet_dns_name_resolve(xpilotd_t) corenet_udp_bind_all_nodes(xpilotd_t) -corenet_non_ipsec_sendrecv(xpilotd_t) +corenet_all_recvfrom_unlabeled(xpilotd_t) corenet_udp_sendrecv_all_ports(xpilotd_t) From 3eb90531e8d53a9f794522e136ea911b1f6682aa Mon Sep 17 00:00:00 2001 From: Michael Thomas Date: Sun, 26 Aug 2007 03:17:35 +0000 Subject: [PATCH 03/60] Fix typo in port number --- xpilot-ng-server.init | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/xpilot-ng-server.init b/xpilot-ng-server.init index a43be15..ad6b33a 100644 --- a/xpilot-ng-server.init +++ b/xpilot-ng-server.init @@ -36,7 +36,7 @@ start() { return 1 fi if selinuxenabled ; then - /usr/sbin/semanage port -a -t xpilotd_port_t -p udp 1545 &>/dev/null || : + /usr/sbin/semanage port -a -t xpilotd_port_t -p udp 15345 &>/dev/null || : /usr/sbin/semanage port -a -t xpilotd_port_t -p udp 32200-32299 &>/dev/null || : fi @@ -60,7 +60,7 @@ stop() { echo [ $retval -eq 0 ] && rm -f $lockfile if selinuxenabled ; then - /usr/sbin/semanage port -d -t xpilotd_port_t -p udp 1545 &>/dev/null || : + /usr/sbin/semanage port -d -t xpilotd_port_t -p udp 15345 &>/dev/null || : /usr/sbin/semanage port -d -t xpilotd_port_t -p udp 32200-32299 &>/dev/null || : fi return $retval From 059e1beba4eb8df5f154e1de049e6f83b8cb456c Mon Sep 17 00:00:00 2001 From: Michael Thomas Date: Sun, 26 Aug 2007 03:18:31 +0000 Subject: [PATCH 04/60] - License tag clarification - Fix version and category fields in .desktop files - Use new user creation guidelines --- xpilot-ng.spec | 24 +++++++++++++++--------- 1 file changed, 15 insertions(+), 9 deletions(-) diff --git a/xpilot-ng.spec b/xpilot-ng.spec index 2a28cb6..8ea5144 100644 --- a/xpilot-ng.spec +++ b/xpilot-ng.spec @@ -1,4 +1,4 @@ -%define selinux_variants mls strict targeted +%define selinux_variants targeted %define selinux_policyver %(sed -e 's,.*selinux-policy-\\([^/]*\\)/.*,\\1,' /usr/share/selinux/devel/policyhelp) %define logwatch_root %{_datadir}/logwatch @@ -7,11 +7,11 @@ Name: xpilot-ng Version: 4.7.2 -Release: 12%{?dist} +Release: 13%{?dist} Summary: Multiplayer space arcade game Group: Amusements/Games -License: GPL +License: GPLv2+ URL: http://xpilot.sourceforge.net Source0: http://dl.sourceforge.net/sourceforge/xpilot/xpilot-ng-%{version}.tar.gz Source1: xpilot-ng.png @@ -44,6 +44,7 @@ causing general mayhem. %package server Summary: Server for hosting xpilot games Group: Amusements/Games +Requires(pre): shadow-utils Requires(post): /sbin/chkconfig Requires(post): /sbin/service Requires(preun): /sbin/chkconfig @@ -163,12 +164,11 @@ if [ -x %{_bindir}/gtk-update-icon-cache ]; then fi %pre server -user_uid=`id -u xpilot 2>/dev/null` -if [ x"$user_uid" = x ] ; then - useradd -r -s /sbin/nologin -d %{_datadir}/%{name} -M \ - -c 'XPilot Server' \ - xpilot >/dev/null || : -fi +getent group xpilot >/dev/null || groupadd -r xpilot +getent passwd xpilot >/dev/null || \ +useradd -r -g xpilot -d %{_datadir}/%{name} -s /sbin/nologin \ + -c "xpilot game server" xpilot +exit 0 %post server /sbin/chkconfig --add xpilot-ng-server @@ -267,6 +267,12 @@ rm -rf $RPM_BUILD_ROOT %{logwatch_scripts}/shared/applyxpilotdate %changelog +* Thu Aug 23 2007 Wart 4.7.2-13 +- Minor selinux modifications for rawhide +- License tag clarification +- Fix version and category fields in .desktop files +- Use new user creation guidelines + * Fri Feb 23 2007 Wart 4.7.2-12 - Update logwatch script with a previously unknown log field From f7967aa244502ec270c8f8c207d43b92e4fbe784 Mon Sep 17 00:00:00 2001 From: Michael Thomas Date: Sat, 9 Feb 2008 06:48:39 +0000 Subject: [PATCH 05/60] Rebuild for gcc 4.3 --- xpilot-ng.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xpilot-ng.spec b/xpilot-ng.spec index 8ea5144..cb6bdd9 100644 --- a/xpilot-ng.spec +++ b/xpilot-ng.spec @@ -7,7 +7,7 @@ Name: xpilot-ng Version: 4.7.2 -Release: 13%{?dist} +Release: 14%{?dist} Summary: Multiplayer space arcade game Group: Amusements/Games @@ -267,6 +267,9 @@ rm -rf $RPM_BUILD_ROOT %{logwatch_scripts}/shared/applyxpilotdate %changelog +* Fri Feb 18 2008 Wart 4.7.2-14 +- Rebuild for gcc 4.3 + * Thu Aug 23 2007 Wart 4.7.2-13 - Minor selinux modifications for rawhide - License tag clarification From 5d6228d0927539424106129a0c80438e65c59e1e Mon Sep 17 00:00:00 2001 From: Michael Thomas Date: Mon, 18 Feb 2008 22:18:24 +0000 Subject: [PATCH 06/60] Better Sourceforge download URL --- xpilot-ng.spec | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/xpilot-ng.spec b/xpilot-ng.spec index cb6bdd9..1b97df9 100644 --- a/xpilot-ng.spec +++ b/xpilot-ng.spec @@ -13,7 +13,7 @@ Summary: Multiplayer space arcade game Group: Amusements/Games License: GPLv2+ URL: http://xpilot.sourceforge.net -Source0: http://dl.sourceforge.net/sourceforge/xpilot/xpilot-ng-%{version}.tar.gz +Source0: http://downloads.sourceforge.net/sourceforge/xpilot/xpilot-ng-%{version}.tar.gz Source1: xpilot-ng.png Source2: xpilot-ng-x11.desktop Source3: xpilot-ng-sdl.desktop @@ -267,6 +267,8 @@ rm -rf $RPM_BUILD_ROOT %{logwatch_scripts}/shared/applyxpilotdate %changelog +- Better Sourceforge download URL + * Fri Feb 18 2008 Wart 4.7.2-14 - Rebuild for gcc 4.3 From 90dce27f1bd1151eabf43db68b7af44928ca380f Mon Sep 17 00:00:00 2001 From: Michael Schwendt Date: Sun, 9 Mar 2008 00:00:01 +0000 Subject: [PATCH 07/60] Fix: error: %changelog entries must start with * --- xpilot-ng.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/xpilot-ng.spec b/xpilot-ng.spec index 1b97df9..3506766 100644 --- a/xpilot-ng.spec +++ b/xpilot-ng.spec @@ -267,6 +267,7 @@ rm -rf $RPM_BUILD_ROOT %{logwatch_scripts}/shared/applyxpilotdate %changelog +* Fri Feb 18 2008 Wart - Better Sourceforge download URL * Fri Feb 18 2008 Wart 4.7.2-14 From a6269f9463ad2f542b7a384da7c869be013f6325 Mon Sep 17 00:00:00 2001 From: Ignacio Vazquez-Abrams Date: Mon, 1 Dec 2008 15:00:56 +0000 Subject: [PATCH 08/60] Rebuild for Python 2.6 --- xpilot-ng.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xpilot-ng.spec b/xpilot-ng.spec index 3506766..f2c1dfb 100644 --- a/xpilot-ng.spec +++ b/xpilot-ng.spec @@ -7,7 +7,7 @@ Name: xpilot-ng Version: 4.7.2 -Release: 14%{?dist} +Release: 15%{?dist} Summary: Multiplayer space arcade game Group: Amusements/Games @@ -267,6 +267,9 @@ rm -rf $RPM_BUILD_ROOT %{logwatch_scripts}/shared/applyxpilotdate %changelog +* Mon Dec 01 2008 Ignacio Vazquez-Abrams - 4.7.2-15 +- Rebuild for Python 2.6 + * Fri Feb 18 2008 Wart - Better Sourceforge download URL From 3573973663f4c874203c8512fb6fb141b9f9d41b Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Thu, 26 Feb 2009 11:51:30 +0000 Subject: [PATCH 09/60] - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild --- xpilot-ng.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xpilot-ng.spec b/xpilot-ng.spec index f2c1dfb..b8c1a47 100644 --- a/xpilot-ng.spec +++ b/xpilot-ng.spec @@ -7,7 +7,7 @@ Name: xpilot-ng Version: 4.7.2 -Release: 15%{?dist} +Release: 16%{?dist} Summary: Multiplayer space arcade game Group: Amusements/Games @@ -267,6 +267,9 @@ rm -rf $RPM_BUILD_ROOT %{logwatch_scripts}/shared/applyxpilotdate %changelog +* Thu Feb 26 2009 Fedora Release Engineering - 4.7.2-16 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild + * Mon Dec 01 2008 Ignacio Vazquez-Abrams - 4.7.2-15 - Rebuild for Python 2.6 From 691b2e8a0350a90aad73d26827847ed64305db4d Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Mon, 27 Jul 2009 08:41:45 +0000 Subject: [PATCH 10/60] - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild --- xpilot-ng.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xpilot-ng.spec b/xpilot-ng.spec index b8c1a47..a0c7e0c 100644 --- a/xpilot-ng.spec +++ b/xpilot-ng.spec @@ -7,7 +7,7 @@ Name: xpilot-ng Version: 4.7.2 -Release: 16%{?dist} +Release: 17%{?dist} Summary: Multiplayer space arcade game Group: Amusements/Games @@ -267,6 +267,9 @@ rm -rf $RPM_BUILD_ROOT %{logwatch_scripts}/shared/applyxpilotdate %changelog +* Mon Jul 27 2009 Fedora Release Engineering - 4.7.2-17 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild + * Thu Feb 26 2009 Fedora Release Engineering - 4.7.2-16 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild From 6c4ba3df3aa555bb82689e4903afb547593cd5de Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Wed, 25 Nov 2009 22:41:05 +0000 Subject: [PATCH 11/60] Fix typo that causes a failure to update the common directory. (releng #2781) --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 37f3e41..a71352d 100644 --- a/Makefile +++ b/Makefile @@ -4,7 +4,7 @@ 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 +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)) From 979b82dbf7b44749d730d65d8c046f89b7111d3b Mon Sep 17 00:00:00 2001 From: Hans de Goede Date: Fri, 15 Jan 2010 12:59:58 +0000 Subject: [PATCH 12/60] - Fix FTBFS (#511717) --- xpilot-ng-4.7.2-getline.patch | 84 +++++++++++++++++++++++++++++++++++ xpilot-ng.spec | 7 ++- 2 files changed, 90 insertions(+), 1 deletion(-) create mode 100644 xpilot-ng-4.7.2-getline.patch diff --git a/xpilot-ng-4.7.2-getline.patch b/xpilot-ng-4.7.2-getline.patch new file mode 100644 index 0000000..b2f63b9 --- /dev/null +++ b/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 { diff --git a/xpilot-ng.spec b/xpilot-ng.spec index a0c7e0c..955bc74 100644 --- a/xpilot-ng.spec +++ b/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,6 +28,7 @@ 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 @@ -79,6 +80,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 @@ -267,6 +269,9 @@ rm -rf $RPM_BUILD_ROOT %{logwatch_scripts}/shared/applyxpilotdate %changelog +* Fri Jan 15 2010 Hans de Goede - 4.7.2-18 +- Fix FTBFS (#511717) + * Mon Jul 27 2009 Fedora Release Engineering - 4.7.2-17 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild From e6ead34641ceaecae512806869779c1371469670 Mon Sep 17 00:00:00 2001 From: Michael Thomas Date: Mon, 26 Apr 2010 01:47:18 +0000 Subject: [PATCH 13/60] Replace bundled fonts with system fonts (BZ #477487) --- xpilot-ng.spec | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/xpilot-ng.spec b/xpilot-ng.spec index 955bc74..a0419a8 100644 --- a/xpilot-ng.spec +++ b/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 - 4.7.2-19 +- Replace bundled fonts with system fonts (BZ #477487) + * Fri Jan 15 2010 Hans de Goede - 4.7.2-18 - Fix FTBFS (#511717) From 11ce811dfada1ff89ec5836ec2a26afb6cb82670 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 29 Jul 2010 16:10:10 +0000 Subject: [PATCH 14/60] dist-git conversion --- .cvsignore => .gitignore | 0 Makefile | 21 --------------------- 2 files changed, 21 deletions(-) rename .cvsignore => .gitignore (100%) delete mode 100644 Makefile diff --git a/.cvsignore b/.gitignore similarity index 100% rename from .cvsignore rename to .gitignore diff --git a/Makefile b/Makefile deleted file mode 100644 index a71352d..0000000 --- a/Makefile +++ /dev/null @@ -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) From 916fd61f6c72ea59a5d7dd0b5ab0579f2a2da6a4 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Tue, 8 Feb 2011 00:48:27 -0600 Subject: [PATCH 15/60] - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild --- xpilot-ng.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xpilot-ng.spec b/xpilot-ng.spec index a0419a8..6aebc37 100644 --- a/xpilot-ng.spec +++ b/xpilot-ng.spec @@ -7,7 +7,7 @@ Name: xpilot-ng Version: 4.7.2 -Release: 19%{?dist} +Release: 20%{?dist} Summary: Multiplayer space arcade game Group: Amusements/Games @@ -278,6 +278,9 @@ rm -rf $RPM_BUILD_ROOT %{logwatch_scripts}/shared/applyxpilotdate %changelog +* Tue Feb 08 2011 Fedora Release Engineering - 4.7.2-20 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild + * Sun Apr 25 2010 Wart - 4.7.2-19 - Replace bundled fonts with system fonts (BZ #477487) From fcc66062b7066db13be6e6346493d93bc27a65e1 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Sat, 14 Jan 2012 03:16:30 -0600 Subject: [PATCH 16/60] - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild --- xpilot-ng.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xpilot-ng.spec b/xpilot-ng.spec index 6aebc37..f10c21e 100644 --- a/xpilot-ng.spec +++ b/xpilot-ng.spec @@ -7,7 +7,7 @@ Name: xpilot-ng Version: 4.7.2 -Release: 20%{?dist} +Release: 21%{?dist} Summary: Multiplayer space arcade game Group: Amusements/Games @@ -278,6 +278,9 @@ rm -rf $RPM_BUILD_ROOT %{logwatch_scripts}/shared/applyxpilotdate %changelog +* Sat Jan 14 2012 Fedora Release Engineering - 4.7.2-21 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild + * Tue Feb 08 2011 Fedora Release Engineering - 4.7.2-20 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild From 02e9d355d389adc34ca3e64e979a61d9d264f721 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Sun, 22 Jul 2012 02:07:16 -0500 Subject: [PATCH 17/60] - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild --- xpilot-ng.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xpilot-ng.spec b/xpilot-ng.spec index f10c21e..7af44b8 100644 --- a/xpilot-ng.spec +++ b/xpilot-ng.spec @@ -7,7 +7,7 @@ Name: xpilot-ng Version: 4.7.2 -Release: 21%{?dist} +Release: 22%{?dist} Summary: Multiplayer space arcade game Group: Amusements/Games @@ -278,6 +278,9 @@ rm -rf $RPM_BUILD_ROOT %{logwatch_scripts}/shared/applyxpilotdate %changelog +* Sun Jul 22 2012 Fedora Release Engineering - 4.7.2-22 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild + * Sat Jan 14 2012 Fedora Release Engineering - 4.7.2-21 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild From 5d18481d413cfaee22767ace51f52eb386e0851a Mon Sep 17 00:00:00 2001 From: Hans de Goede Date: Sun, 29 Jul 2012 16:52:37 +0200 Subject: [PATCH 18/60] Fix a crash in the welcome screen (rhbz#830640) - Upgrade to latest upstream 4.7.3 - Drop selinux module, it no longer compiles and selinux support belongs in selinux-policy*, not in the apps themselves - Replace sysv init script by a systemd unit file --- .gitignore | 1 + sources | 2 +- xpilot-ng-4.7.2-getline.patch | 84 ---------------- xpilot-ng-4.7.2-rhbz830640.patch | 12 +++ xpilot-ng-server.init | 102 ------------------- xpilot-ng-server.service | 11 +++ xpilot-ng.spec | 164 +++++++++---------------------- xpilot-ng.sysconfig | 5 +- xpilotd.fc | 7 -- xpilotd.if | 24 ----- xpilotd.te | 75 -------------- 11 files changed, 71 insertions(+), 416 deletions(-) delete mode 100644 xpilot-ng-4.7.2-getline.patch create mode 100644 xpilot-ng-4.7.2-rhbz830640.patch delete mode 100644 xpilot-ng-server.init create mode 100644 xpilot-ng-server.service delete mode 100644 xpilotd.fc delete mode 100644 xpilotd.if delete mode 100644 xpilotd.te diff --git a/.gitignore b/.gitignore index 1e4820a..d1733ec 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ xpilot-ng-4.7.2.tar.gz +/xpilot-ng-4.7.3.tar.gz diff --git a/sources b/sources index f37f679..b7dcfda 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -b922251ab9c69f87567c9606304ee589 xpilot-ng-4.7.2.tar.gz +89a360747f7811a33c4821eec5583b7d xpilot-ng-4.7.3.tar.gz diff --git a/xpilot-ng-4.7.2-getline.patch b/xpilot-ng-4.7.2-getline.patch deleted file mode 100644 index b2f63b9..0000000 --- a/xpilot-ng-4.7.2-getline.patch +++ /dev/null @@ -1,84 +0,0 @@ -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 { diff --git a/xpilot-ng-4.7.2-rhbz830640.patch b/xpilot-ng-4.7.2-rhbz830640.patch new file mode 100644 index 0000000..9c2ba3d --- /dev/null +++ b/xpilot-ng-4.7.2-rhbz830640.patch @@ -0,0 +1,12 @@ +diff -up xpilot-ng-4.7.2/src/client/meta.h~ xpilot-ng-4.7.2/src/client/meta.h +--- xpilot-ng-4.7.2/src/client/meta.h~ 2005-01-04 22:38:12.000000000 +0100 ++++ xpilot-ng-4.7.2/src/client/meta.h 2012-07-29 15:50:53.137403386 +0200 +@@ -72,7 +72,7 @@ struct ServerInfo { + *playlist, + *sound, + *teambases_str, +- *timing, *ip_str, *freebases, *queue_str, *domain, pingtime_str[5]; ++ *timing, *ip_str, *freebases, *queue_str, *domain, pingtime_str[11]; + unsigned port, + ip, users, bases, fps, uptime, teambases, queue, pingtime; + struct timeval start; diff --git a/xpilot-ng-server.init b/xpilot-ng-server.init deleted file mode 100644 index ad6b33a..0000000 --- a/xpilot-ng-server.init +++ /dev/null @@ -1,102 +0,0 @@ -#!/bin/sh -# -# xpilot-ng-server This shell script takes care of starting and stopping -# the xpilot-ng game server. -# -# chkconfig: - 15 85 -# description: The xpilot-ng server supports playing networked \ -# multi-player games. -# processname: xpilot-ng-server -# config: /etc/sysconfig/xpilot-ng-server -# pidfile: /var/run/xpilot-ng-server.pid - -# Source function library. -. /etc/rc.d/init.d/functions - -# Source networking configuration. -. /etc/sysconfig/network - -# Check that networking is up. -[ "$NETWORKING" = "no" ] && exit 0 - -exec="/usr/bin/xpilot-ng-server" -prog=$(basename $exec) -pidfile=/var/run/$prog.pid - -[ -e /etc/sysconfig/$prog ] && . /etc/sysconfig/$prog - -lockfile=/var/lock/subsys/$prog - -start() { - echo -n $"Starting Xpilot game server: " - if [ -n "`/sbin/pidof $prog`" ]; then - echo -n $"$prog already running" - failure - echo - return 1 - fi - if selinuxenabled ; then - /usr/sbin/semanage port -a -t xpilotd_port_t -p udp 15345 &>/dev/null || : - /usr/sbin/semanage port -a -t xpilotd_port_t -p udp 32200-32299 &>/dev/null || : - fi - - # This doesn't properly detect startup failures - daemon --user xpilot $exec $XPILOTD_OPTIONS >>/var/log/xpilot.log 2>&1 & - retval=$? - if [ $retval -eq 0 ]; then - success - touch $lockfile - else - failure - fi - echo - return $retval -} - -stop() { - echo -n $"Stopping Xpilot game server: " - killproc $prog - retval=$? - echo - [ $retval -eq 0 ] && rm -f $lockfile - if selinuxenabled ; then - /usr/sbin/semanage port -d -t xpilotd_port_t -p udp 15345 &>/dev/null || : - /usr/sbin/semanage port -d -t xpilotd_port_t -p udp 32200-32299 &>/dev/null || : - fi - return $retval -} - -restart() { - stop - start -} - -reload() { - restart -} - -force_reload() { - restart -} - -fdr_status() { - status $prog -} - -case "$1" in - start|stop|restart|reload) - $1 - ;; - force-reload) - force_reload - ;; - status) - fdr_status - ;; - condrestart|try-restart) - [ ! -f $lockfile ] || restart - ;; - *) - echo $"Usage: $0 {start|stop|status|restart|try-restart|reload|force-reload}" - exit 2 -esac diff --git a/xpilot-ng-server.service b/xpilot-ng-server.service new file mode 100644 index 0000000..cbc973a --- /dev/null +++ b/xpilot-ng-server.service @@ -0,0 +1,11 @@ +[Unit] +Description=xpilot-ng-server supports playing networked multi-player games +After=network.target + +[Service] +Type=simple +EnvironmentFile=/etc/sysconfig/xpilot-ng-server.conf +ExecStart=/usr/bin/xpilot-ng-server $XPILOTD_OPTIONS + +[Install] +WantedBy=multi-user.target diff --git a/xpilot-ng.spec b/xpilot-ng.spec index 7af44b8..990f5d4 100644 --- a/xpilot-ng.spec +++ b/xpilot-ng.spec @@ -1,13 +1,10 @@ -%define selinux_variants targeted -%define selinux_policyver %(sed -e 's,.*selinux-policy-\\([^/]*\\)/.*,\\1,' /usr/share/selinux/devel/policyhelp) - %define logwatch_root %{_datadir}/logwatch %define logwatch_conf %{logwatch_root}/dist.conf %define logwatch_scripts %{logwatch_root}/scripts Name: xpilot-ng -Version: 4.7.2 -Release: 22%{?dist} +Version: 4.7.3 +Release: 1%{?dist} Summary: Multiplayer space arcade game Group: Amusements/Games @@ -17,24 +14,19 @@ Source0: http://downloads.sourceforge.net/sourceforge/xpilot/xpilot-ng-%{ Source1: xpilot-ng.png Source2: xpilot-ng-x11.desktop Source3: xpilot-ng-sdl.desktop -Source4: xpilot-ng-server.init +Source4: xpilot-ng-server.service Source5: xpilot-ng.sysconfig Source6: xpilot-ng.logrotate -Source7: xpilotd.te -Source8: xpilotd.fc -Source9: xpilotd.if Source10: logwatch.logconf.xpilot 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) +Patch1: xpilot-ng-4.7.2-rhbz830640.patch 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 @@ -43,33 +35,23 @@ arcade game. You pilot a spaceship around space, dodging obstacles, shooting players and bots, collecting power-ups, and causing general mayhem. + %package server Summary: Server for hosting xpilot games Group: Amusements/Games Requires(pre): shadow-utils -Requires(post): /sbin/chkconfig -Requires(post): /sbin/service -Requires(preun): /sbin/chkconfig -Requires(preun): /sbin/service -Requires(postun): /sbin/service +Requires(post): systemd-units +Requires(preun): systemd-units +Requires(postun): systemd-units +# Make sure the old no longer supported selinux policy from 4.7.2 gets removed +Obsoletes: %{name}-selinux < %{version} + %description server The xpilot server. This allows you to host xpilot games on your computer and develop new xpilot maps. This is required if you are playing alone, but not required if you are joining one of the public xpilot games hosted on the internet. -%package selinux -Summary: SELinux policy files for the xpilot-ng game server -Group: Amusements/Games -Requires: %{name}-server = %{version}-%{release} -%if "%{selinux_policyver}" != "" -Requires: selinux-policy >= %{selinux_policyver} -%endif -Requires(post): /usr/sbin/semodule /usr/sbin/semanage /sbin/fixfiles -Requires(preun): /sbin/service /usr/sbin/semodule /usr/sbin/semanage /sbin/fixfiles /usr/sbin/setsebool -Requires(postun): /usr/sbin/semodule -%description selinux -SELinux policy files for the xpilot-ng game server %package logwatch Summary: logwatch scripts for the xpilot game server @@ -78,6 +60,7 @@ Requires: %{name}-server = %{version}-%{release} logwatch %description logwatch logwatch scripts for the Xpilot game server + %prep %setup -q %patch0 @@ -89,44 +72,30 @@ iconv --from=ISO-8859-1 --to=UTF-8 xpilot-ng-x11.man > xpilot-ng-x11.man.new mv xpilot-ng-x11.man.new xpilot-ng-x11.man popd -mkdir SELinux -cp %{SOURCE7} %{SOURCE8} %{SOURCE9} SELinux/ %build -CFLAGS="$RPM_OPT_FLAGS" %configure +%configure make %{?_smp_mflags} -# Build the selinux policy file -pushd SELinux -for variant in %{selinux_variants} -do - make NAME=${variant} -f %{_datadir}/selinux/devel/Makefile - mv xpilotd.pp xpilotd.pp.${variant} - make NAME=${variant} -f %{_datadir}/selinux/devel/Makefile clean -done -popd %install -rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT chmod a+x $RPM_BUILD_ROOT/%{_datadir}/%{name}/mapconvert.py desktop-file-install --vendor fedora \ --dir ${RPM_BUILD_ROOT}%{_datadir}/applications \ - --add-category X-Fedora \ %{SOURCE2} desktop-file-install --vendor fedora \ --dir ${RPM_BUILD_ROOT}%{_datadir}/applications \ - --add-category X-Fedora \ %{SOURCE3} mkdir -p $RPM_BUILD_ROOT/%{_datadir}/icons/hicolor/48x48/apps/ install -p -m 644 %{SOURCE1} $RPM_BUILD_ROOT/%{_datadir}/icons/hicolor/48x48/apps/ -install -p -D -m 755 %{SOURCE4} $RPM_BUILD_ROOT/%{_initrddir}/%{name}-server +install -p -D -m 644 %{SOURCE4} $RPM_BUILD_ROOT/lib/systemd/system/%{name}-server.service install -p -D -m 644 %{SOURCE5} \ - $RPM_BUILD_ROOT/%{_sysconfdir}/sysconfig/%{name}-server + $RPM_BUILD_ROOT/%{_sysconfdir}/sysconfig/%{name}-server.conf install -p -D -m 644 %{SOURCE6} \ $RPM_BUILD_ROOT/%{_sysconfdir}/logrotate.d/%{name}-server @@ -150,30 +119,20 @@ install -pD -m 0755 %{SOURCE11} $RPM_BUILD_ROOT%{logwatch_scripts}/services/%{na install -pD -m 0644 %{SOURCE12} $RPM_BUILD_ROOT%{logwatch_conf}/services/%{name}.conf install -pD -m 0755 %{SOURCE13} $RPM_BUILD_ROOT%{logwatch_scripts}/shared/applyxpilotdate -# Install selinux policies -pushd SELinux -for variant in %{selinux_variants} -do - install -d $RPM_BUILD_ROOT%{_datadir}/selinux/${variant} - install -p -m 644 xpilotd.pp.${variant} \ - $RPM_BUILD_ROOT%{_datadir}/selinux/${variant}/xpilotd.pp -done -popd -# Hardlink identical policy module packages together -/usr/sbin/hardlink -cv $RPM_BUILD_ROOT%{_datadir}/selinux %post -touch --no-create %{_datadir}/icons/hicolor || : -if [ -x %{_bindir}/gtk-update-icon-cache ]; then - %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : -fi +touch --no-create %{_datadir}/icons/hicolor &>/dev/null || : %postun -touch --no-create %{_datadir}/icons/hicolor || : -if [ -x %{_bindir}/gtk-update-icon-cache ]; then - %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : +if [ $1 -eq 0 ] ; then + touch --no-create %{_datadir}/icons/hicolor &>/dev/null + gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : fi +%posttrans +gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : + + %pre server getent group xpilot >/dev/null || groupadd -r xpilot getent passwd xpilot >/dev/null || \ @@ -182,61 +141,27 @@ useradd -r -g xpilot -d %{_datadir}/%{name} -s /sbin/nologin \ exit 0 %post server -/sbin/chkconfig --add xpilot-ng-server +if [ $1 -eq 1 ] ; then + # Initial installation + /bin/systemctl daemon-reload >/dev/null 2>&1 || : +fi %preun server -if [ "$1" -le "0" ]; then - /sbin/service xpilot-ng-server stop > /dev/null 2>&1 - /sbin/chkconfig --del xpilot-ng-server +if [ $1 -eq 0 ] ; then + # Package removal, not upgrade + /bin/systemctl --no-reload disable xpilot-ng-server.service > /dev/null 2>&1 || : + /bin/systemctl stop xpilot-ng-server.service > /dev/null 2>&1 || : fi %postun server -if [ "$1" -ge "1" ]; then - /sbin/service xpilot-ng-server condrestart > /dev/null 2>&1 +/bin/systemctl daemon-reload >/dev/null 2>&1 || : +if [ $1 -ge 1 ] ; then + # Package upgrade, not uninstall + /bin/systemctl try-restart xpilot-ng-server.service >/dev/null 2>&1 || : fi -%post selinux -# Install SELinux policy modules -for selinuxvariant in %{selinux_variants} -do - /usr/sbin/semodule -s ${selinuxvariant} -i \ - %{_datadir}/selinux/${selinuxvariant}/xpilotd.pp &> /dev/null || : -done -/usr/sbin/semanage port -a -t xpilotd_port_t -p udp 15345 &> /dev/null || : -/usr/sbin/semanage port -a -t xpilotd_port_t -p udp 32200-32299 &> /dev/null || : -/sbin/fixfiles -R %{name}-server restore || : -/sbin/service %{name}-server condrestart > /dev/null 2>&1 || : - -%preun selinux -if [ "$1" -lt "1" ] ; then - # Disable the policy and restart the daemon - /usr/sbin/setsebool xpilotd_disable_trans 1 &> /dev/null || : - /sbin/service %{name}-server condrestart > /dev/null 2>&1 || : - # Unload the module - /usr/sbin/semanage port -d -t xpilotd_port_t -p udp 15345 &> /dev/null || : - /usr/sbin/semanage port -d -t xpilotd_port_t -p udp 32200-32299 &> /dev/null || : - for variant in %{selinux_variants} ; do - /usr/sbin/semodule -s ${variant} -r xpilotd &> /dev/null || : - done - # Set the context back - /sbin/fixfiles -R %{name}-server restore || : -fi - -%postun selinux -if [ "$1" -ge "1" ] ; then - # Replace the module if it is already loaded. semodule -u also - # checks the module version - for variant in %{selinux_variants} ; do - /usr/sbin/semodule -u %{_datadir}/selinux/${variant}/xpilotd.pp || : - done -fi - -%clean -rm -rf $RPM_BUILD_ROOT - %files -%defattr(-,root,root,-) %{_bindir}/xpilot-ng-replay %{_bindir}/xpilot-ng-sdl %{_bindir}/xpilot-ng-x11 @@ -251,11 +176,10 @@ rm -rf $RPM_BUILD_ROOT %doc README COPYING %files server -%defattr(-,root,root,-) %{_bindir}/xpilot-ng-xp-mapedit %{_bindir}/xpilot-ng-server -%{_initrddir}/xpilot-ng-server -%config(noreplace) %{_sysconfdir}/sysconfig/%{name}-server +/lib/systemd/system/xpilot-ng-server.service +%config(noreplace) %{_sysconfdir}/sysconfig/%{name}-server.conf %config(noreplace) %{_sysconfdir}/logrotate.d/%{name}-server %{_datadir}/%{name} %dir %{_sysconfdir}/%{name} @@ -265,19 +189,21 @@ rm -rf $RPM_BUILD_ROOT %{_mandir}/man6/xpilot-ng-xp-mapedit.6.gz %doc README COPYING -%files selinux -%defattr(-,root,root,-) -%doc SELinux/*.?? -%{_datadir}/selinux/*/xpilotd.pp - %files logwatch -%defattr(-,root,root,-) %{logwatch_conf}/logfiles/%{name}.conf %{logwatch_conf}/services/%{name}.conf %{logwatch_scripts}/services/%{name} %{logwatch_scripts}/shared/applyxpilotdate + %changelog +* Sun Jul 27 2012 Hans de Goede - 4.7.3-1 +- Fix a crash in the welcome screen (rhbz#830640) +- Upgrade to latest upstream 4.7.3 +- Drop selinux module, it no longer compiles and selinux support belongs + in selinux-policy*, not in the apps themselves +- Replace sysv init script by a systemd unit file + * Sun Jul 22 2012 Fedora Release Engineering - 4.7.2-22 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild diff --git a/xpilot-ng.sysconfig b/xpilot-ng.sysconfig index c294b06..3d2c50f 100644 --- a/xpilot-ng.sysconfig +++ b/xpilot-ng.sysconfig @@ -22,7 +22,4 @@ # of defaults. # Also, explicitly disable reporting to the metaserver. Use # -expand PublicSettings or -reportToMetaserver to enable. -XPILOTD_OPTIONS="-noQuit \ - +reportToMetaServer \ - -defaultsFileName /etc/xpilot-ng/defaults.txt \ - -passwordFileName /etc/xpilot-ng/password.txt" +XPILOTD_OPTIONS="-noQuit +reportToMetaServer -defaultsFileName /etc/xpilot-ng/defaults.txt -passwordFileName /etc/xpilot-ng/password.txt" diff --git a/xpilotd.fc b/xpilotd.fc deleted file mode 100644 index 8d5153a..0000000 --- a/xpilotd.fc +++ /dev/null @@ -1,7 +0,0 @@ -# xpilot-ng-server executable will have: -# label: system_u:object_r:xpilotd_exec_t -# MLS sensitivity: s0 -# MCS categories: - -/usr/bin/xpilot-ng-server -- gen_context(system_u:object_r:xpilotd_exec_t,s0) -/etc/xpilot-ng(/.*)? gen_context(system_u:object_r:xpilotd_private_data_t) diff --git a/xpilotd.if b/xpilotd.if deleted file mode 100644 index 8c035e2..0000000 --- a/xpilotd.if +++ /dev/null @@ -1,24 +0,0 @@ -## policy for xpilot-ng - -######################################## -## -## Execute a domain transition to run xpilot-ng-server. -## -## -## -## Domain allowed to transition. -## -## -# -interface(`xpilotd_domtrans',` - gen_require(` - type xpilotd_t, xpilotd_exec_t; - ') - - domain_auto_trans($1,xpilotd_exec_t,xpilotd_t) - - allow $1 xpilotd_t:fd use; - allow xpilotd_t $1:fd use; - allow xpilotd_t $1:fifo_file rw_file_perms; - allow xpilotd_t $1:process sigchld; -') diff --git a/xpilotd.te b/xpilotd.te deleted file mode 100644 index 119eba1..0000000 --- a/xpilotd.te +++ /dev/null @@ -1,75 +0,0 @@ -policy_module(xpilotd,1.0.0) - -######################################## -# -# Declarations -# - -gen_require(` - type port_t; - attribute port_type; - type var_log_t; -') - -type xpilotd_port_t, port_type; - -type xpilotd_t; -type xpilotd_exec_t; -domain_type(xpilotd_t) -init_daemon_domain(xpilotd_t, xpilotd_exec_t) - -# pid files -type xpilotd_var_run_t; -files_pid_file(xpilotd_var_run_t) - -# Game data files -type xpilotd_private_data_t; -files_type(xpilotd_private_data_t); - -######################################## -# -# xpilot local policy -# -# Check in /etc/selinux/refpolicy/include for macros to use instead of allow rules. -# Note: /usr/share/selinux/devel/include/support/obj_perm_sets.spt contains -# the definitions of many permissions, such as 'rw_dir_perms' - -# Some common macros (you might be able to remove some) -files_read_usr_files(xpilotd_t) -files_read_etc_files(xpilotd_t) -libs_use_ld_so(xpilotd_t) -libs_use_shared_libs(xpilotd_t) -miscfiles_read_localization(xpilotd_t) -## internal communication is often done using fifo and unix sockets. -allow xpilotd_t self:fifo_file { read write }; -allow xpilotd_t self:unix_stream_socket create_stream_socket_perms; - -# log files -allow xpilotd_t var_log_t:file rw_file_perms ; - -## Networking basics (adjust to your needs!) -sysnet_dns_name_resolve(xpilotd_t) -corenet_udp_bind_all_nodes(xpilotd_t) -corenet_all_recvfrom_unlabeled(xpilotd_t) - -corenet_udp_sendrecv_all_ports(xpilotd_t) - -allow xpilotd_t xpilotd_port_t:udp_socket { name_bind }; - - - -# Init script handling -init_use_fds(xpilotd_t) -init_use_script_ptys(xpilotd_t) -domain_use_interactive_fds(xpilotd_t) - -# Game private data -allow xpilotd_t xpilotd_private_data_t:file { r_file_perms }; -allow xpilotd_t xpilotd_private_data_t:dir search; - - -# Misc rules that are needed. I don't understand the meaning of some -# of these, and for others I don't yet understand why the game needs -# them -kernel_read_system_state(xpilotd_t) -allow xpilotd_t self:process signal; From b5e0320e3c06d9a14b32042a91fe142d92c085f2 Mon Sep 17 00:00:00 2001 From: Hans de Goede Date: Sun, 29 Jul 2012 17:27:35 +0200 Subject: [PATCH 19/60] Move server cmdline config file to /etc/xpilot-ng, where all the other config-files are. You can now find it here: /etc/xpilot/xpilot-ng-server-cmdline-opts --- xpilot-ng-server.service | 2 +- xpilot-ng.spec | 21 ++++++++++++--------- 2 files changed, 13 insertions(+), 10 deletions(-) diff --git a/xpilot-ng-server.service b/xpilot-ng-server.service index cbc973a..e567558 100644 --- a/xpilot-ng-server.service +++ b/xpilot-ng-server.service @@ -4,7 +4,7 @@ After=network.target [Service] Type=simple -EnvironmentFile=/etc/sysconfig/xpilot-ng-server.conf +EnvironmentFile=/etc/xpilot-ng/xpilot-ng-server-cmdline-opts ExecStart=/usr/bin/xpilot-ng-server $XPILOTD_OPTIONS [Install] diff --git a/xpilot-ng.spec b/xpilot-ng.spec index 990f5d4..9854c0b 100644 --- a/xpilot-ng.spec +++ b/xpilot-ng.spec @@ -4,7 +4,7 @@ Name: xpilot-ng Version: 4.7.3 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Multiplayer space arcade game Group: Amusements/Games @@ -94,17 +94,15 @@ install -p -m 644 %{SOURCE1} $RPM_BUILD_ROOT/%{_datadir}/icons/hicolor/48x48/app install -p -D -m 644 %{SOURCE4} $RPM_BUILD_ROOT/lib/systemd/system/%{name}-server.service -install -p -D -m 644 %{SOURCE5} \ - $RPM_BUILD_ROOT/%{_sysconfdir}/sysconfig/%{name}-server.conf +# Copy certain configuration files to /etc so that they can be properly managed +# as config files. +install -p -D -m 644 %{SOURCE5} $RPM_BUILD_ROOT/%{_sysconfdir}/%{name}/%{name}-server-cmdline-opts +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 install -p -D -m 644 %{SOURCE6} \ $RPM_BUILD_ROOT/%{_sysconfdir}/logrotate.d/%{name}-server -# Copy certain configuration files to /etc so that they can be properly managed -# as config files. -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 @@ -179,12 +177,12 @@ fi %{_bindir}/xpilot-ng-xp-mapedit %{_bindir}/xpilot-ng-server /lib/systemd/system/xpilot-ng-server.service -%config(noreplace) %{_sysconfdir}/sysconfig/%{name}-server.conf %config(noreplace) %{_sysconfdir}/logrotate.d/%{name}-server %{_datadir}/%{name} %dir %{_sysconfdir}/%{name} %config(noreplace) %attr(0600,xpilot,root) %{_sysconfdir}/%{name}/password.txt %config(noreplace) %{_sysconfdir}/%{name}/defaults.txt +%config(noreplace) %{_sysconfdir}/%{name}/xpilot-ng-server-cmdline-opts %{_mandir}/man6/xpilot-ng-server.6.gz %{_mandir}/man6/xpilot-ng-xp-mapedit.6.gz %doc README COPYING @@ -197,6 +195,11 @@ fi %changelog +* Sun Jul 27 2012 Hans de Goede - 4.7.3-2 +- Move server cmdline config file to /etc/xpilot-ng, where all the other + config-files are. You can now find it here: + /etc/xpilot/xpilot-ng-server-cmdline-opts + * Sun Jul 27 2012 Hans de Goede - 4.7.3-1 - Fix a crash in the welcome screen (rhbz#830640) - Upgrade to latest upstream 4.7.3 From 6e0e7595e3a35b4f3ab6a974b056cd3e05a6d55f Mon Sep 17 00:00:00 2001 From: Parag Nemade Date: Sun, 10 Feb 2013 11:01:38 +0530 Subject: [PATCH 20/60] Remove vendor tag from desktop file as per https://fedorahosted.org/fesco/ticket/1077 --- xpilot-ng.spec | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/xpilot-ng.spec b/xpilot-ng.spec index 9854c0b..a2c12cc 100644 --- a/xpilot-ng.spec +++ b/xpilot-ng.spec @@ -1,10 +1,10 @@ -%define logwatch_root %{_datadir}/logwatch -%define logwatch_conf %{logwatch_root}/dist.conf -%define logwatch_scripts %{logwatch_root}/scripts +%global logwatch_root %{_datadir}/logwatch +%global logwatch_conf %{logwatch_root}/dist.conf +%global logwatch_scripts %{logwatch_root}/scripts Name: xpilot-ng Version: 4.7.3 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Multiplayer space arcade game Group: Amusements/Games @@ -79,14 +79,14 @@ make %{?_smp_mflags} %install -make install DESTDIR=$RPM_BUILD_ROOT +make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p" chmod a+x $RPM_BUILD_ROOT/%{_datadir}/%{name}/mapconvert.py -desktop-file-install --vendor fedora \ +desktop-file-install \ --dir ${RPM_BUILD_ROOT}%{_datadir}/applications \ %{SOURCE2} -desktop-file-install --vendor fedora \ +desktop-file-install \ --dir ${RPM_BUILD_ROOT}%{_datadir}/applications \ %{SOURCE3} mkdir -p $RPM_BUILD_ROOT/%{_datadir}/icons/hicolor/48x48/apps/ @@ -195,6 +195,9 @@ fi %changelog +* Sun Feb 10 2013 Parag Nemade - 4.7.3-3 +- Remove vendor tag from desktop file as per https://fedorahosted.org/fesco/ticket/1077 + * Sun Jul 27 2012 Hans de Goede - 4.7.3-2 - Move server cmdline config file to /etc/xpilot-ng, where all the other config-files are. You can now find it here: From 504746ec5fc9ab6e2f8c857704971b4135f6ebd2 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Sun, 4 Aug 2013 04:09:38 -0500 Subject: [PATCH 21/60] - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild --- xpilot-ng.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xpilot-ng.spec b/xpilot-ng.spec index a2c12cc..d2e4808 100644 --- a/xpilot-ng.spec +++ b/xpilot-ng.spec @@ -4,7 +4,7 @@ Name: xpilot-ng Version: 4.7.3 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Multiplayer space arcade game Group: Amusements/Games @@ -195,6 +195,9 @@ fi %changelog +* Sun Aug 04 2013 Fedora Release Engineering - 4.7.3-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild + * Sun Feb 10 2013 Parag Nemade - 4.7.3-3 - Remove vendor tag from desktop file as per https://fedorahosted.org/fesco/ticket/1077 From c4d31a50e8f337d78a1e89790161746f3416d528 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Sun, 8 Jun 2014 01:45:33 -0500 Subject: [PATCH 22/60] - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild --- xpilot-ng.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xpilot-ng.spec b/xpilot-ng.spec index d2e4808..b5eed01 100644 --- a/xpilot-ng.spec +++ b/xpilot-ng.spec @@ -4,7 +4,7 @@ Name: xpilot-ng Version: 4.7.3 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Multiplayer space arcade game Group: Amusements/Games @@ -195,6 +195,9 @@ fi %changelog +* Sun Jun 08 2014 Fedora Release Engineering - 4.7.3-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild + * Sun Aug 04 2013 Fedora Release Engineering - 4.7.3-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild From c00e1f1acf062db9cac598a047a4355c6a331137 Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Mon, 18 Aug 2014 10:52:23 +0000 Subject: [PATCH 23/60] - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild --- xpilot-ng.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xpilot-ng.spec b/xpilot-ng.spec index b5eed01..54b63b6 100644 --- a/xpilot-ng.spec +++ b/xpilot-ng.spec @@ -4,7 +4,7 @@ Name: xpilot-ng Version: 4.7.3 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Multiplayer space arcade game Group: Amusements/Games @@ -195,6 +195,9 @@ fi %changelog +* Mon Aug 18 2014 Fedora Release Engineering - 4.7.3-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild + * Sun Jun 08 2014 Fedora Release Engineering - 4.7.3-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild From 70191ae53729b6a98db52ff6eb222825ef39db55 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Fri, 19 Jun 2015 04:24:38 +0000 Subject: [PATCH 24/60] - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild --- xpilot-ng.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xpilot-ng.spec b/xpilot-ng.spec index 54b63b6..05252a8 100644 --- a/xpilot-ng.spec +++ b/xpilot-ng.spec @@ -4,7 +4,7 @@ Name: xpilot-ng Version: 4.7.3 -Release: 6%{?dist} +Release: 7%{?dist} Summary: Multiplayer space arcade game Group: Amusements/Games @@ -195,6 +195,9 @@ fi %changelog +* Fri Jun 19 2015 Fedora Release Engineering - 4.7.3-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + * Mon Aug 18 2014 Fedora Release Engineering - 4.7.3-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild From ad32e9e998401e32e4cd17e4a517dbf849be6b3d Mon Sep 17 00:00:00 2001 From: Hans de Goede Date: Mon, 1 Feb 2016 14:40:29 +0100 Subject: [PATCH 25/60] Enable sound support - Use systemd-rpm macros (rhbz#850373) - Split out client data in a -data package, share it between client and server - Split out libX11 client version into a -x11 package, drop .desktop for it - Add appdata --- xpilot-ng-4.7.3-fix-alut-detect.patch | 12 +++ xpilot-ng-sdl.appdata.xml | 38 ++++++++ xpilot-ng-sdl.desktop | 10 +- xpilot-ng-server.metainfo.xml | 11 +++ xpilot-ng-x11.desktop | 11 --- xpilot-ng.spec | 127 ++++++++++++++++---------- 6 files changed, 144 insertions(+), 65 deletions(-) create mode 100644 xpilot-ng-4.7.3-fix-alut-detect.patch create mode 100644 xpilot-ng-sdl.appdata.xml create mode 100644 xpilot-ng-server.metainfo.xml delete mode 100644 xpilot-ng-x11.desktop diff --git a/xpilot-ng-4.7.3-fix-alut-detect.patch b/xpilot-ng-4.7.3-fix-alut-detect.patch new file mode 100644 index 0000000..d668855 --- /dev/null +++ b/xpilot-ng-4.7.3-fix-alut-detect.patch @@ -0,0 +1,12 @@ +--- xpilot-ng-4.7.3/configure.ac~ 2010-03-06 02:20:30.000000000 +0100 ++++ xpilot-ng-4.7.3/configure.ac 2016-02-01 14:29:21.981049477 +0100 +@@ -325,7 +325,8 @@ if test x$enable_sound = xyes; then + alut, + main, + [have_alut=yes], +- []) ++ [], ++ -lopenal) + if test x$have_openal = xyes; then + if test x$have_alut = xyes; then + have_sound=yes diff --git a/xpilot-ng-sdl.appdata.xml b/xpilot-ng-sdl.appdata.xml new file mode 100644 index 0000000..fc65b61 --- /dev/null +++ b/xpilot-ng-sdl.appdata.xml @@ -0,0 +1,38 @@ + + + xpilot-ng-sdl.desktop + CC0-1.0 + GPL-2.0+ + XPilot NG + Multi-player space arcade game + +

+ A highly addictive, infinitely configurable multiplayer space + arcade game. You pilot a spaceship around space, dodging + obstacles, shooting players and bots, collecting power-ups, and + causing general mayhem. Some features are borrowed + from classics like the Atari coin-ups Asteroids and Gravitar, and the + home-computer games Thrust and Gravity Force. +

+

+ XPilot NG is an extended version of the original XPilot. Like in XPilot, + the aim of the game is to have fun and to beat your fellow pilots. + In a team game, you can humiliate your enemies, blow up your their ships + and steal their treasure. There are also other game modes: + individual game and a race mode. +

+

+ XPilot NG is a networked multi-player game, you can either start your + own server, or join an existing internet game. +

+ + http://xpilot.sourceforge.net/ + + http://xpilot.sourceforge.net/shots/polybloods1.png + http://xpilot.sourceforge.net/shots/xpilot_sdl.png + http://xpilot.sourceforge.net/shots/fishtank.png + http://xpilot.sourceforge.net/shots/dragon.png + http://xpilot.sourceforge.net/shots/spaceball.png + + jwrdegoede_at_fedoraproject.org + diff --git a/xpilot-ng-sdl.desktop b/xpilot-ng-sdl.desktop index c2dbbb8..9c31da4 100644 --- a/xpilot-ng-sdl.desktop +++ b/xpilot-ng-sdl.desktop @@ -1,11 +1,9 @@ [Desktop Entry] -Encoding=UTF-8 -Name=XPilot-ng -GenericName=XPilot-ng -Comment=XPilot client +Name=XPilot NG +Comment=Multi-player space arcade game Exec=xpilot-ng-sdl -Icon=xpilot-ng.png +Icon=xpilot-ng Terminal=false Type=Application Categories=Application;Game;ArcadeGame; -Version=1.0 +Keywords=game;arcade;spacewar;multi-player;classic;retro; diff --git a/xpilot-ng-server.metainfo.xml b/xpilot-ng-server.metainfo.xml new file mode 100644 index 0000000..1adf742 --- /dev/null +++ b/xpilot-ng-server.metainfo.xml @@ -0,0 +1,11 @@ + + + xpilot-ng-server + xpilot-ng-sdl.desktop + CC0-1.0 + GPL-2.0+ + XPilot NG server + Server for hosting XPilot NG games + http://xpilot.sourceforge.net/ + jwrdegoede_at_gmail.com + diff --git a/xpilot-ng-x11.desktop b/xpilot-ng-x11.desktop deleted file mode 100644 index 5c93cfa..0000000 --- a/xpilot-ng-x11.desktop +++ /dev/null @@ -1,11 +0,0 @@ -[Desktop Entry] -Encoding=UTF-8 -Name=XPilot-ng classic -GenericName=XPilot-ng classic -Comment=XPilot client with old-school graphics -Exec=xpilot-ng-x11 -Icon=xpilot-ng.png -Terminal=false -Type=Application -Categories=Application;Game;ArcadeGame; -Version=1.0 diff --git a/xpilot-ng.spec b/xpilot-ng.spec index 05252a8..4c1dd25 100644 --- a/xpilot-ng.spec +++ b/xpilot-ng.spec @@ -4,16 +4,16 @@ Name: xpilot-ng Version: 4.7.3 -Release: 7%{?dist} -Summary: Multiplayer space arcade game +Release: 8%{?dist} +Summary: Multi-player space arcade game Group: Amusements/Games License: GPLv2+ URL: http://xpilot.sourceforge.net Source0: http://downloads.sourceforge.net/sourceforge/xpilot/xpilot-ng-%{version}.tar.gz Source1: xpilot-ng.png -Source2: xpilot-ng-x11.desktop -Source3: xpilot-ng-sdl.desktop +Source2: xpilot-ng-sdl.desktop +Source3: xpilot-ng-sdl.appdata.xml Source4: xpilot-ng-server.service Source5: xpilot-ng.sysconfig Source6: xpilot-ng.logrotate @@ -21,13 +21,17 @@ Source10: logwatch.logconf.xpilot Source11: logwatch.script.xpilot Source12: logwatch.serviceconf.xpilot Source13: logwatch.shared.applyxpilotdate +Source14: xpilot-ng-server.metainfo.xml Patch0: xpilot-ng-4.7.2-scoreassert.patch Patch1: xpilot-ng-4.7.2-rhbz830640.patch +Patch2: xpilot-ng-4.7.3-fix-alut-detect.patch BuildRequires: desktop-file-utils BuildRequires: expat-devel SDL_ttf-devel SDL_image-devel zlib-devel BuildRequires: libXt-devel libGLU-devel libXxf86misc-devel -Requires: dejavu-sans-fonts +BuildRequires: openal-soft-devel freealut-devel automake +Requires: %{name}-data = %{version}-%{release} hicolor-icon-theme +Provides: %{name}-engine = %{version}-%{release} %description A highly addictive, infinitely configurable multiplayer space @@ -36,15 +40,35 @@ obstacles, shooting players and bots, collecting power-ups, and causing general mayhem. +%package x11 +Summary: %{name} X11 version +Requires: %{name}-data = %{version}-%{release} +Provides: %{name}-engine = %{version}-%{release} + +%description x11 +Version of %{name} which uses libX11 rather then SDL. + + +%package data +Summary: Datafiles for %{name} +BuildArch: noarch +Requires: %{name}-engine = %{version}-%{release} dejavu-sans-fonts + +%description data +Datafiles for %{name}. + + %package server -Summary: Server for hosting xpilot games -Group: Amusements/Games -Requires(pre): shadow-utils -Requires(post): systemd-units -Requires(preun): systemd-units -Requires(postun): systemd-units +Summary: Server for hosting xpilot games +Requires: %{name}-data = %{version}-%{release} +Requires(pre): shadow-utils +Requires(post): systemd +Requires(preun): systemd +Requires(postun): systemd +BuildRequires: systemd +Provides: %{name}-engine = %{version}-%{release} # Make sure the old no longer supported selinux policy from 4.7.2 gets removed -Obsoletes: %{name}-selinux < %{version} +Obsoletes: %{name}-selinux < %{version} %description server The xpilot server. This allows you to host xpilot games on your @@ -54,9 +78,9 @@ public xpilot games hosted on the internet. %package logwatch -Summary: logwatch scripts for the xpilot game server -Group: Amusements/Games -Requires: %{name}-server = %{version}-%{release} logwatch +Summary: logwatch scripts for the xpilot game server +Requires: %{name}-server = %{version}-%{release} logwatch + %description logwatch logwatch scripts for the Xpilot game server @@ -65,6 +89,9 @@ logwatch scripts for the Xpilot game server %setup -q %patch0 %patch1 -p1 +%patch2 -p1 +# regenerate autofoo files for patch2 +./bootstrap 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 @@ -74,23 +101,21 @@ popd %build -%configure +%configure --enable-sound make %{?_smp_mflags} %install -make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p" +%make_install INSTALL="install -p" chmod a+x $RPM_BUILD_ROOT/%{_datadir}/%{name}/mapconvert.py -desktop-file-install \ - --dir ${RPM_BUILD_ROOT}%{_datadir}/applications \ - %{SOURCE2} -desktop-file-install \ - --dir ${RPM_BUILD_ROOT}%{_datadir}/applications \ - %{SOURCE3} +desktop-file-install --dir ${RPM_BUILD_ROOT}%{_datadir}/applications %{SOURCE2} mkdir -p $RPM_BUILD_ROOT/%{_datadir}/icons/hicolor/48x48/apps/ install -p -m 644 %{SOURCE1} $RPM_BUILD_ROOT/%{_datadir}/icons/hicolor/48x48/apps/ +mkdir -p $RPM_BUILD_ROOT%{_datadir}/appdata +install -p -m 644 %{SOURCE3} %{SOURCE14} $RPM_BUILD_ROOT%{_datadir}/appdata +appstream-util validate-relax --nonet $RPM_BUILD_ROOT%{_datadir}/appdata/*.xml install -p -D -m 644 %{SOURCE4} $RPM_BUILD_ROOT/lib/systemd/system/%{name}-server.service @@ -139,39 +164,35 @@ useradd -r -g xpilot -d %{_datadir}/%{name} -s /sbin/nologin \ exit 0 %post server -if [ $1 -eq 1 ] ; then - # Initial installation - /bin/systemctl daemon-reload >/dev/null 2>&1 || : -fi +%systemd_post xpilot-ng-server.service %preun server -if [ $1 -eq 0 ] ; then - # Package removal, not upgrade - /bin/systemctl --no-reload disable xpilot-ng-server.service > /dev/null 2>&1 || : - /bin/systemctl stop xpilot-ng-server.service > /dev/null 2>&1 || : -fi +%systemd_preun xpilot-ng-server.service %postun server -/bin/systemctl daemon-reload >/dev/null 2>&1 || : -if [ $1 -ge 1 ] ; then - # Package upgrade, not uninstall - /bin/systemctl try-restart xpilot-ng-server.service >/dev/null 2>&1 || : -fi +%systemd_postun_with_restart xpilot-ng-server.service %files %{_bindir}/xpilot-ng-replay %{_bindir}/xpilot-ng-sdl -%{_bindir}/xpilot-ng-x11 +%{_datadir}/appdata/xpilot-ng-sdl.appdata.xml +%{_datadir}/applications/xpilot-ng-sdl.desktop +%{_datadir}/icons/hicolor/48x48/apps/xpilot-ng.png +%{_mandir}/man6/xpilot-ng-replay.6.gz +%{_mandir}/man6/xpilot-ng-sdl.6.gz + +%files data +%doc AUTHORS BUGS ChangeLog FEATURES README TODO +%license COPYING %dir %{_datadir}/%{name} %{_datadir}/%{name}/textures %{_datadir}/%{name}/fonts -%{_datadir}/applications/*.desktop -%{_datadir}/icons/hicolor/48x48/apps/*.png -%{_mandir}/man6/xpilot-ng-replay.6.gz -%{_mandir}/man6/xpilot-ng-sdl.6.gz +%{_datadir}/%{name}/sound + +%files x11 +%{_bindir}/xpilot-ng-x11 %{_mandir}/man6/xpilot-ng-x11.6.gz -%doc README COPYING %files server %{_bindir}/xpilot-ng-xp-mapedit @@ -179,13 +200,16 @@ fi /lib/systemd/system/xpilot-ng-server.service %config(noreplace) %{_sysconfdir}/logrotate.d/%{name}-server %{_datadir}/%{name} +%exclude %{_datadir}/%{name}/textures +%exclude %{_datadir}/%{name}/fonts +%exclude %{_datadir}/%{name}/sound +%{_datadir}/appdata/xpilot-ng-server.metainfo.xml %dir %{_sysconfdir}/%{name} %config(noreplace) %attr(0600,xpilot,root) %{_sysconfdir}/%{name}/password.txt %config(noreplace) %{_sysconfdir}/%{name}/defaults.txt %config(noreplace) %{_sysconfdir}/%{name}/xpilot-ng-server-cmdline-opts %{_mandir}/man6/xpilot-ng-server.6.gz %{_mandir}/man6/xpilot-ng-xp-mapedit.6.gz -%doc README COPYING %files logwatch %{logwatch_conf}/logfiles/%{name}.conf @@ -195,6 +219,13 @@ fi %changelog +* Sun Jan 31 2016 Hans de Goede - 4.7.3-8 +- Enable sound support +- Use systemd-rpm macros (rhbz#850373) +- Split out client data in a -data package, share it between client and server +- Split out libX11 client version into a -x11 package, drop .desktop for it +- Add appdata + * Fri Jun 19 2015 Fedora Release Engineering - 4.7.3-7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild @@ -210,12 +241,12 @@ fi * Sun Feb 10 2013 Parag Nemade - 4.7.3-3 - Remove vendor tag from desktop file as per https://fedorahosted.org/fesco/ticket/1077 -* Sun Jul 27 2012 Hans de Goede - 4.7.3-2 +* Sun Jul 29 2012 Hans de Goede - 4.7.3-2 - Move server cmdline config file to /etc/xpilot-ng, where all the other config-files are. You can now find it here: /etc/xpilot/xpilot-ng-server-cmdline-opts -* Sun Jul 27 2012 Hans de Goede - 4.7.3-1 +* Sun Jul 29 2012 Hans de Goede - 4.7.3-1 - Fix a crash in the welcome screen (rhbz#830640) - Upgrade to latest upstream 4.7.3 - Drop selinux module, it no longer compiles and selinux support belongs @@ -246,10 +277,10 @@ fi * Mon Dec 01 2008 Ignacio Vazquez-Abrams - 4.7.2-15 - Rebuild for Python 2.6 -* Fri Feb 18 2008 Wart +* Mon Feb 18 2008 Wart - Better Sourceforge download URL -* Fri Feb 18 2008 Wart 4.7.2-14 +* Mon Feb 18 2008 Wart 4.7.2-14 - Rebuild for gcc 4.3 * Thu Aug 23 2007 Wart 4.7.2-13 From 0d05c11dff5ec0bc10146cc8a0e4f4af64e385f4 Mon Sep 17 00:00:00 2001 From: Hans de Goede Date: Mon, 1 Feb 2016 15:00:54 +0100 Subject: [PATCH 26/60] Enable sound support - Use systemd-rpm macros (rhbz#850373) - Split out client data in a -data package, share it between client and server - Split out libX11 client version into a -x11 package, drop .desktop for it - Add appdata --- xpilot-ng.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xpilot-ng.spec b/xpilot-ng.spec index 4c1dd25..6863f3e 100644 --- a/xpilot-ng.spec +++ b/xpilot-ng.spec @@ -26,7 +26,7 @@ Patch0: xpilot-ng-4.7.2-scoreassert.patch Patch1: xpilot-ng-4.7.2-rhbz830640.patch Patch2: xpilot-ng-4.7.3-fix-alut-detect.patch -BuildRequires: desktop-file-utils +BuildRequires: desktop-file-utils libappstream-glib BuildRequires: expat-devel SDL_ttf-devel SDL_image-devel zlib-devel BuildRequires: libXt-devel libGLU-devel libXxf86misc-devel BuildRequires: openal-soft-devel freealut-devel automake From bac903e0f9ce409ff2728e8d79ee151a503a285a Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 5 Feb 2016 03:48:12 +0000 Subject: [PATCH 27/60] - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild --- xpilot-ng.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xpilot-ng.spec b/xpilot-ng.spec index 6863f3e..6aa7f33 100644 --- a/xpilot-ng.spec +++ b/xpilot-ng.spec @@ -4,7 +4,7 @@ Name: xpilot-ng Version: 4.7.3 -Release: 8%{?dist} +Release: 9%{?dist} Summary: Multi-player space arcade game Group: Amusements/Games @@ -219,6 +219,9 @@ exit 0 %changelog +* Fri Feb 05 2016 Fedora Release Engineering - 4.7.3-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + * Sun Jan 31 2016 Hans de Goede - 4.7.3-8 - Enable sound support - Use systemd-rpm macros (rhbz#850373) From 2dd172cd56898daf637149f29883445d9c262587 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 11 Feb 2017 18:07:56 +0000 Subject: [PATCH 28/60] - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild --- xpilot-ng.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xpilot-ng.spec b/xpilot-ng.spec index 6aa7f33..3c0ede6 100644 --- a/xpilot-ng.spec +++ b/xpilot-ng.spec @@ -4,7 +4,7 @@ Name: xpilot-ng Version: 4.7.3 -Release: 9%{?dist} +Release: 10%{?dist} Summary: Multi-player space arcade game Group: Amusements/Games @@ -219,6 +219,9 @@ exit 0 %changelog +* Sat Feb 11 2017 Fedora Release Engineering - 4.7.3-10 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + * Fri Feb 05 2016 Fedora Release Engineering - 4.7.3-9 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild From 4561b124d233555e0683b101850a4a7285cce8be Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 27 Jul 2017 22:24:58 +0000 Subject: [PATCH 29/60] - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild --- xpilot-ng.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xpilot-ng.spec b/xpilot-ng.spec index 3c0ede6..189b00f 100644 --- a/xpilot-ng.spec +++ b/xpilot-ng.spec @@ -4,7 +4,7 @@ Name: xpilot-ng Version: 4.7.3 -Release: 10%{?dist} +Release: 11%{?dist} Summary: Multi-player space arcade game Group: Amusements/Games @@ -219,6 +219,9 @@ exit 0 %changelog +* Thu Jul 27 2017 Fedora Release Engineering - 4.7.3-11 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + * Sat Feb 11 2017 Fedora Release Engineering - 4.7.3-10 - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild From f752a8ad6f968791f9daee2896ade528b6ae5ac2 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 3 Aug 2017 10:57:08 +0000 Subject: [PATCH 30/60] - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild --- xpilot-ng.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xpilot-ng.spec b/xpilot-ng.spec index 189b00f..2a34f9e 100644 --- a/xpilot-ng.spec +++ b/xpilot-ng.spec @@ -4,7 +4,7 @@ Name: xpilot-ng Version: 4.7.3 -Release: 11%{?dist} +Release: 12%{?dist} Summary: Multi-player space arcade game Group: Amusements/Games @@ -219,6 +219,9 @@ exit 0 %changelog +* Thu Aug 03 2017 Fedora Release Engineering - 4.7.3-12 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild + * Thu Jul 27 2017 Fedora Release Engineering - 4.7.3-11 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild From 12dcdabfe15fc17c3a4b6ba0e3e9aa8cf228a13b Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Thu, 18 Jan 2018 22:54:24 +0100 Subject: [PATCH 31/60] Remove obsolete scriptlets Signed-off-by: Igor Gnatenko --- xpilot-ng.spec | 19 ++++--------------- 1 file changed, 4 insertions(+), 15 deletions(-) diff --git a/xpilot-ng.spec b/xpilot-ng.spec index 2a34f9e..4b9067f 100644 --- a/xpilot-ng.spec +++ b/xpilot-ng.spec @@ -4,7 +4,7 @@ Name: xpilot-ng Version: 4.7.3 -Release: 12%{?dist} +Release: 13%{?dist} Summary: Multi-player space arcade game Group: Amusements/Games @@ -142,20 +142,6 @@ install -pD -m 0755 %{SOURCE11} $RPM_BUILD_ROOT%{logwatch_scripts}/services/%{na install -pD -m 0644 %{SOURCE12} $RPM_BUILD_ROOT%{logwatch_conf}/services/%{name}.conf install -pD -m 0755 %{SOURCE13} $RPM_BUILD_ROOT%{logwatch_scripts}/shared/applyxpilotdate - -%post -touch --no-create %{_datadir}/icons/hicolor &>/dev/null || : - -%postun -if [ $1 -eq 0 ] ; then - touch --no-create %{_datadir}/icons/hicolor &>/dev/null - gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : -fi - -%posttrans -gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : - - %pre server getent group xpilot >/dev/null || groupadd -r xpilot getent passwd xpilot >/dev/null || \ @@ -219,6 +205,9 @@ exit 0 %changelog +* Thu Jan 18 2018 Igor Gnatenko - 4.7.3-13 +- Remove obsolete scriptlets + * Thu Aug 03 2017 Fedora Release Engineering - 4.7.3-12 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild From 050f48c63707324d8dbd2be5dd3efa8f327b8ddf Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 9 Feb 2018 22:02:59 +0000 Subject: [PATCH 32/60] - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- xpilot-ng.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xpilot-ng.spec b/xpilot-ng.spec index 4b9067f..8471f36 100644 --- a/xpilot-ng.spec +++ b/xpilot-ng.spec @@ -4,7 +4,7 @@ Name: xpilot-ng Version: 4.7.3 -Release: 13%{?dist} +Release: 14%{?dist} Summary: Multi-player space arcade game Group: Amusements/Games @@ -205,6 +205,9 @@ exit 0 %changelog +* Fri Feb 09 2018 Fedora Release Engineering - 4.7.3-14 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + * Thu Jan 18 2018 Igor Gnatenko - 4.7.3-13 - Remove obsolete scriptlets From cfa958fd66f2c77e0ec5a94ed98dc00556a4ff3c Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Mon, 9 Jul 2018 19:06:54 +0200 Subject: [PATCH 33/60] add BuildRequires: gcc Reference: https://fedoraproject.org/wiki/Changes/Remove_GCC_from_BuildRoot --- xpilot-ng.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/xpilot-ng.spec b/xpilot-ng.spec index 8471f36..fbb3a2f 100644 --- a/xpilot-ng.spec +++ b/xpilot-ng.spec @@ -26,6 +26,7 @@ Patch0: xpilot-ng-4.7.2-scoreassert.patch Patch1: xpilot-ng-4.7.2-rhbz830640.patch Patch2: xpilot-ng-4.7.3-fix-alut-detect.patch +BuildRequires: gcc BuildRequires: desktop-file-utils libappstream-glib BuildRequires: expat-devel SDL_ttf-devel SDL_image-devel zlib-devel BuildRequires: libXt-devel libGLU-devel libXxf86misc-devel From 6caed7d9c77746e535e2df88feac78c296bd4d0f Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 14 Jul 2018 09:33:18 +0000 Subject: [PATCH 34/60] - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- xpilot-ng.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xpilot-ng.spec b/xpilot-ng.spec index fbb3a2f..95a4abd 100644 --- a/xpilot-ng.spec +++ b/xpilot-ng.spec @@ -4,7 +4,7 @@ Name: xpilot-ng Version: 4.7.3 -Release: 14%{?dist} +Release: 15%{?dist} Summary: Multi-player space arcade game Group: Amusements/Games @@ -206,6 +206,9 @@ exit 0 %changelog +* Sat Jul 14 2018 Fedora Release Engineering - 4.7.3-15 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + * Fri Feb 09 2018 Fedora Release Engineering - 4.7.3-14 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild From 794d10622d836630e8af21da2a17653e0fca014e Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Mon, 28 Jan 2019 20:18:32 +0100 Subject: [PATCH 35/60] Remove obsolete Group tag References: https://fedoraproject.org/wiki/Changes/Remove_Group_Tag --- xpilot-ng.spec | 1 - 1 file changed, 1 deletion(-) diff --git a/xpilot-ng.spec b/xpilot-ng.spec index 95a4abd..2879048 100644 --- a/xpilot-ng.spec +++ b/xpilot-ng.spec @@ -7,7 +7,6 @@ Version: 4.7.3 Release: 15%{?dist} Summary: Multi-player space arcade game -Group: Amusements/Games License: GPLv2+ URL: http://xpilot.sourceforge.net Source0: http://downloads.sourceforge.net/sourceforge/xpilot/xpilot-ng-%{version}.tar.gz From 0ca0d68e831a5629a9ff83370a79c94f8d8cb42b Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sun, 3 Feb 2019 12:47:05 +0000 Subject: [PATCH 36/60] - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- xpilot-ng.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xpilot-ng.spec b/xpilot-ng.spec index 2879048..ade2824 100644 --- a/xpilot-ng.spec +++ b/xpilot-ng.spec @@ -4,7 +4,7 @@ Name: xpilot-ng Version: 4.7.3 -Release: 15%{?dist} +Release: 16%{?dist} Summary: Multi-player space arcade game License: GPLv2+ @@ -205,6 +205,9 @@ exit 0 %changelog +* Sun Feb 03 2019 Fedora Release Engineering - 4.7.3-16 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + * Sat Jul 14 2018 Fedora Release Engineering - 4.7.3-15 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild From b72c9a38f20e2829b44140d3a9904e1e17e1305f Mon Sep 17 00:00:00 2001 From: Hans de Goede Date: Sat, 23 Feb 2019 17:00:57 +0100 Subject: [PATCH 37/60] Fix FTBFS (rhbz#1676250) --- logwatch.script.xpilot | 0 logwatch.shared.applyxpilotdate | 0 xpilot-ng-4.7.2-scoreassert.patch | 4 ++-- xpilot-ng.spec | 15 ++++++++------- 4 files changed, 10 insertions(+), 9 deletions(-) mode change 100755 => 100644 logwatch.script.xpilot mode change 100755 => 100644 logwatch.shared.applyxpilotdate diff --git a/logwatch.script.xpilot b/logwatch.script.xpilot old mode 100755 new mode 100644 diff --git a/logwatch.shared.applyxpilotdate b/logwatch.shared.applyxpilotdate old mode 100755 new mode 100644 diff --git a/xpilot-ng-4.7.2-scoreassert.patch b/xpilot-ng-4.7.2-scoreassert.patch index c5573f4..560fdc3 100644 --- a/xpilot-ng-4.7.2-scoreassert.patch +++ b/xpilot-ng-4.7.2-scoreassert.patch @@ -1,5 +1,5 @@ ---- src/server/score.c.orig 2006-10-20 11:38:01.000000000 -0700 -+++ src/server/score.c 2006-10-20 12:44:30.000000000 -0700 +--- a/src/server/score.c.orig 2006-10-20 11:38:01.000000000 -0700 ++++ b/src/server/score.c 2006-10-20 12:44:30.000000000 -0700 @@ -257,9 +257,13 @@ sc = Rate(cannon->score, Get_Score(victim)) * options.cannonKillScoreMult; diff --git a/xpilot-ng.spec b/xpilot-ng.spec index ade2824..0f67795 100644 --- a/xpilot-ng.spec +++ b/xpilot-ng.spec @@ -4,7 +4,7 @@ Name: xpilot-ng Version: 4.7.3 -Release: 16%{?dist} +Release: 17%{?dist} Summary: Multi-player space arcade game License: GPLv2+ @@ -86,10 +86,7 @@ logwatch scripts for the Xpilot game server %prep -%setup -q -%patch0 -%patch1 -p1 -%patch2 -p1 +%autosetup -p1 # regenerate autofoo files for patch2 ./bootstrap pushd doc/man @@ -98,6 +95,7 @@ mv xpilot-ng-server.man.new xpilot-ng-server.man iconv --from=ISO-8859-1 --to=UTF-8 xpilot-ng-x11.man > xpilot-ng-x11.man.new mv xpilot-ng-x11.man.new xpilot-ng-x11.man popd +sed -i 's:/usr/bin/env python:/usr/bin/python2:' mapconvert.py %build @@ -138,9 +136,9 @@ ln -s %{_datadir}/fonts/dejavu/DejaVuSansMono-Bold.ttf $RPM_BUILD_ROOT%{_datadir # 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} +install -pD -m 0644 %{SOURCE11} $RPM_BUILD_ROOT%{logwatch_scripts}/services/%{name} install -pD -m 0644 %{SOURCE12} $RPM_BUILD_ROOT%{logwatch_conf}/services/%{name}.conf -install -pD -m 0755 %{SOURCE13} $RPM_BUILD_ROOT%{logwatch_scripts}/shared/applyxpilotdate +install -pD -m 0644 %{SOURCE13} $RPM_BUILD_ROOT%{logwatch_scripts}/shared/applyxpilotdate %pre server getent group xpilot >/dev/null || groupadd -r xpilot @@ -205,6 +203,9 @@ exit 0 %changelog +* Sat Feb 23 2019 Hans de Goede - 4.7.3-17 +- Fix FTBFS (rhbz#1676250) + * Sun Feb 03 2019 Fedora Release Engineering - 4.7.3-16 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild From 58a65185d31ada4e22fafd1d2380f9d277817e0f Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 27 Jul 2019 04:36:07 +0000 Subject: [PATCH 38/60] - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- xpilot-ng.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xpilot-ng.spec b/xpilot-ng.spec index 0f67795..109762a 100644 --- a/xpilot-ng.spec +++ b/xpilot-ng.spec @@ -4,7 +4,7 @@ Name: xpilot-ng Version: 4.7.3 -Release: 17%{?dist} +Release: 18%{?dist} Summary: Multi-player space arcade game License: GPLv2+ @@ -203,6 +203,9 @@ exit 0 %changelog +* Sat Jul 27 2019 Fedora Release Engineering - 4.7.3-18 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + * Sat Feb 23 2019 Hans de Goede - 4.7.3-17 - Fix FTBFS (rhbz#1676250) From 917b4d6851b45210c85672f82ac6248bad2f98e1 Mon Sep 17 00:00:00 2001 From: Hans de Goede Date: Sat, 10 Aug 2019 21:50:22 +0200 Subject: [PATCH 39/60] Drop libXxf86misc-devel BuildRequires, all #if HAVE_XF86MISC code was commented out already, so this does not influence xpilot-ng behavior Fix FTBFS (rhbz#1736985) Drop script for converting old format maps, because it is Python 2 only Fix a bunch of rpmlint warnings, ignore others --- xpilot-ng.rpmlintrc | 5 +++++ xpilot-ng.spec | 43 +++++++++++++++++++++++++++++++------------ 2 files changed, 36 insertions(+), 12 deletions(-) create mode 100644 xpilot-ng.rpmlintrc diff --git a/xpilot-ng.rpmlintrc b/xpilot-ng.rpmlintrc new file mode 100644 index 0000000..a8fdd7a --- /dev/null +++ b/xpilot-ng.rpmlintrc @@ -0,0 +1,5 @@ +addFilter("incorrect-fsf-address") +addFilter("dangling-symlink") +addFilter("no-documentation") +addFilter("non-standard-uid") +addFilter("non-readable") diff --git a/xpilot-ng.spec b/xpilot-ng.spec index 109762a..8b579dd 100644 --- a/xpilot-ng.spec +++ b/xpilot-ng.spec @@ -4,8 +4,8 @@ Name: xpilot-ng Version: 4.7.3 -Release: 18%{?dist} -Summary: Multi-player space arcade game +Release: 19%{?dist} +Summary: Space arcade game for multiple players License: GPLv2+ URL: http://xpilot.sourceforge.net @@ -28,20 +28,20 @@ Patch2: xpilot-ng-4.7.3-fix-alut-detect.patch BuildRequires: gcc BuildRequires: desktop-file-utils libappstream-glib BuildRequires: expat-devel SDL_ttf-devel SDL_image-devel zlib-devel -BuildRequires: libXt-devel libGLU-devel libXxf86misc-devel +BuildRequires: libXt-devel libGLU-devel BuildRequires: openal-soft-devel freealut-devel automake Requires: %{name}-data = %{version}-%{release} hicolor-icon-theme Provides: %{name}-engine = %{version}-%{release} %description -A highly addictive, infinitely configurable multiplayer space +A highly addictive, infinitely configurable multi-player space arcade game. You pilot a spaceship around space, dodging obstacles, shooting players and bots, collecting power-ups, and causing general mayhem. %package x11 -Summary: %{name} X11 version +Summary: Xpilot-ng X11 version Requires: %{name}-data = %{version}-%{release} Provides: %{name}-engine = %{version}-%{release} @@ -50,17 +50,18 @@ Version of %{name} which uses libX11 rather then SDL. %package data -Summary: Datafiles for %{name} +Summary: Data files for %{name} BuildArch: noarch Requires: %{name}-engine = %{version}-%{release} dejavu-sans-fonts %description data -Datafiles for %{name}. +Data files for %{name}. %package server Summary: Server for hosting xpilot games Requires: %{name}-data = %{version}-%{release} +Requires: logrotate Requires(pre): shadow-utils Requires(post): systemd Requires(preun): systemd @@ -68,7 +69,8 @@ Requires(postun): systemd BuildRequires: systemd Provides: %{name}-engine = %{version}-%{release} # Make sure the old no longer supported selinux policy from 4.7.2 gets removed -Obsoletes: %{name}-selinux < %{version} +Obsoletes: %{name}-selinux < %{version}-%{release} +Provides: %{name}-selinux = %{version}-%{release} %description server The xpilot server. This allows you to host xpilot games on your @@ -78,7 +80,7 @@ public xpilot games hosted on the internet. %package logwatch -Summary: logwatch scripts for the xpilot game server +Summary: Logwatch scripts for the xpilot game server Requires: %{name}-server = %{version}-%{release} logwatch %description logwatch @@ -88,25 +90,35 @@ logwatch scripts for the Xpilot game server %prep %autosetup -p1 # regenerate autofoo files for patch2 -./bootstrap +autoreconf -ivf +# fixup textfile encodings pushd doc/man iconv --from=ISO-8859-1 --to=UTF-8 xpilot-ng-server.man > xpilot-ng-server.man.new +touch -r xpilot-ng-server.man xpilot-ng-server.man.new mv xpilot-ng-server.man.new xpilot-ng-server.man + iconv --from=ISO-8859-1 --to=UTF-8 xpilot-ng-x11.man > xpilot-ng-x11.man.new +touch -r xpilot-ng-x11.man xpilot-ng-x11.man.new mv xpilot-ng-x11.man.new xpilot-ng-x11.man popd -sed -i 's:/usr/bin/env python:/usr/bin/python2:' mapconvert.py + +iconv --from=ISO-8859-1 --to=UTF-8 AUTHORS > AUTHORS.new +touch -r AUTHORS AUTHORS.new +mv AUTHORS.new AUTHORS %build %configure --enable-sound +iconv --from=ISO-8859-1 --to=UTF-8 README -o README +touch -r README.in README make %{?_smp_mflags} %install %make_install INSTALL="install -p" -chmod a+x $RPM_BUILD_ROOT/%{_datadir}/%{name}/mapconvert.py +# Drop old Python 2 only map conversion script +rm $RPM_BUILD_ROOT/%{_datadir}/%{name}/mapconvert.py desktop-file-install --dir ${RPM_BUILD_ROOT}%{_datadir}/applications %{SOURCE2} mkdir -p $RPM_BUILD_ROOT/%{_datadir}/icons/hicolor/48x48/apps/ @@ -203,6 +215,13 @@ exit 0 %changelog +* Sat Aug 10 2019 Hans de Goede - 4.7.3-19 +- Drop libXxf86misc-devel BuildRequires, all #if HAVE_XF86MISC code was + commented out already, so this does not influence xpilot-ng behavior +- Fix FTBFS (rhbz#1736985) +- Drop script for converting old format maps, because it is Python 2 only +- Fix a bunch of rpmlint warnings, ignore others + * Sat Jul 27 2019 Fedora Release Engineering - 4.7.3-18 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild From 33e3a585cbec6a0a32c18ca4806f2568fe30d749 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 31 Jan 2020 04:52:13 +0000 Subject: [PATCH 40/60] - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- xpilot-ng.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xpilot-ng.spec b/xpilot-ng.spec index 8b579dd..c75651f 100644 --- a/xpilot-ng.spec +++ b/xpilot-ng.spec @@ -4,7 +4,7 @@ Name: xpilot-ng Version: 4.7.3 -Release: 19%{?dist} +Release: 20%{?dist} Summary: Space arcade game for multiple players License: GPLv2+ @@ -215,6 +215,9 @@ exit 0 %changelog +* Fri Jan 31 2020 Fedora Release Engineering - 4.7.3-20 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + * Sat Aug 10 2019 Hans de Goede - 4.7.3-19 - Drop libXxf86misc-devel BuildRequires, all #if HAVE_XF86MISC code was commented out already, so this does not influence xpilot-ng behavior From 68afb68b6d1117cc07115c4d1b8ce71239ae1172 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 29 Jul 2020 15:02:53 +0000 Subject: [PATCH 41/60] - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- xpilot-ng.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xpilot-ng.spec b/xpilot-ng.spec index c75651f..b268e3c 100644 --- a/xpilot-ng.spec +++ b/xpilot-ng.spec @@ -4,7 +4,7 @@ Name: xpilot-ng Version: 4.7.3 -Release: 20%{?dist} +Release: 21%{?dist} Summary: Space arcade game for multiple players License: GPLv2+ @@ -215,6 +215,9 @@ exit 0 %changelog +* Wed Jul 29 2020 Fedora Release Engineering - 4.7.3-21 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + * Fri Jan 31 2020 Fedora Release Engineering - 4.7.3-20 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild From db860f79aa07cdfc338ea89298adf48fab38a9ff Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 1 Aug 2020 09:47:56 +0000 Subject: [PATCH 42/60] - Second attempt - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- xpilot-ng.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/xpilot-ng.spec b/xpilot-ng.spec index b268e3c..212451b 100644 --- a/xpilot-ng.spec +++ b/xpilot-ng.spec @@ -4,7 +4,7 @@ Name: xpilot-ng Version: 4.7.3 -Release: 21%{?dist} +Release: 22%{?dist} Summary: Space arcade game for multiple players License: GPLv2+ @@ -215,6 +215,10 @@ exit 0 %changelog +* Sat Aug 01 2020 Fedora Release Engineering - 4.7.3-22 +- Second attempt - Rebuilt for + https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + * Wed Jul 29 2020 Fedora Release Engineering - 4.7.3-21 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild From 13205eaea085d0cdb088ebc05f1e9a36823dd2e3 Mon Sep 17 00:00:00 2001 From: Tom Stellard Date: Sat, 9 Jan 2021 01:36:31 +0000 Subject: [PATCH 43/60] Add BuildRequires: make https://fedoraproject.org/wiki/Changes/Remove_make_from_BuildRoot --- xpilot-ng.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/xpilot-ng.spec b/xpilot-ng.spec index 212451b..8975b33 100644 --- a/xpilot-ng.spec +++ b/xpilot-ng.spec @@ -25,6 +25,7 @@ Patch0: xpilot-ng-4.7.2-scoreassert.patch Patch1: xpilot-ng-4.7.2-rhbz830640.patch Patch2: xpilot-ng-4.7.3-fix-alut-detect.patch +BuildRequires: make BuildRequires: gcc BuildRequires: desktop-file-utils libappstream-glib BuildRequires: expat-devel SDL_ttf-devel SDL_image-devel zlib-devel From 572a101abaddf6446556130f6e87c0e6aebbc4c8 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 28 Jan 2021 00:21:31 +0000 Subject: [PATCH 44/60] - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- xpilot-ng.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xpilot-ng.spec b/xpilot-ng.spec index 8975b33..19d9f39 100644 --- a/xpilot-ng.spec +++ b/xpilot-ng.spec @@ -4,7 +4,7 @@ Name: xpilot-ng Version: 4.7.3 -Release: 22%{?dist} +Release: 23%{?dist} Summary: Space arcade game for multiple players License: GPLv2+ @@ -216,6 +216,9 @@ exit 0 %changelog +* Thu Jan 28 2021 Fedora Release Engineering - 4.7.3-23 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + * Sat Aug 01 2020 Fedora Release Engineering - 4.7.3-22 - Second attempt - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild From abd90bea62e413b840e41e3af9ac8fb3c6def86f Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 23 Jul 2021 21:54:37 +0000 Subject: [PATCH 45/60] - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- xpilot-ng.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xpilot-ng.spec b/xpilot-ng.spec index 19d9f39..020ae8d 100644 --- a/xpilot-ng.spec +++ b/xpilot-ng.spec @@ -4,7 +4,7 @@ Name: xpilot-ng Version: 4.7.3 -Release: 23%{?dist} +Release: 24%{?dist} Summary: Space arcade game for multiple players License: GPLv2+ @@ -216,6 +216,9 @@ exit 0 %changelog +* Fri Jul 23 2021 Fedora Release Engineering - 4.7.3-24 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + * Thu Jan 28 2021 Fedora Release Engineering - 4.7.3-23 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild From 0073bc9cf93dfea933dcdae4f1819e841caea9a3 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 22 Jan 2022 05:27:50 +0000 Subject: [PATCH 46/60] - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- xpilot-ng.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xpilot-ng.spec b/xpilot-ng.spec index 020ae8d..fe3ac43 100644 --- a/xpilot-ng.spec +++ b/xpilot-ng.spec @@ -4,7 +4,7 @@ Name: xpilot-ng Version: 4.7.3 -Release: 24%{?dist} +Release: 25%{?dist} Summary: Space arcade game for multiple players License: GPLv2+ @@ -216,6 +216,9 @@ exit 0 %changelog +* Sat Jan 22 2022 Fedora Release Engineering - 4.7.3-25 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + * Fri Jul 23 2021 Fedora Release Engineering - 4.7.3-24 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild From 543da5e2d0c6698172ff356cb5317edf81098992 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 23 Jul 2022 13:29:00 +0000 Subject: [PATCH 47/60] Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- xpilot-ng.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xpilot-ng.spec b/xpilot-ng.spec index fe3ac43..ffd6c7b 100644 --- a/xpilot-ng.spec +++ b/xpilot-ng.spec @@ -4,7 +4,7 @@ Name: xpilot-ng Version: 4.7.3 -Release: 25%{?dist} +Release: 26%{?dist} Summary: Space arcade game for multiple players License: GPLv2+ @@ -216,6 +216,9 @@ exit 0 %changelog +* Sat Jul 23 2022 Fedora Release Engineering - 4.7.3-26 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + * Sat Jan 22 2022 Fedora Release Engineering - 4.7.3-25 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild From 503435cedf1285f8b5e794990ca08c140b3ff335 Mon Sep 17 00:00:00 2001 From: Florian Weimer Date: Thu, 22 Dec 2022 11:53:45 +0100 Subject: [PATCH 48/60] C99 port (#2155781); fix issue due to SDL_Window identifier conflict Related to: --- xpilot-ng-SDL_window.patch | 13 +++++++++++++ xpilot-ng-c99.patch | 16 ++++++++++++++++ xpilot-ng.spec | 8 +++++++- 3 files changed, 36 insertions(+), 1 deletion(-) create mode 100644 xpilot-ng-SDL_window.patch create mode 100644 xpilot-ng-c99.patch diff --git a/xpilot-ng-SDL_window.patch b/xpilot-ng-SDL_window.patch new file mode 100644 index 0000000..e2a9ba9 --- /dev/null +++ b/xpilot-ng-SDL_window.patch @@ -0,0 +1,13 @@ +diff --git a/src/client/sdl/scrap.c b/src/client/sdl/scrap.c +index e86beaff931d66e9..557e33f206f84d12 100644 +--- a/src/client/sdl/scrap.c ++++ b/src/client/sdl/scrap.c +@@ -57,6 +57,8 @@ typedef uint32_t scrap_type; + #if defined(X11_SCRAP) + /* * */ + static Display *SDL_Display; ++/* Avoid conflict with SDL_Window defined in . */ ++#define SDL_Window SDL_Window_variable + static Window SDL_Window; + static void (*Lock_Display)(void); + static void (*Unlock_Display)(void); diff --git a/xpilot-ng-c99.patch b/xpilot-ng-c99.patch new file mode 100644 index 0000000..c003c25 --- /dev/null +++ b/xpilot-ng-c99.patch @@ -0,0 +1,16 @@ +Avoid implicit declaration of the Move_point function in +Wall_in_between_points in suibotdef.c. + +diff --git a/src/server/server.h b/src/server/server.h +index 5c0cdd66de1db008..30b7f7d0a8fb09e4 100644 +--- a/src/server/server.h ++++ b/src/server/server.h +@@ -151,6 +151,8 @@ void Groups_init(void); + void Walls_init(void); + void Treasure_init(void); + void Move_init(void); ++struct collans; ++void Move_point(const move_t *move, struct collans *answer); + void Move_object(object_t *obj); + void Move_player(player_t *pl); + void Turn_player(player_t *pl, bool push); diff --git a/xpilot-ng.spec b/xpilot-ng.spec index ffd6c7b..d34d162 100644 --- a/xpilot-ng.spec +++ b/xpilot-ng.spec @@ -4,7 +4,7 @@ Name: xpilot-ng Version: 4.7.3 -Release: 26%{?dist} +Release: 27%{?dist} Summary: Space arcade game for multiple players License: GPLv2+ @@ -24,6 +24,8 @@ Source14: xpilot-ng-server.metainfo.xml Patch0: xpilot-ng-4.7.2-scoreassert.patch Patch1: xpilot-ng-4.7.2-rhbz830640.patch Patch2: xpilot-ng-4.7.3-fix-alut-detect.patch +Patch3: xpilot-ng-c99.patch +Patch4: xpilot-ng-SDL_window.patch BuildRequires: make BuildRequires: gcc @@ -216,6 +218,10 @@ exit 0 %changelog +* Thu Dec 22 2022 Florian Weimer - 4.7.3-27 +- C99 port (#2155781) +- Fix build issue due to SDL_Window identifier conflict with newer SDL + * Sat Jul 23 2022 Fedora Release Engineering - 4.7.3-26 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild From 0111751ab40b70c7198c6d32e2db0431516aea7d Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 21 Jan 2023 07:49:06 +0000 Subject: [PATCH 49/60] Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- xpilot-ng.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xpilot-ng.spec b/xpilot-ng.spec index d34d162..3b783b6 100644 --- a/xpilot-ng.spec +++ b/xpilot-ng.spec @@ -4,7 +4,7 @@ Name: xpilot-ng Version: 4.7.3 -Release: 27%{?dist} +Release: 28%{?dist} Summary: Space arcade game for multiple players License: GPLv2+ @@ -218,6 +218,9 @@ exit 0 %changelog +* Sat Jan 21 2023 Fedora Release Engineering - 4.7.3-28 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + * Thu Dec 22 2022 Florian Weimer - 4.7.3-27 - C99 port (#2155781) - Fix build issue due to SDL_Window identifier conflict with newer SDL From c88d59c02d3653c019992f7fac2c48c3c95c6d7e Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 22 Jul 2023 19:14:49 +0000 Subject: [PATCH 50/60] Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- xpilot-ng.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xpilot-ng.spec b/xpilot-ng.spec index 3b783b6..10a75af 100644 --- a/xpilot-ng.spec +++ b/xpilot-ng.spec @@ -4,7 +4,7 @@ Name: xpilot-ng Version: 4.7.3 -Release: 28%{?dist} +Release: 29%{?dist} Summary: Space arcade game for multiple players License: GPLv2+ @@ -218,6 +218,9 @@ exit 0 %changelog +* Sat Jul 22 2023 Fedora Release Engineering - 4.7.3-29 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + * Sat Jan 21 2023 Fedora Release Engineering - 4.7.3-28 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild From f24393bb226870346a55e003945f968d98eba216 Mon Sep 17 00:00:00 2001 From: Florian Weimer Date: Tue, 9 Jan 2024 16:24:45 +0100 Subject: [PATCH 51/60] Additional C compatibility fixes (#2155781) --- ...ot-ng-c99-incompatible-pointer-types.patch | 114 ++++++++++++++++++ xpilot-ng-c99-return-mismatch.patch | 13 ++ xpilot-ng.spec | 7 +- 3 files changed, 133 insertions(+), 1 deletion(-) create mode 100644 xpilot-ng-c99-incompatible-pointer-types.patch create mode 100644 xpilot-ng-c99-return-mismatch.patch diff --git a/xpilot-ng-c99-incompatible-pointer-types.patch b/xpilot-ng-c99-incompatible-pointer-types.patch new file mode 100644 index 0000000..2679a6b --- /dev/null +++ b/xpilot-ng-c99-incompatible-pointer-types.patch @@ -0,0 +1,114 @@ +diff --git a/src/mapedit/proto.h b/src/mapedit/proto.h +index b4f19f7d25cfe63d..d6222f5c7aa02e83 100644 +--- a/src/mapedit/proto.h ++++ b/src/mapedit/proto.h +@@ -73,15 +73,15 @@ int NewMap(HandlerInfo_t info); + int ResizeWidth(HandlerInfo_t info); + int ResizeHeight(HandlerInfo_t info); + int OpenPreferencesPopup(HandlerInfo_t info); +-int OpenMapInfoPopup(void); +-int OpenRobotsPopup(void); +-int OpenVisibilityPopup(void); +-int OpenCannonsPopup(void); +-int OpenRoundsPopup(void); +-int OpenInitItemsPopup(void); +-int OpenMaxItemsPopup(void); +-int OpenProbsPopup(void); +-int OpenScoringPopup(void); ++int OpenMapInfoPopup(HandlerInfo_t info); ++int OpenRobotsPopup(HandlerInfo_t info); ++int OpenVisibilityPopup(HandlerInfo_t info); ++int OpenCannonsPopup(HandlerInfo_t info); ++int OpenRoundsPopup(HandlerInfo_t info); ++int OpenInitItemsPopup(HandlerInfo_t info); ++int OpenMaxItemsPopup(HandlerInfo_t info); ++int OpenProbsPopup(HandlerInfo_t info); ++int OpenScoringPopup(HandlerInfo_t info); + int ValidateCoordHandler(HandlerInfo_t info); + int ShowHoles(HandlerInfo_t info); + char MapData(int x, int y); +diff --git a/src/mapedit/tools.c b/src/mapedit/tools.c +index b99840a257dfa6f6..24a3ca0693e7bb02 100644 +--- a/src/mapedit/tools.c ++++ b/src/mapedit/tools.c +@@ -747,7 +747,7 @@ int OpenPreferencesPopup(HandlerInfo_t info) + /* Arguments : */ + /* Purpose : */ + /***************************************************************************/ +-int OpenMapInfoPopup() ++int OpenMapInfoPopup(HandlerInfo_t info) + { + Window *temp; + +@@ -790,7 +790,7 @@ int OpenMapInfoPopup() + /* Arguments : */ + /* Purpose : */ + /***************************************************************************/ +-int OpenRobotsPopup() ++int OpenRobotsPopup(HandlerInfo_t info) + { + XMapWindow(display, robots); + return 0; +@@ -801,7 +801,7 @@ int OpenRobotsPopup() + /* Arguments : */ + /* Purpose : */ + /***************************************************************************/ +-int OpenVisibilityPopup() ++int OpenVisibilityPopup(HandlerInfo_t info) + { + XMapWindow(display, visibility); + return 0; +@@ -812,7 +812,7 @@ int OpenVisibilityPopup() + /* Arguments : */ + /* Purpose : */ + /***************************************************************************/ +-int OpenCannonsPopup() ++int OpenCannonsPopup(HandlerInfo_t info) + { + XMapWindow(display, cannons); + return 0; +@@ -823,7 +823,7 @@ int OpenCannonsPopup() + /* Arguments : */ + /* Purpose : */ + /***************************************************************************/ +-int OpenRoundsPopup() ++int OpenRoundsPopup(HandlerInfo_t info) + { + XMapWindow(display, rounds); + return 0; +@@ -834,7 +834,7 @@ int OpenRoundsPopup() + /* Arguments : */ + /* Purpose : */ + /***************************************************************************/ +-int OpenInitItemsPopup() ++int OpenInitItemsPopup(HandlerInfo_t info) + { + XMapWindow(display, inititems); + return 0; +@@ -845,7 +845,7 @@ int OpenInitItemsPopup() + /* Arguments : */ + /* Purpose : */ + /***************************************************************************/ +-int OpenMaxItemsPopup() ++int OpenMaxItemsPopup(HandlerInfo_t info) + { + XMapWindow(display, maxitems); + return 0; +@@ -856,7 +856,7 @@ int OpenMaxItemsPopup() + /* Arguments : */ + /* Purpose : */ + /***************************************************************************/ +-int OpenProbsPopup() ++int OpenProbsPopup(HandlerInfo_t info) + { + XMapWindow(display, probs); + return 0; +@@ -867,7 +867,7 @@ int OpenProbsPopup() + /* Arguments : */ + /* Purpose : */ + /***************************************************************************/ +-int OpenScoringPopup() ++int OpenScoringPopup(HandlerInfo_t info) + { + XMapWindow(display, scoring); + return 0; diff --git a/xpilot-ng-c99-return-mismatch.patch b/xpilot-ng-c99-return-mismatch.patch new file mode 100644 index 0000000..ab75308 --- /dev/null +++ b/xpilot-ng-c99-return-mismatch.patch @@ -0,0 +1,13 @@ +diff --git a/src/server/suibotdef.c b/src/server/suibotdef.c +index d5202e3c323f0a8f..494f73f531848817 100644 +--- a/src/server/suibotdef.c ++++ b/src/server/suibotdef.c +@@ -405,7 +405,7 @@ static bool Get_object_proximity(player_t *pl, object_t *shot, double sqmaxdist, + /* ignore if there is enough time to deal with this object later */ + if((time_until_closest < 0) || (time_until_closest > maxtime)) + /*option instead of fixed value: options.dodgetime))*/ +- return; ++ return false; + + /* get the square of the distance */ + sqdistance = diff --git a/xpilot-ng.spec b/xpilot-ng.spec index 10a75af..46ab065 100644 --- a/xpilot-ng.spec +++ b/xpilot-ng.spec @@ -4,7 +4,7 @@ Name: xpilot-ng Version: 4.7.3 -Release: 29%{?dist} +Release: 30%{?dist} Summary: Space arcade game for multiple players License: GPLv2+ @@ -26,6 +26,8 @@ Patch1: xpilot-ng-4.7.2-rhbz830640.patch Patch2: xpilot-ng-4.7.3-fix-alut-detect.patch Patch3: xpilot-ng-c99.patch Patch4: xpilot-ng-SDL_window.patch +Patch5: xpilot-ng-c99-return-mismatch.patch +Patch6: xpilot-ng-c99-incompatible-pointer-types.patch BuildRequires: make BuildRequires: gcc @@ -218,6 +220,9 @@ exit 0 %changelog +* Tue Jan 09 2024 Florian Weimer - 4.7.3-30 +- Additional C compatibility fixes (#2155781) + * Sat Jul 22 2023 Fedora Release Engineering - 4.7.3-29 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild From 95420e8f49185e6a1473a0a493ede8785af1c1dd Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 27 Jan 2024 10:06:04 +0000 Subject: [PATCH 52/60] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- xpilot-ng.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xpilot-ng.spec b/xpilot-ng.spec index 46ab065..f595487 100644 --- a/xpilot-ng.spec +++ b/xpilot-ng.spec @@ -4,7 +4,7 @@ Name: xpilot-ng Version: 4.7.3 -Release: 30%{?dist} +Release: 31%{?dist} Summary: Space arcade game for multiple players License: GPLv2+ @@ -220,6 +220,9 @@ exit 0 %changelog +* Sat Jan 27 2024 Fedora Release Engineering - 4.7.3-31 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Tue Jan 09 2024 Florian Weimer - 4.7.3-30 - Additional C compatibility fixes (#2155781) From c09fc1c81eaccf34976372481f02743515af1979 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 20 Jul 2024 10:24:58 +0000 Subject: [PATCH 53/60] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild --- xpilot-ng.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xpilot-ng.spec b/xpilot-ng.spec index f595487..c6f90ab 100644 --- a/xpilot-ng.spec +++ b/xpilot-ng.spec @@ -4,7 +4,7 @@ Name: xpilot-ng Version: 4.7.3 -Release: 31%{?dist} +Release: 32%{?dist} Summary: Space arcade game for multiple players License: GPLv2+ @@ -220,6 +220,9 @@ exit 0 %changelog +* Sat Jul 20 2024 Fedora Release Engineering - 4.7.3-32 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + * Sat Jan 27 2024 Fedora Release Engineering - 4.7.3-31 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From 145b89d8c13321335d12792c04612566325db40d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20Such=C3=BD?= Date: Fri, 26 Jul 2024 03:59:36 +0200 Subject: [PATCH 54/60] convert GPLv2+ license to SPDX This is part of https://fedoraproject.org/wiki/Changes/SPDX_Licenses_Phase_4 --- xpilot-ng.spec | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/xpilot-ng.spec b/xpilot-ng.spec index c6f90ab..905dbac 100644 --- a/xpilot-ng.spec +++ b/xpilot-ng.spec @@ -4,10 +4,11 @@ Name: xpilot-ng Version: 4.7.3 -Release: 32%{?dist} +Release: 33%{?dist} Summary: Space arcade game for multiple players -License: GPLv2+ +# Automatically converted from old format: GPLv2+ - review is highly recommended. +License: GPL-2.0-or-later URL: http://xpilot.sourceforge.net Source0: http://downloads.sourceforge.net/sourceforge/xpilot/xpilot-ng-%{version}.tar.gz Source1: xpilot-ng.png @@ -220,6 +221,9 @@ exit 0 %changelog +* Fri Jul 26 2024 Miroslav Suchý - 4.7.3-33 +- convert license to SPDX + * Sat Jul 20 2024 Fedora Release Engineering - 4.7.3-32 - Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild From fa0961df1eec3dcfef577c3a911ac6db17d89c4c Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sun, 19 Jan 2025 16:14:25 +0000 Subject: [PATCH 55/60] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild --- xpilot-ng.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xpilot-ng.spec b/xpilot-ng.spec index 905dbac..a905667 100644 --- a/xpilot-ng.spec +++ b/xpilot-ng.spec @@ -4,7 +4,7 @@ Name: xpilot-ng Version: 4.7.3 -Release: 33%{?dist} +Release: 34%{?dist} Summary: Space arcade game for multiple players # Automatically converted from old format: GPLv2+ - review is highly recommended. @@ -221,6 +221,9 @@ exit 0 %changelog +* Sun Jan 19 2025 Fedora Release Engineering - 4.7.3-34 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + * Fri Jul 26 2024 Miroslav Suchý - 4.7.3-33 - convert license to SPDX From ae67c7fe927fc397107bf6ee44d039efd4f40a36 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 25 Jul 2025 21:02:48 +0000 Subject: [PATCH 56/60] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild --- xpilot-ng.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xpilot-ng.spec b/xpilot-ng.spec index a905667..ae5862d 100644 --- a/xpilot-ng.spec +++ b/xpilot-ng.spec @@ -4,7 +4,7 @@ Name: xpilot-ng Version: 4.7.3 -Release: 34%{?dist} +Release: 35%{?dist} Summary: Space arcade game for multiple players # Automatically converted from old format: GPLv2+ - review is highly recommended. @@ -221,6 +221,9 @@ exit 0 %changelog +* Fri Jul 25 2025 Fedora Release Engineering - 4.7.3-35 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild + * Sun Jan 19 2025 Fedora Release Engineering - 4.7.3-34 - Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild From dfbecd88483cf94376cd69dd9e62e004db67cb3c Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 17 Jan 2026 20:52:08 +0000 Subject: [PATCH 57/60] Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild --- xpilot-ng.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xpilot-ng.spec b/xpilot-ng.spec index ae5862d..dc7a818 100644 --- a/xpilot-ng.spec +++ b/xpilot-ng.spec @@ -4,7 +4,7 @@ Name: xpilot-ng Version: 4.7.3 -Release: 35%{?dist} +Release: 36%{?dist} Summary: Space arcade game for multiple players # Automatically converted from old format: GPLv2+ - review is highly recommended. @@ -221,6 +221,9 @@ exit 0 %changelog +* Sat Jan 17 2026 Fedora Release Engineering - 4.7.3-36 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild + * Fri Jul 25 2025 Fedora Release Engineering - 4.7.3-35 - Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild From 30c5cbb2c8a9a5b2caff921cee03aa35ac3f84a1 Mon Sep 17 00:00:00 2001 From: Hans de Goede Date: Sat, 24 Jan 2026 19:06:10 +0100 Subject: [PATCH 58/60] Fix FTBFS (rhbz#2341581, rhbz#2385745) --- xpilot-ng-c23.patch | 11 +++++++++++ xpilot-ng.rpmlintrc | 5 +++++ xpilot-ng.spec | 9 ++++++--- 3 files changed, 22 insertions(+), 3 deletions(-) create mode 100644 xpilot-ng-c23.patch diff --git a/xpilot-ng-c23.patch b/xpilot-ng-c23.patch new file mode 100644 index 0000000..0605b52 --- /dev/null +++ b/xpilot-ng-c23.patch @@ -0,0 +1,11 @@ +diff -up xpilot-ng-4.7.3/src/server/suibotdef.c~ xpilot-ng-4.7.3/src/server/suibotdef.c +--- xpilot-ng-4.7.3/src/server/suibotdef.c~ 2026-01-24 18:58:21.000000000 +0100 ++++ xpilot-ng-4.7.3/src/server/suibotdef.c 2026-01-24 18:59:54.806510851 +0100 +@@ -378,7 +378,6 @@ typedef struct { + } object_proximity_t; + + +-static bool Get_object_proximity(); + static bool Get_object_proximity(player_t *pl, object_t *shot, double sqmaxdist,int maxtime, object_proximity_t *object_proximity){ + /* get square of closest distance between player and object + * compare with sqmaxdist and maxtime and return sqdistance and time diff --git a/xpilot-ng.rpmlintrc b/xpilot-ng.rpmlintrc index a8fdd7a..ed956be 100644 --- a/xpilot-ng.rpmlintrc +++ b/xpilot-ng.rpmlintrc @@ -3,3 +3,8 @@ addFilter("dangling-symlink") addFilter("no-documentation") addFilter("non-standard-uid") addFilter("non-readable") +addFilter("E: no-binary") +addFilter("W: no-%check-section") +addFilter("E: logrotate-log-dir-not-packaged") +# meh, this should be fixed really ... +addFilter("W: binary-or-shlib-calls-gethostbyname") diff --git a/xpilot-ng.spec b/xpilot-ng.spec index dc7a818..c1abc41 100644 --- a/xpilot-ng.spec +++ b/xpilot-ng.spec @@ -4,7 +4,7 @@ Name: xpilot-ng Version: 4.7.3 -Release: 36%{?dist} +Release: 37%{?dist} Summary: Space arcade game for multiple players # Automatically converted from old format: GPLv2+ - review is highly recommended. @@ -29,9 +29,9 @@ Patch3: xpilot-ng-c99.patch Patch4: xpilot-ng-SDL_window.patch Patch5: xpilot-ng-c99-return-mismatch.patch Patch6: xpilot-ng-c99-incompatible-pointer-types.patch +Patch7: xpilot-ng-c23.patch -BuildRequires: make -BuildRequires: gcc +BuildRequires: gcc make BuildRequires: desktop-file-utils libappstream-glib BuildRequires: expat-devel SDL_ttf-devel SDL_image-devel zlib-devel BuildRequires: libXt-devel libGLU-devel @@ -221,6 +221,9 @@ exit 0 %changelog +* Sat Jan 24 2026 Hans de Goede - 4.7.3-37 +- Fix FTBFS (rhbz#2341581, rhbz#2385745) + * Sat Jan 17 2026 Fedora Release Engineering - 4.7.3-36 - Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild From 1ff72363e62603806fb96a335276794ca9ebeaaf Mon Sep 17 00:00:00 2001 From: Hans de Goede Date: Mon, 2 Feb 2026 11:06:02 +0100 Subject: [PATCH 59/60] Use sysusers to create xpilot user for xpilot-ng-server (rhbz#2432687) --- xpilot-ng-server.conf | 3 +++ xpilot-ng.spec | 19 ++++++++++++------- 2 files changed, 15 insertions(+), 7 deletions(-) create mode 100644 xpilot-ng-server.conf diff --git a/xpilot-ng-server.conf b/xpilot-ng-server.conf new file mode 100644 index 0000000..2e77adf --- /dev/null +++ b/xpilot-ng-server.conf @@ -0,0 +1,3 @@ +#Type Name ID GECOS Home directory Shell +g xpilot - - - - +u xpilot - 'xpilot game server' /usr/share/xpilot-ng/ - diff --git a/xpilot-ng.spec b/xpilot-ng.spec index c1abc41..8c177bf 100644 --- a/xpilot-ng.spec +++ b/xpilot-ng.spec @@ -4,7 +4,7 @@ Name: xpilot-ng Version: 4.7.3 -Release: 37%{?dist} +Release: 38%{?dist} Summary: Space arcade game for multiple players # Automatically converted from old format: GPLv2+ - review is highly recommended. @@ -17,6 +17,7 @@ Source3: xpilot-ng-sdl.appdata.xml Source4: xpilot-ng-server.service Source5: xpilot-ng.sysconfig Source6: xpilot-ng.logrotate +Source7: xpilot-ng-server.conf Source10: logwatch.logconf.xpilot Source11: logwatch.script.xpilot Source12: logwatch.serviceconf.xpilot @@ -36,6 +37,7 @@ BuildRequires: desktop-file-utils libappstream-glib BuildRequires: expat-devel SDL_ttf-devel SDL_image-devel zlib-devel BuildRequires: libXt-devel libGLU-devel BuildRequires: openal-soft-devel freealut-devel automake +BuildRequires: systemd-rpm-macros Requires: %{name}-data = %{version}-%{release} hicolor-icon-theme Provides: %{name}-engine = %{version}-%{release} @@ -68,7 +70,7 @@ Data files for %{name}. Summary: Server for hosting xpilot games Requires: %{name}-data = %{version}-%{release} Requires: logrotate -Requires(pre): shadow-utils +%{?sysusers_requires_compat} Requires(post): systemd Requires(preun): systemd Requires(postun): systemd @@ -144,6 +146,9 @@ install -p -D -m 600 lib/password.txt $RPM_BUILD_ROOT/%{_sysconfdir}/%{name}/pas install -p -D -m 644 %{SOURCE6} \ $RPM_BUILD_ROOT/%{_sysconfdir}/logrotate.d/%{name}-server +# Install sysusers file +install -p -D -m 0644 %{SOURCE7} %{buildroot}%{_sysusersdir}/xpilot-ng-server.conf + # Replace bundled fonts with system fonts rm $RPM_BUILD_ROOT%{_datadir}/%{name}/fonts/FreeSansBoldOblique.ttf @@ -159,11 +164,7 @@ install -pD -m 0644 %{SOURCE12} $RPM_BUILD_ROOT%{logwatch_conf}/services/%{name} install -pD -m 0644 %{SOURCE13} $RPM_BUILD_ROOT%{logwatch_scripts}/shared/applyxpilotdate %pre server -getent group xpilot >/dev/null || groupadd -r xpilot -getent passwd xpilot >/dev/null || \ -useradd -r -g xpilot -d %{_datadir}/%{name} -s /sbin/nologin \ - -c "xpilot game server" xpilot -exit 0 +%sysusers_create_compat %{SOURCE7} %post server %systemd_post xpilot-ng-server.service @@ -197,6 +198,7 @@ exit 0 %{_mandir}/man6/xpilot-ng-x11.6.gz %files server +%{_sysusersdir}/xpilot-ng-server.conf %{_bindir}/xpilot-ng-xp-mapedit %{_bindir}/xpilot-ng-server /lib/systemd/system/xpilot-ng-server.service @@ -221,6 +223,9 @@ exit 0 %changelog +* Mon Feb 2 2026 Hans de Goede - 4.7.3-38 +- Use sysusers to create xpilot user for xpilot-ng-server (rhbz#2432687) + * Sat Jan 24 2026 Hans de Goede - 4.7.3-37 - Fix FTBFS (rhbz#2341581, rhbz#2385745) From 44bc804c70b1e46f1b8567e9ccc6907dcb152627 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 17 Jul 2026 09:24:47 +0000 Subject: [PATCH 60/60] Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild --- xpilot-ng.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xpilot-ng.spec b/xpilot-ng.spec index 8c177bf..fd348a7 100644 --- a/xpilot-ng.spec +++ b/xpilot-ng.spec @@ -4,7 +4,7 @@ Name: xpilot-ng Version: 4.7.3 -Release: 38%{?dist} +Release: 39%{?dist} Summary: Space arcade game for multiple players # Automatically converted from old format: GPLv2+ - review is highly recommended. @@ -223,6 +223,9 @@ install -pD -m 0644 %{SOURCE13} $RPM_BUILD_ROOT%{logwatch_scripts}/shared/applyx %changelog +* Fri Jul 17 2026 Fedora Release Engineering - 4.7.3-39 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild + * Mon Feb 2 2026 Hans de Goede - 4.7.3-38 - Use sysusers to create xpilot user for xpilot-ng-server (rhbz#2432687)