diff --git a/xgalaxy-configure-c99.patch b/xgalaxy-configure-c99.patch new file mode 100644 index 0000000..c1a0ab0 --- /dev/null +++ b/xgalaxy-configure-c99.patch @@ -0,0 +1,36 @@ +Fix implicit int and implicit function declarations in the configure +script. These fixes are generic; autoconf no longer generates this +code. So there is no need to upstream this. + +diff -ur xgalaga-2.0.34.orig/configure xgalaga-2.0.34/configure +--- xgalaga-2.0.34.orig/configure 2023-01-17 14:22:59.367854998 +0100 ++++ xgalaga-2.0.34/configure 2023-01-17 14:26:14.040800919 +0100 +@@ -711,7 +711,7 @@ + #line 712 "configure" + #include "confdefs.h" + +-main(){return(0);} ++int main(){return(0);} + EOF + if { (eval echo configure:717: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + ac_cv_prog_cc_works=yes +@@ -1183,6 +1183,8 @@ + #line 1184 "configure" + #include "confdefs.h" + ++char ${x_direct_test_function}(void); ++ + int main() { + ${x_direct_test_function}() + ; return 0; } +@@ -2286,8 +2288,8 @@ + #define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c)) + #define XOR(e, f) (((e) && !(f)) || (!(e) && (f))) + int main () { int i; for (i = 0; i < 256; i++) +-if (XOR (islower (i), ISLOWER (i)) || toupper (i) != TOUPPER (i)) exit(2); +-exit (0); } ++if (XOR (islower (i), ISLOWER (i)) || toupper (i) != TOUPPER (i)) return 2; ++return 0; } + + EOF + if { (eval echo configure:2292: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null diff --git a/xgalaxy.spec b/xgalaxy.spec index 2052bc3..b9f4c65 100644 --- a/xgalaxy.spec +++ b/xgalaxy.spec @@ -1,9 +1,8 @@ Name: xgalaxy Version: 2.0.34 -Release: 26%{?dist} +Release: 48%{?dist} Summary: Arcade game: shoot down the space ships attacking the planet -Group: Amusements/Games -License: GPL+ +License: GPL-1.0-or-later URL: http://sourceforge.net/projects/xgalaga/ Source0: http://downloads.sourceforge.net/xgalaga/xgalaga_%{version}.orig.tar.gz Source1: %{name}.desktop @@ -15,8 +14,10 @@ Patch3: %{name}-2.0.34-joy.patch Patch4: %{name}-2.0.34-fullscreen-viewport.patch Patch5: %{name}-2.0.34-alsa.patch Patch6: %{name}-2.0.34-dga-compile-fix.patch +Patch7: xgalaxy-configure-c99.patch +BuildRequires: make BuildRequires: libXt-devel libXpm-devel libXmu-devel libXxf86vm-devel -BuildRequires: alsa-lib-devel desktop-file-utils ImageMagick +BuildRequires: alsa-lib-devel desktop-file-utils ImageMagick gcc Requires: hicolor-icon-theme Obsoletes: xgalaga <= %{version} Provides: xgalaga = %{version}-%{release} @@ -29,13 +30,14 @@ ships attacking the planet. %prep %setup -q -n xgalaga-%{version} # many thanks to Debian for all their excellent work on xgalala -%patch0 -p1 -z .deb -%patch1 -p1 -z .fs -%patch2 -p1 -z .%{name} -%patch3 -p1 -z .joy -%patch4 -p1 -z .viewport -%patch5 -p1 -z .alsa -%patch6 -p1 -z .no-dga +%patch -P0 -p1 -z .deb +%patch -P1 -p1 -z .fs +%patch -P2 -p1 -z .%{name} +%patch -P3 -p1 -z .joy +%patch -P4 -p1 -z .viewport +%patch -P5 -p1 -z .alsa +%patch -P6 -p1 -z .no-dga +%patch -P7 -p1 -z .c99 sed -e 's/Debian/Fedora/g' debian/README.Debian > README.fedora cat >> README.fedora << EOF @@ -51,7 +53,7 @@ sed -i 's/XGalaga/XGalaxy/g' `grep -rls XGalaga .` %build -export CFLAGS="$RPM_OPT_FLAGS -fsigned-char -DXF86VIDMODE" +export CFLAGS="$RPM_OPT_FLAGS -fsigned-char -DXF86VIDMODE -std=gnu17" export LDFLAGS=-lXxf86vm ./configure --libdir=%{_libdir} --exec-prefix=%{_bindir} \ --prefix=%{_datadir}/%{name} @@ -85,20 +87,6 @@ mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/22x22/apps install -p -m 644 %{name}.png \ $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/22x22/apps - -%post -touch --no-create %{_datadir}/icons/hicolor || : -if [ -x %{_bindir}/gtk-update-icon-cache ]; then - %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : -fi - -%postun -touch --no-create %{_datadir}/icons/hicolor || : -if [ -x %{_bindir}/gtk-update-icon-cache ]; then - %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : -fi - - %files %doc CHANGES COPYING README README.fedora %{_bindir}/%{name}* @@ -110,6 +98,73 @@ fi %changelog +* Fri Jul 17 2026 Fedora Release Engineering - 2.0.34-48 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild + +* Sat Jan 17 2026 Fedora Release Engineering - 2.0.34-47 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild + +* Fri Jul 25 2025 Fedora Release Engineering - 2.0.34-46 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild + +* Sun Jan 19 2025 Fedora Release Engineering - 2.0.34-45 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + +* Sat Jul 20 2024 Fedora Release Engineering - 2.0.34-44 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + +* Sat Jan 27 2024 Fedora Release Engineering - 2.0.34-43 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Sat Jul 22 2023 Fedora Release Engineering - 2.0.34-42 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + +* Thu Mar 02 2023 Gwyn Ciesla - 2.0.34-41 +- migrated to SPDX license + +* Sat Jan 21 2023 Fedora Release Engineering - 2.0.34-40 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + +* Tue Jan 17 2023 Florian Weimer - 2.0.34-39 +- Port configure script to C99 + +* Sat Jul 23 2022 Fedora Release Engineering - 2.0.34-38 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + +* Sat Jan 22 2022 Fedora Release Engineering - 2.0.34-37 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + +* Fri Jul 23 2021 Fedora Release Engineering - 2.0.34-36 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + +* Thu Jan 28 2021 Fedora Release Engineering - 2.0.34-35 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + +* Sat Aug 01 2020 Fedora Release Engineering - 2.0.34-34 +- Second attempt - Rebuilt for + https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Wed Jul 29 2020 Fedora Release Engineering - 2.0.34-33 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Fri Jan 31 2020 Fedora Release Engineering - 2.0.34-32 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + +* Sat Jul 27 2019 Fedora Release Engineering - 2.0.34-31 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + +* Sun Feb 03 2019 Fedora Release Engineering - 2.0.34-30 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + +* Sat Jul 14 2018 Fedora Release Engineering - 2.0.34-29 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + +* Fri Feb 09 2018 Fedora Release Engineering - 2.0.34-28 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + +* Thu Jan 18 2018 Igor Gnatenko - 2.0.34-27 +- Remove obsolete scriptlets + * Thu Aug 03 2017 Fedora Release Engineering - 2.0.34-26 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild