From ffd8e6b75832373562fdc54bb312ce6ef72f03c5 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 14 Jul 2018 08:59:07 +0000 Subject: [PATCH 01/22] - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- worminator.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/worminator.spec b/worminator.spec index e947b90..4c1a2f9 100644 --- a/worminator.spec +++ b/worminator.spec @@ -1,6 +1,6 @@ Name: worminator Version: 3.0R2.1 -Release: 28%{?dist} +Release: 29%{?dist} Summary: Sidescrolling platform and shoot'em up action-game Group: Amusements/Games License: GPLv2+ @@ -51,6 +51,9 @@ desktop-file-install \ %changelog +* Sat Jul 14 2018 Fedora Release Engineering - 3.0R2.1-29 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + * Fri Feb 09 2018 Fedora Release Engineering - 3.0R2.1-28 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild From d91ca67a58d8361c4bc3fa10e5886ba5cbf3765e Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Wed, 18 Jul 2018 11:23:39 +0200 Subject: [PATCH 02/22] add BuildRequires: gcc Reference: https://fedoraproject.org/wiki/Changes/Remove_GCC_from_BuildRoot --- worminator.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/worminator.spec b/worminator.spec index 4c1a2f9..0658fa6 100644 --- a/worminator.spec +++ b/worminator.spec @@ -10,6 +10,7 @@ Source1: worminator.png Source2: worminator.desktop Patch0: worminator-3.0R2.1-speed.patch Patch1: worminator-3.0R2.1-format-security.patch +BuildRequires: gcc BuildRequires: allegro-devel, desktop-file-utils Requires: worminator-data >= 3.0R2.1-2, hicolor-icon-theme From 3f216f523ae21410778632bfbf9b58765c65b42f Mon Sep 17 00:00:00 2001 From: Hans de Goede Date: Tue, 14 Aug 2018 17:05:42 +0200 Subject: [PATCH 03/22] Fix FTBFS (rhbz#1606823) Add appdata --- worminator.appdata.xml | 23 +++++++++++++++++++++++ worminator.desktop | 4 ++-- worminator.png | Bin 389 -> 2177 bytes worminator.spec | 34 ++++++++++++++++++++++------------ 4 files changed, 47 insertions(+), 14 deletions(-) create mode 100644 worminator.appdata.xml diff --git a/worminator.appdata.xml b/worminator.appdata.xml new file mode 100644 index 0000000..fc0cd9f --- /dev/null +++ b/worminator.appdata.xml @@ -0,0 +1,23 @@ + + + KoboDeluxe.desktop + CC0-1.0 + GPL-2.0+ + Worminator + Sidescrolling platform and shoot'em up action-game + +

+ Worminator is a sidescrolling action game. You play as The Worminator + and fight your way through many levels of madness and mayhem. +

+

+ Worminator features nine unique weapons, visible character damage, + full screen scrolling, sound and music, and much more! +

+ + https://sourceforge.net/projects/worminator/ + + http://freshmeat.sourceforge.net/screenshots/b2/dc/b2dc91468a7c5b7db1b01dc578e74dfd_medium.png + + jwrdegoede_at_fedoraproject.org + diff --git a/worminator.desktop b/worminator.desktop index 801cbb7..b7bf49e 100644 --- a/worminator.desktop +++ b/worminator.desktop @@ -1,10 +1,10 @@ [Desktop Entry] -Encoding=UTF-8 Name=Worminator Comment=A jump, run and shoot action-game Exec=worminator -Icon=worminator.png +Icon=worminator Terminal=false StartupNotify=false Type=Application Categories=Game;ArcadeGame; +Keywords=Game;Arcade;Scroller;Retro;Worms;Platform; diff --git a/worminator.png b/worminator.png index d0aa0d7f40fa5b56243ed87fd89d38a0581de266..375541b29d6704e26c7228f54d9f1f8ee4227d3b 100644 GIT binary patch literal 2177 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 literal 389 zcmV;00eb$4P)_(IV92pa{%3)M_t!yWUpLBgd+m(h-n( zt?z1S9g7Gs^HvXAul6q)h#F2+K~+ISKt#%o=$$=)^(gY;_*0o1b9)Q^T3VF)6VdN@ z<+&O73Kh?df{5jmdW{xwL62B##}AggvbH56%8=Bt5_p3oQ-*iazih&JQ#Pd;$KJ5& zJ07TH#0zGg4e1AoO>+f^bzJI!ED*bQ?w`tQs(cGFApaE;J`(^D0V2Y6UB?`GO!?dr zoXkQrCt5_KCqV3mRL_tKBEGzePdFd+-0gT>-Q@vdex46m0jjVj+Ry3Es6xe=;e_7r j_|znfoQD8@OKf02j=%vZK}%*w00000NkvXXu0mjfi=nL( diff --git a/worminator.spec b/worminator.spec index 0658fa6..40dce35 100644 --- a/worminator.spec +++ b/worminator.spec @@ -1,17 +1,17 @@ Name: worminator Version: 3.0R2.1 -Release: 29%{?dist} +Release: 30%{?dist} Summary: Sidescrolling platform and shoot'em up action-game -Group: Amusements/Games License: GPLv2+ URL: http://sourceforge.net/projects/worminator/ Source0: http://downloads.sourceforge.net/worminator/worminator-%{version}.tar.gz Source1: worminator.png Source2: worminator.desktop +Source3: %{name}.appdata.xml Patch0: worminator-3.0R2.1-speed.patch Patch1: worminator-3.0R2.1-format-security.patch BuildRequires: gcc -BuildRequires: allegro-devel, desktop-file-utils +BuildRequires: allegro-devel desktop-file-utils libappstream-glib Requires: worminator-data >= 3.0R2.1-2, hicolor-icon-theme %description @@ -21,15 +21,14 @@ full screen scrolling, sound and music, and much more! %prep -%setup -q -%patch0 -p1 -z .speed -%patch1 -p1 +%autosetup -p1 sed -i 's/\r//' ReadMe.txt %build gcc $RPM_OPT_FLAGS -fsigned-char -Wno-deprecated-declarations \ - -Wno-char-subscripts -DDATADIR=\"%{_datadir}/%{name}/\" -o %{name} \ + -Wno-char-subscripts -DALLEGRO_FIX_ALIASES \ + -DDATADIR=\"%{_datadir}/%{name}/\" -o %{name} \ Worminator.c `allegro-config --libs` -lm @@ -37,21 +36,32 @@ gcc $RPM_OPT_FLAGS -fsigned-char -Wno-deprecated-declarations \ mkdir -p $RPM_BUILD_ROOT%{_bindir} install -p -m 0755 %{name} $RPM_BUILD_ROOT%{_bindir} -mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/32x32/apps -install -p -m 0644 %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/32x32/apps - +mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/64x64/apps +install -p -m 0644 %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/64x64/apps +mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications desktop-file-install \ --dir ${RPM_BUILD_ROOT}%{_datadir}/applications \ %{SOURCE2} +mkdir -p $RPM_BUILD_ROOT%{_datadir}/appdata +install -p -m 0644 %{SOURCE3} $RPM_BUILD_ROOT%{_datadir}/appdata +appstream-util validate-relax --nonet \ + $RPM_BUILD_ROOT%{_datadir}/appdata/%{name}.appdata.xml + %files -%doc ReadMe.txt changes.unix license.txt license-change.txt +%doc ReadMe.txt changes.unix +%license license.txt license-change.txt %{_bindir}/%{name} +%{_datadir}/appdata/%{name}.appdata.xml %{_datadir}/applications/worminator.desktop -%{_datadir}/icons/hicolor/32x32/apps/worminator.png +%{_datadir}/icons/hicolor/64x64/apps/worminator.png %changelog +* Tue Aug 14 2018 Hans de Goede - 3.0R2.1-30 +- Fix FTBFS (rhbz#1606823) +- Add appdata + * Sat Jul 14 2018 Fedora Release Engineering - 3.0R2.1-29 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild From c4903d917206548455fe4571869d19ebabb47e46 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sun, 3 Feb 2019 11:55:19 +0000 Subject: [PATCH 04/22] - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- worminator.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/worminator.spec b/worminator.spec index 40dce35..0538540 100644 --- a/worminator.spec +++ b/worminator.spec @@ -1,6 +1,6 @@ Name: worminator Version: 3.0R2.1 -Release: 30%{?dist} +Release: 31%{?dist} Summary: Sidescrolling platform and shoot'em up action-game License: GPLv2+ URL: http://sourceforge.net/projects/worminator/ @@ -58,6 +58,9 @@ appstream-util validate-relax --nonet \ %changelog +* Sun Feb 03 2019 Fedora Release Engineering - 3.0R2.1-31 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + * Tue Aug 14 2018 Hans de Goede - 3.0R2.1-30 - Fix FTBFS (rhbz#1606823) - Add appdata From dc190cd915ca01aab8d852c44e0957645bbe5d53 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 27 Jul 2019 03:41:45 +0000 Subject: [PATCH 05/22] - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- worminator.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/worminator.spec b/worminator.spec index 0538540..9eeb1ba 100644 --- a/worminator.spec +++ b/worminator.spec @@ -1,6 +1,6 @@ Name: worminator Version: 3.0R2.1 -Release: 31%{?dist} +Release: 32%{?dist} Summary: Sidescrolling platform and shoot'em up action-game License: GPLv2+ URL: http://sourceforge.net/projects/worminator/ @@ -58,6 +58,9 @@ appstream-util validate-relax --nonet \ %changelog +* Sat Jul 27 2019 Fedora Release Engineering - 3.0R2.1-32 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + * Sun Feb 03 2019 Fedora Release Engineering - 3.0R2.1-31 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild From 9a4659b4aea0a3ad0b6f52cc04b26f15aae0d159 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 31 Jan 2020 03:55:46 +0000 Subject: [PATCH 06/22] - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- worminator.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/worminator.spec b/worminator.spec index 9eeb1ba..33483eb 100644 --- a/worminator.spec +++ b/worminator.spec @@ -1,6 +1,6 @@ Name: worminator Version: 3.0R2.1 -Release: 32%{?dist} +Release: 33%{?dist} Summary: Sidescrolling platform and shoot'em up action-game License: GPLv2+ URL: http://sourceforge.net/projects/worminator/ @@ -58,6 +58,9 @@ appstream-util validate-relax --nonet \ %changelog +* Fri Jan 31 2020 Fedora Release Engineering - 3.0R2.1-33 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + * Sat Jul 27 2019 Fedora Release Engineering - 3.0R2.1-32 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild From db15f4e1e2933dd8e4624c375003b1a7ed5a4557 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 29 Jul 2020 14:19:28 +0000 Subject: [PATCH 07/22] - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- worminator.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/worminator.spec b/worminator.spec index 33483eb..167316c 100644 --- a/worminator.spec +++ b/worminator.spec @@ -1,6 +1,6 @@ Name: worminator Version: 3.0R2.1 -Release: 33%{?dist} +Release: 34%{?dist} Summary: Sidescrolling platform and shoot'em up action-game License: GPLv2+ URL: http://sourceforge.net/projects/worminator/ @@ -58,6 +58,9 @@ appstream-util validate-relax --nonet \ %changelog +* Wed Jul 29 2020 Fedora Release Engineering - 3.0R2.1-34 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + * Fri Jan 31 2020 Fedora Release Engineering - 3.0R2.1-33 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild From 5a3a4facbe8a9dbd3262c5336e84280ed980d4c9 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 27 Jan 2021 23:40:04 +0000 Subject: [PATCH 08/22] - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- worminator.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/worminator.spec b/worminator.spec index 167316c..473e99d 100644 --- a/worminator.spec +++ b/worminator.spec @@ -1,6 +1,6 @@ Name: worminator Version: 3.0R2.1 -Release: 34%{?dist} +Release: 35%{?dist} Summary: Sidescrolling platform and shoot'em up action-game License: GPLv2+ URL: http://sourceforge.net/projects/worminator/ @@ -58,6 +58,9 @@ appstream-util validate-relax --nonet \ %changelog +* Wed Jan 27 2021 Fedora Release Engineering - 3.0R2.1-35 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + * Wed Jul 29 2020 Fedora Release Engineering - 3.0R2.1-34 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild From 6c714e78525e6d44f8e079b955c478332bb3a509 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 23 Jul 2021 21:08:18 +0000 Subject: [PATCH 09/22] - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- worminator.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/worminator.spec b/worminator.spec index 473e99d..80e3ac2 100644 --- a/worminator.spec +++ b/worminator.spec @@ -1,6 +1,6 @@ Name: worminator Version: 3.0R2.1 -Release: 35%{?dist} +Release: 36%{?dist} Summary: Sidescrolling platform and shoot'em up action-game License: GPLv2+ URL: http://sourceforge.net/projects/worminator/ @@ -58,6 +58,9 @@ appstream-util validate-relax --nonet \ %changelog +* Fri Jul 23 2021 Fedora Release Engineering - 3.0R2.1-36 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + * Wed Jan 27 2021 Fedora Release Engineering - 3.0R2.1-35 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild From e0a1932a92169449819198fd71320f5bf7fe0d4a Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 22 Jan 2022 04:40:04 +0000 Subject: [PATCH 10/22] - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- worminator.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/worminator.spec b/worminator.spec index 80e3ac2..55318ae 100644 --- a/worminator.spec +++ b/worminator.spec @@ -1,6 +1,6 @@ Name: worminator Version: 3.0R2.1 -Release: 36%{?dist} +Release: 37%{?dist} Summary: Sidescrolling platform and shoot'em up action-game License: GPLv2+ URL: http://sourceforge.net/projects/worminator/ @@ -58,6 +58,9 @@ appstream-util validate-relax --nonet \ %changelog +* Sat Jan 22 2022 Fedora Release Engineering - 3.0R2.1-37 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + * Fri Jul 23 2021 Fedora Release Engineering - 3.0R2.1-36 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild From b6aa9bd41a11435fddd48a119ba8bda63eee6162 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 23 Jul 2022 12:37:44 +0000 Subject: [PATCH 11/22] Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- worminator.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/worminator.spec b/worminator.spec index 55318ae..b88f8b7 100644 --- a/worminator.spec +++ b/worminator.spec @@ -1,6 +1,6 @@ Name: worminator Version: 3.0R2.1 -Release: 37%{?dist} +Release: 38%{?dist} Summary: Sidescrolling platform and shoot'em up action-game License: GPLv2+ URL: http://sourceforge.net/projects/worminator/ @@ -58,6 +58,9 @@ appstream-util validate-relax --nonet \ %changelog +* Sat Jul 23 2022 Fedora Release Engineering - 3.0R2.1-38 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + * Sat Jan 22 2022 Fedora Release Engineering - 3.0R2.1-37 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild From aefcda9a9385118d1598f025989eaae0ecccc551 Mon Sep 17 00:00:00 2001 From: Peter Fordham Date: Fri, 23 Dec 2022 07:17:08 +0000 Subject: [PATCH 12/22] Port build to C99. https://fedoraproject.org/wiki/Toolchain/PortingToModernC Upstream issue tracked at: https://sourceforge.net/p/worminator/bugs/2/ --- worminator-3.0R2.1-c99.patch | 16 ++++++++++++++++ worminator.spec | 6 +++++- 2 files changed, 21 insertions(+), 1 deletion(-) create mode 100644 worminator-3.0R2.1-c99.patch diff --git a/worminator-3.0R2.1-c99.patch b/worminator-3.0R2.1-c99.patch new file mode 100644 index 0000000..62c3a98 --- /dev/null +++ b/worminator-3.0R2.1-c99.patch @@ -0,0 +1,16 @@ +Fixes C99 compliance issue. +https://sourceforge.net/p/worminator/bugs/2/ + +diff --git a/particle_ai.h b/particle_ai.h +index 93ac1ec..05ec08d 100644 +--- a/particle_ai.h ++++ b/particle_ai.h +@@ -111,7 +111,7 @@ else sprites[sprite_number].timer--; + /*****************\ + |** SHRAPGIB AI **| + \*****************/ +-void shrapgib_ai(sprite_number) ++void shrapgib_ai(int sprite_number) + { + // Update the timer and destroy sprite if time is up + sprites[sprite_number].timer--; diff --git a/worminator.spec b/worminator.spec index b88f8b7..589b57c 100644 --- a/worminator.spec +++ b/worminator.spec @@ -1,6 +1,6 @@ Name: worminator Version: 3.0R2.1 -Release: 38%{?dist} +Release: 39%{?dist} Summary: Sidescrolling platform and shoot'em up action-game License: GPLv2+ URL: http://sourceforge.net/projects/worminator/ @@ -10,6 +10,7 @@ Source2: worminator.desktop Source3: %{name}.appdata.xml Patch0: worminator-3.0R2.1-speed.patch Patch1: worminator-3.0R2.1-format-security.patch +Patch2: worminator-3.0R2.1-c99.patch BuildRequires: gcc BuildRequires: allegro-devel desktop-file-utils libappstream-glib Requires: worminator-data >= 3.0R2.1-2, hicolor-icon-theme @@ -58,6 +59,9 @@ appstream-util validate-relax --nonet \ %changelog +* Fri Dec 23 2022 Peter Fordham - 3.0R2.1-39 +- Add a missing int for C99 compliance. + * Sat Jul 23 2022 Fedora Release Engineering - 3.0R2.1-38 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild From 5575518874f252065feb7211e61de3fa6d337194 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 21 Jan 2023 06:59:28 +0000 Subject: [PATCH 13/22] Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- worminator.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/worminator.spec b/worminator.spec index 589b57c..de1f466 100644 --- a/worminator.spec +++ b/worminator.spec @@ -1,6 +1,6 @@ Name: worminator Version: 3.0R2.1 -Release: 39%{?dist} +Release: 40%{?dist} Summary: Sidescrolling platform and shoot'em up action-game License: GPLv2+ URL: http://sourceforge.net/projects/worminator/ @@ -59,6 +59,9 @@ appstream-util validate-relax --nonet \ %changelog +* Sat Jan 21 2023 Fedora Release Engineering - 3.0R2.1-40 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + * Fri Dec 23 2022 Peter Fordham - 3.0R2.1-39 - Add a missing int for C99 compliance. From 5b17fc43c643f9690c61c43af20a77a498231b90 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 22 Jul 2023 18:22:30 +0000 Subject: [PATCH 14/22] Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- worminator.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/worminator.spec b/worminator.spec index de1f466..a6d228b 100644 --- a/worminator.spec +++ b/worminator.spec @@ -1,6 +1,6 @@ Name: worminator Version: 3.0R2.1 -Release: 40%{?dist} +Release: 41%{?dist} Summary: Sidescrolling platform and shoot'em up action-game License: GPLv2+ URL: http://sourceforge.net/projects/worminator/ @@ -59,6 +59,9 @@ appstream-util validate-relax --nonet \ %changelog +* Sat Jul 22 2023 Fedora Release Engineering - 3.0R2.1-41 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + * Sat Jan 21 2023 Fedora Release Engineering - 3.0R2.1-40 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild From eb424f141b3d9d8e177821b9f99e552c78b5c674 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 27 Jan 2024 09:06:08 +0000 Subject: [PATCH 15/22] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- worminator.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/worminator.spec b/worminator.spec index a6d228b..5ca0960 100644 --- a/worminator.spec +++ b/worminator.spec @@ -1,6 +1,6 @@ Name: worminator Version: 3.0R2.1 -Release: 41%{?dist} +Release: 42%{?dist} Summary: Sidescrolling platform and shoot'em up action-game License: GPLv2+ URL: http://sourceforge.net/projects/worminator/ @@ -59,6 +59,9 @@ appstream-util validate-relax --nonet \ %changelog +* Sat Jan 27 2024 Fedora Release Engineering - 3.0R2.1-42 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Sat Jul 22 2023 Fedora Release Engineering - 3.0R2.1-41 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild From d1b7bb967f3a2425cfbac1a71954c05611b9ee9c Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 20 Jul 2024 09:32:20 +0000 Subject: [PATCH 16/22] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild --- worminator.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/worminator.spec b/worminator.spec index 5ca0960..6e3bc6d 100644 --- a/worminator.spec +++ b/worminator.spec @@ -1,6 +1,6 @@ Name: worminator Version: 3.0R2.1 -Release: 42%{?dist} +Release: 43%{?dist} Summary: Sidescrolling platform and shoot'em up action-game License: GPLv2+ URL: http://sourceforge.net/projects/worminator/ @@ -59,6 +59,9 @@ appstream-util validate-relax --nonet \ %changelog +* Sat Jul 20 2024 Fedora Release Engineering - 3.0R2.1-43 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + * Sat Jan 27 2024 Fedora Release Engineering - 3.0R2.1-42 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From 4b977c0426a8ede398892651475e79cb9383f020 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20Such=C3=BD?= Date: Fri, 26 Jul 2024 03:42:59 +0200 Subject: [PATCH 17/22] convert GPLv2+ license to SPDX This is part of https://fedoraproject.org/wiki/Changes/SPDX_Licenses_Phase_4 --- worminator.spec | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/worminator.spec b/worminator.spec index 6e3bc6d..69086bd 100644 --- a/worminator.spec +++ b/worminator.spec @@ -1,8 +1,9 @@ Name: worminator Version: 3.0R2.1 -Release: 43%{?dist} +Release: 44%{?dist} Summary: Sidescrolling platform and shoot'em up action-game -License: GPLv2+ +# Automatically converted from old format: GPLv2+ - review is highly recommended. +License: GPL-2.0-or-later URL: http://sourceforge.net/projects/worminator/ Source0: http://downloads.sourceforge.net/worminator/worminator-%{version}.tar.gz Source1: worminator.png @@ -59,6 +60,9 @@ appstream-util validate-relax --nonet \ %changelog +* Fri Jul 26 2024 Miroslav Suchý - 3.0R2.1-44 +- convert license to SPDX + * Sat Jul 20 2024 Fedora Release Engineering - 3.0R2.1-43 - Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild From 5ce7607a8fd43ed223ab97832fd56d7348534f37 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sun, 19 Jan 2025 15:14:43 +0000 Subject: [PATCH 18/22] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild --- worminator.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/worminator.spec b/worminator.spec index 69086bd..f0fb9d1 100644 --- a/worminator.spec +++ b/worminator.spec @@ -1,6 +1,6 @@ Name: worminator Version: 3.0R2.1 -Release: 44%{?dist} +Release: 45%{?dist} Summary: Sidescrolling platform and shoot'em up action-game # Automatically converted from old format: GPLv2+ - review is highly recommended. License: GPL-2.0-or-later @@ -60,6 +60,9 @@ appstream-util validate-relax --nonet \ %changelog +* Sun Jan 19 2025 Fedora Release Engineering - 3.0R2.1-45 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + * Fri Jul 26 2024 Miroslav Suchý - 3.0R2.1-44 - convert license to SPDX From db0eaba2a5fa57ae5224d6a54881f38ba1c37d58 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 25 Jul 2025 20:32:13 +0000 Subject: [PATCH 19/22] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild --- worminator.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/worminator.spec b/worminator.spec index f0fb9d1..ead6ec4 100644 --- a/worminator.spec +++ b/worminator.spec @@ -1,6 +1,6 @@ Name: worminator Version: 3.0R2.1 -Release: 45%{?dist} +Release: 46%{?dist} Summary: Sidescrolling platform and shoot'em up action-game # Automatically converted from old format: GPLv2+ - review is highly recommended. License: GPL-2.0-or-later @@ -60,6 +60,9 @@ appstream-util validate-relax --nonet \ %changelog +* Fri Jul 25 2025 Fedora Release Engineering - 3.0R2.1-46 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild + * Sun Jan 19 2025 Fedora Release Engineering - 3.0R2.1-45 - Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild From 6a8ad92ce7ed112affb23b68b6a0b6dc7828d1f9 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 17 Jan 2026 20:21:39 +0000 Subject: [PATCH 20/22] Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild --- worminator.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/worminator.spec b/worminator.spec index ead6ec4..0723563 100644 --- a/worminator.spec +++ b/worminator.spec @@ -1,6 +1,6 @@ Name: worminator Version: 3.0R2.1 -Release: 46%{?dist} +Release: 47%{?dist} Summary: Sidescrolling platform and shoot'em up action-game # Automatically converted from old format: GPLv2+ - review is highly recommended. License: GPL-2.0-or-later @@ -60,6 +60,9 @@ appstream-util validate-relax --nonet \ %changelog +* Sat Jan 17 2026 Fedora Release Engineering - 3.0R2.1-47 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild + * Fri Jul 25 2025 Fedora Release Engineering - 3.0R2.1-46 - Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild From 164b58a563f4bb625b9e588bbc8d4f1fe1e95b8d Mon Sep 17 00:00:00 2001 From: Hans de Goede Date: Sat, 24 Jan 2026 13:02:33 +0100 Subject: [PATCH 21/22] Fix FTBFS (rhbz#2341554, rhbz#2385732) --- worminator-3.0R2.1-c23.patch | 12 ++ ...inator-3.0R2.1-fix-compiler-warnings.patch | 186 ++++++++++++++++++ ...inator-3.0R2.1-remove-al-fix-aliases.patch | 70 +++++++ worminator.spec | 11 +- 4 files changed, 276 insertions(+), 3 deletions(-) create mode 100644 worminator-3.0R2.1-c23.patch create mode 100644 worminator-3.0R2.1-fix-compiler-warnings.patch create mode 100644 worminator-3.0R2.1-remove-al-fix-aliases.patch diff --git a/worminator-3.0R2.1-c23.patch b/worminator-3.0R2.1-c23.patch new file mode 100644 index 0000000..fd7233a --- /dev/null +++ b/worminator-3.0R2.1-c23.patch @@ -0,0 +1,12 @@ +diff -up worminator-3.0R2.1/prototypes.h~ worminator-3.0R2.1/prototypes.h +--- worminator-3.0R2.1/prototypes.h~ 2006-02-24 20:02:25.000000000 +0100 ++++ worminator-3.0R2.1/prototypes.h 2026-01-24 12:54:21.075157509 +0100 +@@ -173,7 +173,7 @@ void push_player(float x_amount, float y + void player_touched(int x_tile_location, int y_tile_location); + + void control_player(); +-void trigger_switch(); ++void trigger_switch(int x, int y); + + /* This function will assign the player.frame attribute to an appropriate + value, based on what the player is doing at the time. */ diff --git a/worminator-3.0R2.1-fix-compiler-warnings.patch b/worminator-3.0R2.1-fix-compiler-warnings.patch new file mode 100644 index 0000000..5f96812 --- /dev/null +++ b/worminator-3.0R2.1-fix-compiler-warnings.patch @@ -0,0 +1,186 @@ +diff -up worminator-3.0R2.1/Worminator.c~ worminator-3.0R2.1/Worminator.c +--- worminator-3.0R2.1/Worminator.c~ 2026-01-24 11:37:54.000000000 +0100 ++++ worminator-3.0R2.1/Worminator.c 2026-01-24 12:50:28.996630952 +0100 +@@ -77,7 +77,7 @@ release_screen(); + void greenify() + { + RGB newcol, oldcol; +-int i, avg = 0;; ++int i, avg = 0; + + newcol.r = 0; + newcol.b = 0; +@@ -108,7 +108,7 @@ pal_time = 64; + void little_tinge() + { + RGB newcol, oldcol; +-int i, avg = 0;; ++int i; + + if (pal_time < 0) {pal_time = -32; return;} + if (pal_time > 0) return; +@@ -121,7 +121,6 @@ newcol.b = 0; + newcol.filler = 0; // silence warnings. + + for (i = 0; i < 256; i++) { +- avg = 0; + get_color(i, &oldcol); + /*avg += oldcol.r; + avg += oldcol.g; +@@ -141,7 +140,7 @@ game_is_running = TRUE; + void redify() + { + RGB newcol, oldcol; +-int i, avg = 0;; ++int i, avg = 0; + + newcol.g = 0; + newcol.b = 0; +@@ -161,7 +160,7 @@ for (i = 0; i < 256; i++) { + void darken(char always) + { + RGB newcol, oldcol; +-int i, avg = 0;; ++int i; + + newcol.r = 0; + newcol.b = 0; +@@ -184,7 +183,6 @@ if (!always) { + select_palette(worminator_data_file[DEFAULT_WORMINATOR_PALLETE].dat); + + for (i = 0; i < 256; i++) { +- avg = 0; + get_color(i, &oldcol); + newcol.r = oldcol.r / 2; + newcol.g = oldcol.g / 2; +diff -up worminator-3.0R2.1/animation.h~ worminator-3.0R2.1/animation.h +--- worminator-3.0R2.1/animation.h~ 2006-03-01 13:47:26.000000000 +0100 ++++ worminator-3.0R2.1/animation.h 2026-01-24 12:47:51.189632867 +0100 +@@ -141,14 +141,11 @@ void build_animation_table() + { + short unsigned int x_tile_loop, y_tile_loop; + int number_of_animations = 0; +-int bg_tile, fg_tile; + + + // Add all animated tiles to the list + for (x_tile_loop = 0; x_tile_loop < worminator_map.map_width; x_tile_loop++) { + for (y_tile_loop = 0; y_tile_loop < worminator_map.map_height; y_tile_loop++) { +- bg_tile = worminator_map.background_tile_grid[x_tile_loop][y_tile_loop]; +- fg_tile = worminator_map.foreground_tile_grid[x_tile_loop][y_tile_loop]; + + ////////////// A red strobe light and its glare /////////////////////////////////////////////// + if (check_tile_for_animation(x_tile_loop, y_tile_loop, RED_STROBE_LIGHT_ANIMATION_START, RED_STROBE_LIGHT_ANIMATION_LENGTH, RED_STROBE_LIGHT_ANIMATION_SPEED, number_of_animations) == TRUE) number_of_animations++; +diff -up worminator-3.0R2.1/globals.h~ worminator-3.0R2.1/globals.h +--- worminator-3.0R2.1/globals.h~ 2026-01-24 12:53:20.000000000 +0100 ++++ worminator-3.0R2.1/globals.h 2026-01-24 12:58:14.609674800 +0100 +@@ -293,7 +293,7 @@ int look_shift = 0; + char player_just_died = FALSE; + + // This is the path of the current level +-char current_level_mapfile_path[256] = ""; ++char current_level_mapfile_path[512] = ""; + + // Map and stats toggles and togglers + char display_map = FALSE; +diff -up worminator-3.0R2.1/menus.h~ worminator-3.0R2.1/menus.h +--- worminator-3.0R2.1/menus.h~ 2006-02-26 20:44:09.000000000 +0100 ++++ worminator-3.0R2.1/menus.h 2026-01-24 12:48:48.149271239 +0100 +@@ -84,7 +84,8 @@ if (theta >= 64) masked_blit(img, bmp, w + else { + for (i = 0; i < w/2; i++) { + j = i*tan(theta*360/256*RADIAN_CONVERTER); +- if (j > h/2) j = h/2; if (j < 0) j = 0; ++ if (j > h/2) j = h/2; ++ if (j < 0) j = 0; + masked_blit(img, bmp, w/2 + i, h/2 - j, x + w/2 + i, y + h/2 - j, 1, j); + } + return; +@@ -95,7 +96,8 @@ if (theta >= 128) masked_blit(img, bmp, + else { + for (i = w/2; i >= 0; i--) { + j = (h/2)-abs((i - w/2)*tan(theta*360/256*RADIAN_CONVERTER)); +- if (j > h/2) j = h/2; if (j < 0) j = 0; ++ if (j > h/2) j = h/2; ++ if (j < 0) j = 0; + masked_blit(img, bmp, i, 0, x + i, y, 1, j); + } + return; +@@ -106,7 +108,8 @@ if (theta >= 192) masked_blit(img, bmp, + else { + for (i = w/2; i >= 0; i--) { + j = abs((i - w/2)*tan(theta*360/256*RADIAN_CONVERTER)); +- if (j > h/2) j = h/2; if (j < 0) j = 0; ++ if (j > h/2) j = h/2; ++ if (j < 0) j = 0; + masked_blit(img, bmp, i, h/2, x + i, y + h/2, 1, j); + } + return; +@@ -117,7 +120,8 @@ if (theta == 255) masked_blit(img, bmp, + else { + for (i = 0; i < w/2; i++) { + j = (h/2)-abs(i*tan(theta*360/256*RADIAN_CONVERTER)); +- if (j > h/2) j = h/2; if (j < 0) j = 0; ++ if (j > h/2) j = h/2; ++ if (j < 0) j = 0; + masked_blit(img, bmp, w/2 + i, h - j, x + w/2 + i, y + h - j, 1, j); + } + return; +@@ -2610,7 +2610,7 @@ void save_screenshot() + { + BITMAP *backup; + int shotnum = -1; +-char *fname = "fuck this shit"; ++char fname[32]; + do { + shotnum++; + sprintf(fname, "shot%d.bmp", shotnum); +diff -up worminator-3.0R2.1/misc_ai.h~ worminator-3.0R2.1/misc_ai.h +--- worminator-3.0R2.1/misc_ai.h~ 2006-02-02 21:33:38.000000000 +0100 ++++ worminator-3.0R2.1/misc_ai.h 2026-01-24 12:51:31.180236159 +0100 +@@ -4,7 +4,6 @@ + void floating_platform_ai(int sprite_number) + { + char done_looping = FALSE; +-char blocked = FALSE; + char exponent_loop; + int tile_hit; + int blocked_test; +@@ -51,7 +50,7 @@ if (sprite_is_touching_player(sprite_num + if (player.y_position_in_pixels + 32 > sprites[sprite_number].y_position_in_pixels - 1 && player.y_position_in_pixels + 32 < sprites[sprite_number].y_position_in_pixels + 4) { + blocked_test = (int)player.y_position_in_pixels; + push_player(0, -1); +- if (blocked_test == (int)player.y_position_in_pixels) done_looping = TRUE, blocked = TRUE; ++ if (blocked_test == (int)player.y_position_in_pixels) done_looping = TRUE; + } + else done_looping = TRUE; + }; +@@ -241,7 +240,6 @@ if (sprites[sprite_number].timer == 0) { + void pushable_crate_ai(int sprite_number) + { + char done_looping = FALSE; +-char blocked = FALSE; + int blocked_test; + // These are true or false for the three points nessecary for collision detection + char p1, p2, p3; +@@ -305,7 +303,7 @@ if (sprite_is_touching_player(sprite_num + if (player.y_position_in_pixels + 32 > sprites[sprite_number].y_position_in_pixels - 1 && player.y_position_in_pixels + 32 < sprites[sprite_number].y_position_in_pixels + 4) { + blocked_test = (int)player.y_position_in_pixels; + push_player(0, -1); +- if (blocked_test == (int)player.y_position_in_pixels) done_looping = TRUE, blocked = TRUE; ++ if (blocked_test == (int)player.y_position_in_pixels) done_looping = TRUE; + } + else done_looping = TRUE; + }; +diff -up worminator-3.0R2.1/text.h~ worminator-3.0R2.1/text.h +--- worminator-3.0R2.1/text.h~ 2006-02-24 14:18:31.000000000 +0100 ++++ worminator-3.0R2.1/text.h 2026-01-24 12:56:19.034408585 +0100 +@@ -137,7 +137,7 @@ void stringPop(char *string) + { + int length = strlen(string); + +- strncpy(string, string + 1, length - 1); ++ memmove(string, string + 1, length - 1); + string[length - 1] = 0; + } + diff --git a/worminator-3.0R2.1-remove-al-fix-aliases.patch b/worminator-3.0R2.1-remove-al-fix-aliases.patch new file mode 100644 index 0000000..9764782 --- /dev/null +++ b/worminator-3.0R2.1-remove-al-fix-aliases.patch @@ -0,0 +1,70 @@ +Remove the use of / need for -DALLEGRO_FIX_ALIASES + +Starting with gcc 15 the default C-level is -std=gnu23 this enables +the fsub, fadd, fcos, etc function protypes in math.h causing +a conflict with the use of ALLEGRO_FIX_ALIASES which adds aliased +for allegro's fixed math functions back to the old allegro names +which conflict with the math.h prototypes. + +Since worminator only uses fsin, this can be fixed by dropping the use of +ALLEGRO_FIX_ALIASES, combined with s/fsin/fixsin/ + +diff -up worminator-3.0R2.1/Worminator.c~ worminator-3.0R2.1/Worminator.c +--- worminator-3.0R2.1/Worminator.c~ 2026-01-24 11:21:39.000000000 +0100 ++++ worminator-3.0R2.1/Worminator.c 2026-01-24 11:30:30.547339822 +0100 +@@ -2064,7 +2064,7 @@ if (player.direction == 0) { + sx = ((int)(screen_width * .8) / 2) + 32; + if (x2 - (player.x_position_in_pixels + 37) < ((int)(screen_width * .8) / 2) + 32) sx = x2 - (player.x_position_in_pixels + 37); + for (y = 0; y < sx; y++) { +- x1 = fixtof(fsin(itofix(y * 12))) * 4; ++ x1 = fixtof(fixsin(itofix(y * 12))) * 4; + if (rand() % 64 < 32) spawn_stardust(player.x_position_in_pixels + 37 + y, player.y_position_in_pixels + 13 + x1, 0, 0, 217 + (float)((rand() % 20) - 10.00) / 10.00, 212 + (float)((rand() % 20) - 10.00) / 10.00, 1, 1); + else spawn_stardust(player.x_position_in_pixels + 37 + y, player.y_position_in_pixels + 13 + x1, (float)((rand() % 20) - 10.00) / 80.00, (float)((rand() % 20) - 10.00) / 80.00, 217 - 64 + (float)((rand() % 20) - 10.00) / 10.00, 212 - 64 + (float)((rand() % 20) - 10.00) / 10.00, 1, 1); + } +@@ -2104,7 +2104,7 @@ else { + sx = ((int)(screen_width * .8) / 2) + 32; + if (player.x_position_in_pixels - 6 - x2 < ((int)(screen_width * .8) / 2) + 32) sx = player.x_position_in_pixels - 6 - x2; + for (y = 0; y < sx; y++) { +- x1 = fixtof(fsin(itofix(y * 12))) * 4; ++ x1 = fixtof(fixsin(itofix(y * 12))) * 4; + if (rand() % 64 < 32) spawn_stardust(player.x_position_in_pixels - 6 - y, player.y_position_in_pixels + 13 + x1, (float)((rand() % 20) - 10.00) / 80.00, (float)((rand() % 20) - 10.00) / 80.00, 217 + (float)((rand() % 20) - 10.00) / 10.00, 212 + (float)((rand() % 20) - 10.00) / 10.00, 1, 1); + else spawn_stardust(player.x_position_in_pixels - 6 - y, player.y_position_in_pixels + 13 + x1, 0, 0, 217 - 64 + (float)((rand() % 20) - 10.00) / 10.00, 212 - 64 + (float)((rand() % 20) - 10.00) / 10.00, 1, 1); + } +diff -up worminator-3.0R2.1/particle_ai.h~ worminator-3.0R2.1/particle_ai.h +--- worminator-3.0R2.1/particle_ai.h~ 2026-01-24 11:21:39.000000000 +0100 ++++ worminator-3.0R2.1/particle_ai.h 2026-01-24 11:30:21.932393870 +0100 +@@ -175,12 +175,12 @@ else if (sprites[sprite_number].action_s + sprites[sprite_number].y_acceleration = (float)((rand() % 20) - 10.00) / 10.00; + } + else if (sprites[sprite_number].action_state == 5) { +- sprites[sprite_number].x_acceleration = fixtof(fsin(itofix(sprites[sprite_number].direction))); ++ sprites[sprite_number].x_acceleration = fixtof(fixsin(itofix(sprites[sprite_number].direction))); + if (sprites[sprite_number].direction == -1) sprites[sprite_number].direction = 0; + else sprites[sprite_number].direction += 8; + } + else if (sprites[sprite_number].action_state == 6) { +- sprites[sprite_number].y_acceleration = fixtof(fsin(itofix(sprites[sprite_number].direction))); ++ sprites[sprite_number].y_acceleration = fixtof(fixsin(itofix(sprites[sprite_number].direction))); + if (sprites[sprite_number].direction == -1) sprites[sprite_number].direction = 0; + else sprites[sprite_number].direction += 8; + } +diff -up worminator-3.0R2.1/projectile_ai.h~ worminator-3.0R2.1/projectile_ai.h +--- worminator-3.0R2.1/projectile_ai.h~ 2006-02-02 21:33:38.000000000 +0100 ++++ worminator-3.0R2.1/projectile_ai.h 2026-01-24 11:30:35.155310910 +0100 +@@ -586,14 +586,14 @@ if (sprite_hit >= 0) { + // The following updates are based on the type of spikestar (red - sine, blue - negative sine, yellow - straight) + if (sprites[sprite_number].frame == WORMINATOR_SPIKESTAR_RED_FLY) { + // Adjust the spikestar's y velocity to conform to a sine wave path +- sprites[sprite_number].y_acceleration = fixtof(fsin(itofix(sprites[sprite_number].rotate_factor))); ++ sprites[sprite_number].y_acceleration = fixtof(fixsin(itofix(sprites[sprite_number].rotate_factor))); + + // Stardust smoke trail + if (out_of_player_range(sprite_number) == FALSE) spawn_stardust((sprites[sprite_number].x_position_in_pixels + sprites[sprite_number].width / 2), (sprites[sprite_number].y_position_in_pixels + sprites[sprite_number].height / 2), 0, .05, 77, 66, 2, 1); + } + else if (sprites[sprite_number].frame == WORMINATOR_SPIKESTAR_BLUE_FLY) { + // Adjust the spikestar's y velocity to conform to an inverse sine wave path +- sprites[sprite_number].y_acceleration = -fixtof(fsin(itofix(sprites[sprite_number].rotate_factor))); ++ sprites[sprite_number].y_acceleration = -fixtof(fixsin(itofix(sprites[sprite_number].rotate_factor))); + + // Stardust smoke trail + if (out_of_player_range(sprite_number) == FALSE) spawn_stardust((sprites[sprite_number].x_position_in_pixels + sprites[sprite_number].width / 2), (sprites[sprite_number].y_position_in_pixels + sprites[sprite_number].height / 2), 0, -.05, 157, 146, 2, 1); diff --git a/worminator.spec b/worminator.spec index 0723563..ea6b3b1 100644 --- a/worminator.spec +++ b/worminator.spec @@ -1,6 +1,6 @@ Name: worminator Version: 3.0R2.1 -Release: 47%{?dist} +Release: 48%{?dist} Summary: Sidescrolling platform and shoot'em up action-game # Automatically converted from old format: GPLv2+ - review is highly recommended. License: GPL-2.0-or-later @@ -12,6 +12,9 @@ Source3: %{name}.appdata.xml Patch0: worminator-3.0R2.1-speed.patch Patch1: worminator-3.0R2.1-format-security.patch Patch2: worminator-3.0R2.1-c99.patch +Patch3: worminator-3.0R2.1-remove-al-fix-aliases.patch +Patch4: worminator-3.0R2.1-fix-compiler-warnings.patch +Patch5: worminator-3.0R2.1-c23.patch BuildRequires: gcc BuildRequires: allegro-devel desktop-file-utils libappstream-glib Requires: worminator-data >= 3.0R2.1-2, hicolor-icon-theme @@ -29,8 +32,7 @@ sed -i 's/\r//' ReadMe.txt %build gcc $RPM_OPT_FLAGS -fsigned-char -Wno-deprecated-declarations \ - -Wno-char-subscripts -DALLEGRO_FIX_ALIASES \ - -DDATADIR=\"%{_datadir}/%{name}/\" -o %{name} \ + -Wno-char-subscripts -DDATADIR=\"%{_datadir}/%{name}/\" -o %{name} \ Worminator.c `allegro-config --libs` -lm @@ -60,6 +62,9 @@ appstream-util validate-relax --nonet \ %changelog +* Sat Jan 24 2026 Hans de Goede - 3.0R2.1-48 +- Fix FTBFS (rhbz#2341554, rhbz#2385732) + * Sat Jan 17 2026 Fedora Release Engineering - 3.0R2.1-47 - Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild From d4a913dae920f387582ae2b131c0f7adb521b174 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 17 Jul 2026 08:55:25 +0000 Subject: [PATCH 22/22] Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild --- worminator.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/worminator.spec b/worminator.spec index ea6b3b1..ba31cb4 100644 --- a/worminator.spec +++ b/worminator.spec @@ -1,6 +1,6 @@ Name: worminator Version: 3.0R2.1 -Release: 48%{?dist} +Release: 49%{?dist} Summary: Sidescrolling platform and shoot'em up action-game # Automatically converted from old format: GPLv2+ - review is highly recommended. License: GPL-2.0-or-later @@ -62,6 +62,9 @@ appstream-util validate-relax --nonet \ %changelog +* Fri Jul 17 2026 Fedora Release Engineering - 3.0R2.1-49 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild + * Sat Jan 24 2026 Hans de Goede - 3.0R2.1-48 - Fix FTBFS (rhbz#2341554, rhbz#2385732)