From ae67c7fe927fc397107bf6ee44d039efd4f40a36 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 25 Jul 2025 21:02:48 +0000 Subject: [PATCH 1/5] 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 2/5] 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 3/5] 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 4/5] 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 5/5] 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)