Compare commits

..

8 commits

Author SHA1 Message Date
Fedora Release Engineering
44bc804c70 Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild 2026-07-17 09:24:47 +00:00
Hans de Goede
1ff72363e6 Use sysusers to create xpilot user for xpilot-ng-server (rhbz#2432687) 2026-02-02 11:07:02 +01:00
Hans de Goede
30c5cbb2c8 Fix FTBFS (rhbz#2341581, rhbz#2385745) 2026-01-24 19:06:10 +01:00
Fedora Release Engineering
dfbecd8848 Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild 2026-01-17 20:52:08 +00:00
Fedora Release Engineering
ae67c7fe92 Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild 2025-07-25 21:02:48 +00:00
Fedora Release Engineering
fa0961df1e Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild 2025-01-19 16:14:25 +00:00
Miroslav Suchý
145b89d8c1 convert GPLv2+ license to SPDX
This is part of https://fedoraproject.org/wiki/Changes/SPDX_Licenses_Phase_4
2024-07-26 03:59:36 +02:00
Fedora Release Engineering
c09fc1c81e Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild 2024-07-20 10:24:58 +00:00
4 changed files with 56 additions and 10 deletions

11
xpilot-ng-c23.patch Normal file
View file

@ -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

3
xpilot-ng-server.conf Normal file
View file

@ -0,0 +1,3 @@
#Type Name ID GECOS Home directory Shell
g xpilot - - - -
u xpilot - 'xpilot game server' /usr/share/xpilot-ng/ -

View file

@ -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")

View file

@ -4,10 +4,11 @@
Name: xpilot-ng
Version: 4.7.3
Release: 31%{?dist}
Release: 39%{?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
@ -16,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
@ -28,13 +30,14 @@ 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
BuildRequires: openal-soft-devel freealut-devel automake
BuildRequires: systemd-rpm-macros
Requires: %{name}-data = %{version}-%{release} hicolor-icon-theme
Provides: %{name}-engine = %{version}-%{release}
@ -67,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
@ -143,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
@ -158,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
@ -196,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
@ -220,6 +223,30 @@ exit 0
%changelog
* Fri Jul 17 2026 Fedora Release Engineering <releng@fedoraproject.org> - 4.7.3-39
- Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild
* Mon Feb 2 2026 Hans de Goede <johannes.goede@oss.qualcomm.com> - 4.7.3-38
- Use sysusers to create xpilot user for xpilot-ng-server (rhbz#2432687)
* Sat Jan 24 2026 Hans de Goede <johannes.goede@oss.qualcomm.com> - 4.7.3-37
- Fix FTBFS (rhbz#2341581, rhbz#2385745)
* Sat Jan 17 2026 Fedora Release Engineering <releng@fedoraproject.org> - 4.7.3-36
- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild
* Fri Jul 25 2025 Fedora Release Engineering <releng@fedoraproject.org> - 4.7.3-35
- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild
* Sun Jan 19 2025 Fedora Release Engineering <releng@fedoraproject.org> - 4.7.3-34
- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild
* Fri Jul 26 2024 Miroslav Suchý <msuchy@redhat.com> - 4.7.3-33
- convert license to SPDX
* Sat Jul 20 2024 Fedora Release Engineering <releng@fedoraproject.org> - 4.7.3-32
- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
* Sat Jan 27 2024 Fedora Release Engineering <releng@fedoraproject.org> - 4.7.3-31
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild