From 3f40d2ef07e30a8b26d35ab79dc9b1aafb79227e Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 20 Jul 2022 23:57:40 +0000 Subject: [PATCH 01/12] Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- cylindrix.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/cylindrix.spec b/cylindrix.spec index b31e743..e856553 100644 --- a/cylindrix.spec +++ b/cylindrix.spec @@ -1,6 +1,6 @@ Name: cylindrix Version: 1.0 -Release: 37%{?dist} +Release: 38%{?dist} Summary: A 3 degrees of freedom combat game License: LGPLv2 @@ -88,6 +88,9 @@ install -p -m 644 %{SOURCE2} \ %changelog +* 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 From f612520f5f8bc9780de1c011ecf2348db0bb712d Mon Sep 17 00:00:00 2001 From: Peter Fordham Date: Thu, 22 Dec 2022 08:26:12 +0000 Subject: [PATCH 02/12] Port configure script to C99. https://fedoraproject.org/wiki/Toolchain/PortingToModernC Rebuilding configure with new autotools would also solve the problem. --- cylindrix-1.0-configure-c99.patch | 13 +++++++++++++ cylindrix.spec | 7 ++++++- 2 files changed, 19 insertions(+), 1 deletion(-) create mode 100644 cylindrix-1.0-configure-c99.patch diff --git a/cylindrix-1.0-configure-c99.patch b/cylindrix-1.0-configure-c99.patch new file mode 100644 index 0000000..9572bbb --- /dev/null +++ b/cylindrix-1.0-configure-c99.patch @@ -0,0 +1,13 @@ +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 e856553..3efefde 100644 --- a/cylindrix.spec +++ b/cylindrix.spec @@ -1,6 +1,6 @@ Name: cylindrix Version: 1.0 -Release: 38%{?dist} +Release: 39%{?dist} Summary: A 3 degrees of freedom combat game License: LGPLv2 @@ -15,6 +15,7 @@ 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 @@ -42,6 +43,7 @@ is worth a try. %patch2 -p0 %patch3 -p0 %patch4 -p0 +%patch5 -p0 %build @@ -88,6 +90,9 @@ install -p -m 644 %{SOURCE2} \ %changelog +* 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 From 3346e63b049817633fdf2c22c8c53bf8863aa4c3 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 19 Jan 2023 00:54:01 +0000 Subject: [PATCH 03/12] Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- cylindrix.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/cylindrix.spec b/cylindrix.spec index 3efefde..ae7ef75 100644 --- a/cylindrix.spec +++ b/cylindrix.spec @@ -1,6 +1,6 @@ Name: cylindrix Version: 1.0 -Release: 39%{?dist} +Release: 40%{?dist} Summary: A 3 degrees of freedom combat game License: LGPLv2 @@ -90,6 +90,9 @@ install -p -m 644 %{SOURCE2} \ %changelog +* 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. From 94d0d62a32e953cc67c82d35607b9ca01398f9dc Mon Sep 17 00:00:00 2001 From: Gwyn Ciesla Date: Wed, 1 Mar 2023 12:03:32 -0600 Subject: [PATCH 04/12] migrated to SPDX license --- cylindrix.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/cylindrix.spec b/cylindrix.spec index ae7ef75..495899a 100644 --- a/cylindrix.spec +++ b/cylindrix.spec @@ -1,9 +1,9 @@ Name: cylindrix Version: 1.0 -Release: 40%{?dist} +Release: 41%{?dist} Summary: A 3 degrees of freedom combat game -License: LGPLv2 +License: LGPL-2.0-only URL: http://www.hardgeus.com/cylindrix/ Source0: http://www.hardgeus.com/cylindrix/cylindrix-1.0.tar.bz2 Source1: cylindrix.desktop @@ -90,6 +90,9 @@ install -p -m 644 %{SOURCE2} \ %changelog +* 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 From f78ea89f7c4fd53a83e6d9872be3af70f2049276 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 19 Jul 2023 16:53:01 +0000 Subject: [PATCH 05/12] Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- cylindrix.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/cylindrix.spec b/cylindrix.spec index 495899a..1683ec7 100644 --- a/cylindrix.spec +++ b/cylindrix.spec @@ -1,6 +1,6 @@ Name: cylindrix Version: 1.0 -Release: 41%{?dist} +Release: 42%{?dist} Summary: A 3 degrees of freedom combat game License: LGPL-2.0-only @@ -90,6 +90,9 @@ install -p -m 644 %{SOURCE2} \ %changelog +* 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 From 8451931cfbbb833b2f3c87233213b01f89e11ba6 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 19 Jan 2024 16:35:29 +0000 Subject: [PATCH 06/12] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- cylindrix.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/cylindrix.spec b/cylindrix.spec index 1683ec7..050004b 100644 --- a/cylindrix.spec +++ b/cylindrix.spec @@ -1,6 +1,6 @@ Name: cylindrix Version: 1.0 -Release: 42%{?dist} +Release: 43%{?dist} Summary: A 3 degrees of freedom combat game License: LGPL-2.0-only @@ -90,6 +90,9 @@ install -p -m 644 %{SOURCE2} \ %changelog +* 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 From f785bacd8623a04b7cca97bcfacb63589f8856c1 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 24 Jan 2024 08:48:41 +0000 Subject: [PATCH 07/12] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- cylindrix.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/cylindrix.spec b/cylindrix.spec index 050004b..f55d390 100644 --- a/cylindrix.spec +++ b/cylindrix.spec @@ -1,6 +1,6 @@ Name: cylindrix Version: 1.0 -Release: 43%{?dist} +Release: 44%{?dist} Summary: A 3 degrees of freedom combat game License: LGPL-2.0-only @@ -90,6 +90,9 @@ install -p -m 644 %{SOURCE2} \ %changelog +* 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 From db1f041d670be5f167e0dfdf814c723ee8057b18 Mon Sep 17 00:00:00 2001 From: Software Management Team Date: Thu, 30 May 2024 12:46:46 +0200 Subject: [PATCH 08/12] Eliminate use of obsolete %patchN syntax (#2283636) --- cylindrix.spec | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/cylindrix.spec b/cylindrix.spec index f55d390..d249f40 100644 --- a/cylindrix.spec +++ b/cylindrix.spec @@ -38,12 +38,12 @@ is worth a try. %prep %setup -q -%patch0 -p0 -%patch1 -p0 -%patch2 -p0 -%patch3 -p0 -%patch4 -p0 -%patch5 -p0 +%patch -P0 -p0 +%patch -P1 -p0 +%patch -P2 -p0 +%patch -P3 -p0 +%patch -P4 -p0 +%patch -P5 -p0 %build From c7cf697458d0534156b8339121a219c73cae6d91 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 17 Jul 2024 20:26:39 +0000 Subject: [PATCH 09/12] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild --- cylindrix.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/cylindrix.spec b/cylindrix.spec index d249f40..60b5caa 100644 --- a/cylindrix.spec +++ b/cylindrix.spec @@ -1,6 +1,6 @@ Name: cylindrix Version: 1.0 -Release: 44%{?dist} +Release: 45%{?dist} Summary: A 3 degrees of freedom combat game License: LGPL-2.0-only @@ -90,6 +90,9 @@ install -p -m 644 %{SOURCE2} \ %changelog +* 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 From 1129119250f6c94f456e652541b8471d87780708 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 16 Jan 2025 15:08:54 +0000 Subject: [PATCH 10/12] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild --- cylindrix.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/cylindrix.spec b/cylindrix.spec index 60b5caa..a264bec 100644 --- a/cylindrix.spec +++ b/cylindrix.spec @@ -1,6 +1,6 @@ Name: cylindrix Version: 1.0 -Release: 45%{?dist} +Release: 46%{?dist} Summary: A 3 degrees of freedom combat game License: LGPL-2.0-only @@ -90,6 +90,9 @@ install -p -m 644 %{SOURCE2} \ %changelog +* 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 From 73b1c97fe91a4c097da1cc1603930c9e7a4f86b3 Mon Sep 17 00:00:00 2001 From: Gwyn Ciesla Date: Fri, 31 Jan 2025 09:21:42 -0600 Subject: [PATCH 11/12] Fix FTBFS --- cylindrix.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cylindrix.spec b/cylindrix.spec index a264bec..2779480 100644 --- a/cylindrix.spec +++ b/cylindrix.spec @@ -48,7 +48,7 @@ is worth a try. %build %configure -make CFLAGS="$RPM_OPT_FLAGS -Wno-pointer-sign -fcommon" LIBS="-lm" +make CFLAGS="$RPM_OPT_FLAGS -Wno-pointer-sign -fcommon -std=gnu17" LIBS="-lm" %install mkdir -p %{buildroot}%{_bindir} From 5a9d933b4b76ca73d86359f2dfede2a2a4d4ac31 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 23 Jul 2025 18:58:26 +0000 Subject: [PATCH 12/12] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild --- cylindrix.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/cylindrix.spec b/cylindrix.spec index 2779480..e49273c 100644 --- a/cylindrix.spec +++ b/cylindrix.spec @@ -1,6 +1,6 @@ Name: cylindrix Version: 1.0 -Release: 46%{?dist} +Release: 47%{?dist} Summary: A 3 degrees of freedom combat game License: LGPL-2.0-only @@ -90,6 +90,9 @@ install -p -m 644 %{SOURCE2} \ %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