From 33e3a585cbec6a0a32c18ca4806f2568fe30d749 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 31 Jan 2020 04:52:13 +0000 Subject: [PATCH 01/21] - 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 02/21] - 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 03/21] - 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 04/21] 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 05/21] - 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 06/21] - 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 07/21] - 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 08/21] 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 09/21] 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 10/21] 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 11/21] 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 12/21] 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 13/21] 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 14/21] 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 15/21] 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 16/21] 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 17/21] 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 18/21] 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 19/21] 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 20/21] 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 21/21] 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)