diff --git a/xpilot-ng-c23.patch b/xpilot-ng-c23.patch deleted file mode 100644 index 0605b52..0000000 --- a/xpilot-ng-c23.patch +++ /dev/null @@ -1,11 +0,0 @@ -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-server.conf b/xpilot-ng-server.conf deleted file mode 100644 index 2e77adf..0000000 --- a/xpilot-ng-server.conf +++ /dev/null @@ -1,3 +0,0 @@ -#Type Name ID GECOS Home directory Shell -g xpilot - - - - -u xpilot - 'xpilot game server' /usr/share/xpilot-ng/ - diff --git a/xpilot-ng.rpmlintrc b/xpilot-ng.rpmlintrc index ed956be..a8fdd7a 100644 --- a/xpilot-ng.rpmlintrc +++ b/xpilot-ng.rpmlintrc @@ -3,8 +3,3 @@ 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 fd348a7..f595487 100644 --- a/xpilot-ng.spec +++ b/xpilot-ng.spec @@ -4,11 +4,10 @@ Name: xpilot-ng Version: 4.7.3 -Release: 39%{?dist} +Release: 31%{?dist} Summary: Space arcade game for multiple players -# Automatically converted from old format: GPLv2+ - review is highly recommended. -License: GPL-2.0-or-later +License: GPLv2+ URL: http://xpilot.sourceforge.net Source0: http://downloads.sourceforge.net/sourceforge/xpilot/xpilot-ng-%{version}.tar.gz Source1: xpilot-ng.png @@ -17,7 +16,6 @@ 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 @@ -30,14 +28,13 @@ 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: gcc make +BuildRequires: make +BuildRequires: gcc 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} @@ -70,7 +67,7 @@ Data files for %{name}. Summary: Server for hosting xpilot games Requires: %{name}-data = %{version}-%{release} Requires: logrotate -%{?sysusers_requires_compat} +Requires(pre): shadow-utils Requires(post): systemd Requires(preun): systemd Requires(postun): systemd @@ -146,9 +143,6 @@ 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 @@ -164,7 +158,11 @@ 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 -%sysusers_create_compat %{SOURCE7} +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 %systemd_post xpilot-ng-server.service @@ -198,7 +196,6 @@ install -pD -m 0644 %{SOURCE13} $RPM_BUILD_ROOT%{logwatch_scripts}/shared/applyx %{_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 @@ -223,30 +220,6 @@ 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) - -* 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 - -* 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 - -* 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 - * Sat Jan 27 2024 Fedora Release Engineering - 4.7.3-31 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild