diff --git a/cylindrix-1.0-configure-c99.patch b/cylindrix-1.0-configure-c99.patch deleted file mode 100644 index 9572bbb..0000000 --- a/cylindrix-1.0-configure-c99.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/configure b/configure -index baf9b5a..487763c 100755 ---- configure -+++ configure -@@ -906,7 +906,7 @@ cat > conftest.$ac_ext << EOF - #line 907 "configure" - #include "confdefs.h" - --main(){return(0);} -+int main(){return(0);} - EOF - if { (eval echo configure:912: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - ac_cv_prog_cc_works=yes diff --git a/cylindrix.spec b/cylindrix.spec index e49273c..2ab57e2 100644 --- a/cylindrix.spec +++ b/cylindrix.spec @@ -1,9 +1,10 @@ Name: cylindrix Version: 1.0 -Release: 47%{?dist} +Release: 28%{?dist} Summary: A 3 degrees of freedom combat game -License: LGPL-2.0-only +Group: Amusements/Games +License: LGPLv2 URL: http://www.hardgeus.com/cylindrix/ Source0: http://www.hardgeus.com/cylindrix/cylindrix-1.0.tar.bz2 Source1: cylindrix.desktop @@ -15,11 +16,9 @@ Patch1: cylindrix-1.0-arch-independ-file-read.patch Patch2: cylindrix-1.0-use-int-not-long.patch Patch3: cylindrix-1.0-arch-independ-file-write.patch Patch4: cylindrix-1.0-object-fopen.patch -Patch5: cylindrix-1.0-configure-c99.patch Requires: hicolor-icon-theme BuildRequires: gcc-c++ BuildRequires: allegro-devel, desktop-file-utils -BuildRequires: make %description Cylindrix is a 3-on-3 combat game with 360 degrees of freedom that is @@ -38,19 +37,20 @@ is worth a try. %prep %setup -q -%patch -P0 -p0 -%patch -P1 -p0 -%patch -P2 -p0 -%patch -P3 -p0 -%patch -P4 -p0 -%patch -P5 -p0 +%patch0 -p0 +%patch1 -p0 +%patch2 -p0 +%patch3 -p0 +%patch4 -p0 %build %configure -make CFLAGS="$RPM_OPT_FLAGS -Wno-pointer-sign -fcommon -std=gnu17" LIBS="-lm" +make CFLAGS="$RPM_OPT_FLAGS -Wno-pointer-sign" LIBS="-lm" %install +rm -rf %{buildroot} + mkdir -p %{buildroot}%{_bindir} install -m 755 %{SOURCE3} %{buildroot}%{_bindir}/cylindrix install -m 755 cylindrix %{buildroot}%{_bindir}/cylindrix-bin @@ -83,71 +83,13 @@ install -p -m 644 %{SOURCE2} \ %files %{_bindir}/cylindrix* %{_datadir}/cylindrix/ -%license COPYING -%doc AUTHORS + +%doc AUTHORS COPYING %{_datadir}/applications/cylindrix.desktop %{_datadir}/icons/hicolor/64x64/apps/cylindrix.png %changelog -* Wed Jul 23 2025 Fedora Release Engineering - 1.0-47 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild - -* Thu Jan 16 2025 Fedora Release Engineering - 1.0-46 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild - -* Wed Jul 17 2024 Fedora Release Engineering - 1.0-45 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild - -* Wed Jan 24 2024 Fedora Release Engineering - 1.0-44 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - -* Fri Jan 19 2024 Fedora Release Engineering - 1.0-43 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - -* Wed Jul 19 2023 Fedora Release Engineering - 1.0-42 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild - -* Wed Mar 01 2023 Gwyn Ciesla - 1.0-41 -- migrated to SPDX license - -* Thu Jan 19 2023 Fedora Release Engineering - 1.0-40 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild - -* Thu Dec 22 2022 Peter Fordham - 1.0-39 -- Port configure script to C99. - -* Wed Jul 20 2022 Fedora Release Engineering - 1.0-38 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild - -* Thu Jan 20 2022 Fedora Release Engineering - 1.0-37 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild - -* Wed Jul 21 2021 Fedora Release Engineering - 1.0-36 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild - -* Tue Jan 26 2021 Fedora Release Engineering - 1.0-35 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild - -* Sat Aug 01 2020 Fedora Release Engineering - 1.0-34 -- Second attempt - Rebuilt for - https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild - -* Mon Jul 27 2020 Fedora Release Engineering - 1.0-33 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild - -* Thu Feb 06 2020 Gwyn Ciesla - 1.0-32 -- Fix FTBFS. - -* Tue Jan 28 2020 Fedora Release Engineering - 1.0-31 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild - -* Wed Jul 24 2019 Fedora Release Engineering - 1.0-30 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild - -* Thu Jan 31 2019 Fedora Release Engineering - 1.0-29 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild - * Thu Jul 12 2018 Fedora Release Engineering - 1.0-28 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild