diff --git a/zasx-1.30-Makefile.patch b/zasx-1.30-Makefile.patch deleted file mode 100644 index f9abc26..0000000 --- a/zasx-1.30-Makefile.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff -up Zasx/Makefile~ Zasx/Makefile ---- Zasx/Makefile~ 2025-08-07 23:05:43.000000000 +0200 -+++ Zasx/Makefile 2025-08-08 16:18:49.071125278 +0200 -@@ -1,7 +1,7 @@ - PREFIX = /usr/local - DATADIR = $(PREFIX)/share/$(TARGET) - CFLAGS = -g -Wall -Wno-deprecated-declarations -O2 -fsigned-char --LDFLAGS = `allegro-config --libs` -ldumb -laldmb -lm -lpthread -+LIBS = `allegro-config --libs` -ldumb -laldmb -lm -lpthread - DEFINES = -DDATADIR=\"$(DATADIR)/\" -Iinclude - OBJS = obj/anim.o obj/dataload.o obj/gamemenu.o obj/input.o obj/log.o \ - obj/particle.o obj/scorer.o obj/asteroid.o obj/drs.o obj/gametimer.o \ -@@ -10,7 +10,7 @@ OBJS = obj/anim.o obj/dataload.o obj/ - TARGET = zasx - - $(TARGET): $(OBJS) -- $(CC) $(LDFLAGS) -o $@ $^ -+ $(CC) $(LDFLAGS) -o $@ $^ $(LIBS) - - obj/%.o: src/%.c - $(CC) $(CFLAGS) $(DEFINES) -o $@ -c $< diff --git a/zasx-1.30-remove-al-fix-aliases.patch b/zasx-1.30-remove-al-fix-aliases.patch deleted file mode 100644 index 51bc413..0000000 --- a/zasx-1.30-remove-al-fix-aliases.patch +++ /dev/null @@ -1,65 +0,0 @@ -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 zasx only uses fcos, this can be fixed by dropping the use of -ALLEGRO_FIX_ALIASES, combined with s/fcos/fixcos/ - -diff -up Zasx/Makefile~ Zasx/Makefile ---- Zasx/Makefile~ 2025-08-07 22:08:56.000000000 +0200 -+++ Zasx/Makefile 2025-08-07 23:05:43.640169740 +0200 -@@ -1,6 +1,6 @@ - PREFIX = /usr/local - DATADIR = $(PREFIX)/share/$(TARGET) --CFLAGS = -g -Wall -Wno-deprecated-declarations -O2 -fsigned-char -DALLEGRO_FIX_ALIASES -+CFLAGS = -g -Wall -Wno-deprecated-declarations -O2 -fsigned-char - LDFLAGS = `allegro-config --libs` -ldumb -laldmb -lm -lpthread - DEFINES = -DDATADIR=\"$(DATADIR)/\" -Iinclude - OBJS = obj/anim.o obj/dataload.o obj/gamemenu.o obj/input.o obj/log.o \ -diff -up Zasx/src/scorer.c~ Zasx/src/scorer.c ---- Zasx/src/scorer.c~ 2025-08-07 22:08:56.000000000 +0200 -+++ Zasx/src/scorer.c 2025-08-07 23:04:39.992540810 +0200 -@@ -39,28 +39,28 @@ void ShowCredits() { - do { - DrawBG(); - -- textout(BackBuffer, font, " Programming and Design", 10 + fixtoi(10 * fcos(itofix(GameTime - start_tick) / 10)), -+ textout(BackBuffer, font, " Programming and Design", 10 + fixtoi(10 * fixcos(itofix(GameTime - start_tick) / 10)), - 30, makecol(255, 255, 255)); -- textout(BackBuffer, font, " Robert J Ohannessian", 10 + fixtoi(10 * fcos(itofix(GameTime - start_tick + 50) / 10)), -+ textout(BackBuffer, font, " Robert J Ohannessian", 10 + fixtoi(10 * fixcos(itofix(GameTime - start_tick + 50) / 10)), - 40, makecol(255, 255, 255)); -- textout(BackBuffer, font, " Music:", 10 + fixtoi(10 * fcos(itofix(GameTime - start_tick + 150) / 10)), -+ textout(BackBuffer, font, " Music:", 10 + fixtoi(10 * fixcos(itofix(GameTime - start_tick + 150) / 10)), - 60, makecol(255, 255, 255)); -- textout(BackBuffer, font, " Ben Davis", 10 + fixtoi(10 * fcos(itofix(GameTime - start_tick + 200) / 10)), -+ textout(BackBuffer, font, " Ben Davis", 10 + fixtoi(10 * fixcos(itofix(GameTime - start_tick + 200) / 10)), - 70, makecol(255, 255, 255)); -- textout(BackBuffer, font, " Graphics:", 10 + fixtoi(10 * fcos(itofix(GameTime - start_tick + 300) / 10)), -+ textout(BackBuffer, font, " Graphics:", 10 + fixtoi(10 * fixcos(itofix(GameTime - start_tick + 300) / 10)), - 90, makecol(255, 255, 255)); -- textout(BackBuffer, font, " Robert J Ohannessian", 10 + fixtoi(10 * fcos(itofix(GameTime - start_tick + 350) / 10)), -+ textout(BackBuffer, font, " Robert J Ohannessian", 10 + fixtoi(10 * fixcos(itofix(GameTime - start_tick + 350) / 10)), - 100, makecol(255, 255, 255)); -- textout(BackBuffer, font, " Jonathan Soulard", 10 + fixtoi(10 * fcos(itofix(GameTime - start_tick + 400) / 10)), -+ textout(BackBuffer, font, " Jonathan Soulard", 10 + fixtoi(10 * fixcos(itofix(GameTime - start_tick + 400) / 10)), - 110, makecol(255, 255, 255)); - -- textout(BackBuffer, font, " Special thanks to:", 10 + fixtoi(10 * fcos(itofix(GameTime - start_tick + 500) / 10)), -+ textout(BackBuffer, font, " Special thanks to:", 10 + fixtoi(10 * fixcos(itofix(GameTime - start_tick + 500) / 10)), - 130, makecol(255, 255, 255)); -- textout(BackBuffer, font, " Shawn Hargreaves, (Allegro, one asteroid graphics and some sound effects)", 10 + fixtoi(10 * fcos(itofix(GameTime - start_tick + 550) / 10)), -+ textout(BackBuffer, font, " Shawn Hargreaves, (Allegro, one asteroid graphics and some sound effects)", 10 + fixtoi(10 * fixcos(itofix(GameTime - start_tick + 550) / 10)), - 140, makecol(255, 255, 255)); -- textout(BackBuffer, font, " Ivan Baldo, (PPCol)", 10 + fixtoi(10 * fcos(itofix(GameTime - start_tick + 600) / 10)), -+ textout(BackBuffer, font, " Ivan Baldo, (PPCol)", 10 + fixtoi(10 * fixcos(itofix(GameTime - start_tick + 600) / 10)), - 150, makecol(255, 255, 255)); -- textout(BackBuffer, font, " Jeffery Guan, (JGMOD)", 10 + fixtoi(10 * fcos(itofix(GameTime - start_tick + 650) / 10)), -+ textout(BackBuffer, font, " Jeffery Guan, (JGMOD)", 10 + fixtoi(10 * fixcos(itofix(GameTime - start_tick + 650) / 10)), - 160, makecol(255, 255, 255)); - - diff --git a/zasx.rpmlintrc b/zasx.rpmlintrc deleted file mode 100644 index 2791b40..0000000 --- a/zasx.rpmlintrc +++ /dev/null @@ -1,5 +0,0 @@ -addFilter("W: invalid-url Source0") -addFilter("W: no-%check-section") -addFilter("W: no-manual-page-for-binary") -addFilter("E: spelling-error") -addFilter("E: incorrect-fsf-address") diff --git a/zasx.spec b/zasx.spec index 250be0d..34e5daf 100644 --- a/zasx.spec +++ b/zasx.spec @@ -1,8 +1,8 @@ Name: zasx Version: 1.30 -Release: 44%{?dist} +Release: 35%{?dist} Summary: Asteroid like game with powerups -License: GPL-2.0-or-later AND Giftware +License: GPLv2+ and Freely redistributable without restriction URL: https://www.allegro.cc/depot/Zasx/ # Original link (down): http://www.bob.allegronetwork.com/zasx/zasx130s.zip Source0: zasx130s.zip @@ -12,9 +12,8 @@ Patch0: zasx-1.30-fixes.patch Patch1: zasx-1.30-datadir.patch Patch2: zasx-1.30-format-security.patch Patch3: zasx-1.30-locale-fix.patch -Patch4: zasx-1.30-remove-al-fix-aliases.patch -Patch5: zasx-1.30-Makefile.patch -BuildRequires: gcc make +BuildRequires: make +BuildRequires: gcc BuildRequires: dumb-devel ImageMagick desktop-file-utils libappstream-glib Requires: hicolor-icon-theme @@ -32,8 +31,7 @@ mv docs html %build make %{?_smp_mflags} PREFIX=%{_prefix} \ - CFLAGS="$RPM_OPT_FLAGS -fsigned-char -Wno-deprecated-declarations" \ - LDFLAGS="$RPM_LD_FLAGS" + CFLAGS="$RPM_OPT_FLAGS -fsigned-char -DALLEGRO_FIX_ALIASES -Wno-deprecated-declarations" convert -transparent black -resize 64x64 %{name}.ico %{name}.png @@ -65,35 +63,6 @@ appstream-util validate-relax --nonet \ %changelog -* Fri Jul 17 2026 Fedora Release Engineering - 1.30-44 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild - -* Sat Jan 17 2026 Fedora Release Engineering - 1.30-43 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild - -* Thu Aug 7 2025 Hans de Goede - 1.30-42 -- Fix FTBFS with gcc15 -- Resolves: rhbz#2341600 -- Resolves: rhbz#2385756 - -* Fri Jul 25 2025 Fedora Release Engineering - 1.30-41 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild - -* Sun Jan 19 2025 Fedora Release Engineering - 1.30-40 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild - -* Sat Jul 20 2024 Fedora Release Engineering - 1.30-39 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild - -* Sat Jan 27 2024 Fedora Release Engineering - 1.30-38 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - -* Sat Jul 22 2023 Fedora Release Engineering - 1.30-37 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild - -* Sat Jan 21 2023 Fedora Release Engineering - 1.30-36 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild - * Sat Jul 23 2022 Fedora Release Engineering - 1.30-35 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild