From e51807c54fc72e1c445edc033374fb13a83ebe61 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 19 Jan 2024 11:58:58 +0000 Subject: [PATCH 01/10] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- abbayedesmorts-gpl.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/abbayedesmorts-gpl.spec b/abbayedesmorts-gpl.spec index 7d2dd34..2603ac1 100644 --- a/abbayedesmorts-gpl.spec +++ b/abbayedesmorts-gpl.spec @@ -1,6 +1,6 @@ Name: abbayedesmorts-gpl Version: 2.0.2 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Platform game set in 13th century # Graphics and Sounds are licensed under @@ -72,6 +72,9 @@ appstream-util validate-relax --nonet %{buildroot}%{_datadir}/appdata/abbaye.app %changelog +* Fri Jan 19 2024 Fedora Release Engineering - 2.0.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Tue Oct 24 2023 Andrea Musuruane - 2.0.2-1 - Updated to new upstream release From e0570d7b83ac6dd884f26acfe6f827d9e702cf0b Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 24 Jan 2024 07:21:05 +0000 Subject: [PATCH 02/10] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- abbayedesmorts-gpl.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/abbayedesmorts-gpl.spec b/abbayedesmorts-gpl.spec index 2603ac1..f288781 100644 --- a/abbayedesmorts-gpl.spec +++ b/abbayedesmorts-gpl.spec @@ -1,6 +1,6 @@ Name: abbayedesmorts-gpl Version: 2.0.2 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Platform game set in 13th century # Graphics and Sounds are licensed under @@ -72,6 +72,9 @@ appstream-util validate-relax --nonet %{buildroot}%{_datadir}/appdata/abbaye.app %changelog +* Wed Jan 24 2024 Fedora Release Engineering - 2.0.2-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Fri Jan 19 2024 Fedora Release Engineering - 2.0.2-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From 5c8a5ef86cb26f19da6a0e7928ae8def42702eec Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 17 Jul 2024 16:29:02 +0000 Subject: [PATCH 03/10] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild --- abbayedesmorts-gpl.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/abbayedesmorts-gpl.spec b/abbayedesmorts-gpl.spec index f288781..e11d60a 100644 --- a/abbayedesmorts-gpl.spec +++ b/abbayedesmorts-gpl.spec @@ -1,6 +1,6 @@ Name: abbayedesmorts-gpl Version: 2.0.2 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Platform game set in 13th century # Graphics and Sounds are licensed under @@ -72,6 +72,9 @@ appstream-util validate-relax --nonet %{buildroot}%{_datadir}/appdata/abbaye.app %changelog +* Wed Jul 17 2024 Fedora Release Engineering - 2.0.2-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + * Wed Jan 24 2024 Fedora Release Engineering - 2.0.2-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From 6847c2e7246e3a04d22e13ff17c47972950f7a9d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20Such=C3=BD?= Date: Wed, 28 Aug 2024 07:45:24 +0200 Subject: [PATCH 04/10] convert license to SPDX This is part of https://fedoraproject.org/wiki/Changes/SPDX_Licenses_Phase_4 --- abbayedesmorts-gpl.spec | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/abbayedesmorts-gpl.spec b/abbayedesmorts-gpl.spec index e11d60a..af842d1 100644 --- a/abbayedesmorts-gpl.spec +++ b/abbayedesmorts-gpl.spec @@ -1,11 +1,12 @@ Name: abbayedesmorts-gpl Version: 2.0.2 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Platform game set in 13th century # Graphics and Sounds are licensed under # Creative Commons 3.0 Attribution license. -License: GPLv3 and CC-BY +# Automatically converted from old format: GPLv3 and CC-BY - review is highly recommended. +License: GPL-3.0-only AND LicenseRef-Callaway-CC-BY # Original Windows game by locomalito # https://locomalito.com/abbaye_des_morts.php URL: https://github.com/nevat/abbayedesmorts-gpl @@ -72,6 +73,9 @@ appstream-util validate-relax --nonet %{buildroot}%{_datadir}/appdata/abbaye.app %changelog +* Wed Aug 28 2024 Miroslav Suchý - 2.0.2-5 +- convert license to SPDX + * Wed Jul 17 2024 Fedora Release Engineering - 2.0.2-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild From c8c046ba39d826a68ffc45b3117865d11792a72b Mon Sep 17 00:00:00 2001 From: Andrea Musuruane Date: Sun, 29 Sep 2024 19:18:45 +0200 Subject: [PATCH 05/10] Updated to new upstream release --- .gitignore | 1 + abbayedesmorts-gpl.spec | 13 +++++++++---- sources | 2 +- 3 files changed, 11 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index 316c873..b3d413d 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ /abbayedesmorts-gpl-2.0.1-9ce56f6.tar.gz /abbayedesmorts-gpl-2.0.1-3d12ed6.tar.gz /abbayedesmorts-gpl-2.0.2.tar.gz +/abbayedesmorts-gpl-2.0.4.tar.gz diff --git a/abbayedesmorts-gpl.spec b/abbayedesmorts-gpl.spec index af842d1..234078f 100644 --- a/abbayedesmorts-gpl.spec +++ b/abbayedesmorts-gpl.spec @@ -1,12 +1,11 @@ Name: abbayedesmorts-gpl -Version: 2.0.2 -Release: 5%{?dist} +Version: 2.0.4 +Release: 1%{?dist} Summary: Platform game set in 13th century # Graphics and Sounds are licensed under # Creative Commons 3.0 Attribution license. -# Automatically converted from old format: GPLv3 and CC-BY - review is highly recommended. -License: GPL-3.0-only AND LicenseRef-Callaway-CC-BY +License: GPL-3.0-only AND CC-BY-3.0 # Original Windows game by locomalito # https://locomalito.com/abbaye_des_morts.php URL: https://github.com/nevat/abbayedesmorts-gpl @@ -37,6 +36,9 @@ Also, the gameplay is directly inspired by Manic Miner and Jet Set Willy. %prep %autosetup +# Enable verbose build +sed -i 's/@$(CC)/$(CC)/' Makefile + %build %set_build_flags @@ -73,6 +75,9 @@ appstream-util validate-relax --nonet %{buildroot}%{_datadir}/appdata/abbaye.app %changelog +* Tue Sep 24 2024 Andrea Musuruane - 2.0.4-1 +- Updated to new upstream release + * Wed Aug 28 2024 Miroslav Suchý - 2.0.2-5 - convert license to SPDX diff --git a/sources b/sources index 4253092..64c561d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (abbayedesmorts-gpl-2.0.2.tar.gz) = 07947c4e4a58e1e039a48df5a03c6ccf6af917bec92bba8a45b74dc03552644e6625abf603f77213804c4438138ee691bea665de6c3aed6a6b79199b49d46245 +SHA512 (abbayedesmorts-gpl-2.0.4.tar.gz) = 46e2384c2f176dd54c3056d2e8a7ea1ea40da918bc1598414c68a2449f198e49c3dba30dc8c3c771f8d37e7a6eaa38caccbc2275d1712b7a8e5332ca400c5562 From e1038e6bcc1a4b39fb25371eb70db371064c1663 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 16 Jan 2025 10:26:54 +0000 Subject: [PATCH 06/10] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild --- abbayedesmorts-gpl.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/abbayedesmorts-gpl.spec b/abbayedesmorts-gpl.spec index 234078f..604f69e 100644 --- a/abbayedesmorts-gpl.spec +++ b/abbayedesmorts-gpl.spec @@ -1,6 +1,6 @@ Name: abbayedesmorts-gpl Version: 2.0.4 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Platform game set in 13th century # Graphics and Sounds are licensed under @@ -75,6 +75,9 @@ appstream-util validate-relax --nonet %{buildroot}%{_datadir}/appdata/abbaye.app %changelog +* Thu Jan 16 2025 Fedora Release Engineering - 2.0.4-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + * Tue Sep 24 2024 Andrea Musuruane - 2.0.4-1 - Updated to new upstream release From 87a6f5c3ef6d8170e7a7d97ca73bfbde1de28f38 Mon Sep 17 00:00:00 2001 From: Andrea Musuruane Date: Thu, 23 Jan 2025 16:00:21 +0100 Subject: [PATCH 07/10] Fix FTBFS (BZ #2339459) --- abbayedesmorts-gpl-2.0.4-gcc15.patch | 11 +++++++++++ abbayedesmorts-gpl.spec | 9 +++++++-- 2 files changed, 18 insertions(+), 2 deletions(-) create mode 100644 abbayedesmorts-gpl-2.0.4-gcc15.patch diff --git a/abbayedesmorts-gpl-2.0.4-gcc15.patch b/abbayedesmorts-gpl-2.0.4-gcc15.patch new file mode 100644 index 0000000..a459c4c --- /dev/null +++ b/abbayedesmorts-gpl-2.0.4-gcc15.patch @@ -0,0 +1,11 @@ +diff -dur abbayedesmorts-gpl-2.0.4.orig/src/base.h abbayedesmorts-gpl-2.0.4/src/base.h +--- abbayedesmorts-gpl-2.0.4.orig/src/base.h 2024-09-23 23:18:05.000000000 +0200 ++++ abbayedesmorts-gpl-2.0.4/src/base.h 2025-01-23 15:38:35.248988706 +0100 +@@ -5,6 +5,7 @@ + #include + #include + #include ++#include + + #include + #include diff --git a/abbayedesmorts-gpl.spec b/abbayedesmorts-gpl.spec index 604f69e..a3254ca 100644 --- a/abbayedesmorts-gpl.spec +++ b/abbayedesmorts-gpl.spec @@ -1,6 +1,6 @@ Name: abbayedesmorts-gpl Version: 2.0.4 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Platform game set in 13th century # Graphics and Sounds are licensed under @@ -10,6 +10,8 @@ License: GPL-3.0-only AND CC-BY-3.0 # https://locomalito.com/abbaye_des_morts.php URL: https://github.com/nevat/abbayedesmorts-gpl Source0: https://github.com/nevat/abbayedesmorts-gpl/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz +# Fix building with gcc 15 +Patch0: %{name}-2.0.4-gcc15.patch BuildRequires: gcc BuildRequires: make @@ -34,7 +36,7 @@ Also, the gameplay is directly inspired by Manic Miner and Jet Set Willy. %prep -%autosetup +%autosetup -p1 # Enable verbose build sed -i 's/@$(CC)/$(CC)/' Makefile @@ -75,6 +77,9 @@ appstream-util validate-relax --nonet %{buildroot}%{_datadir}/appdata/abbaye.app %changelog +* Thu Jan 23 2025 Andrea Musuruane - 2.0.4-3 +- Fix FTBFS (BZ #2339459) + * Thu Jan 16 2025 Fedora Release Engineering - 2.0.4-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild From f292f1df54ddb3cd45be26010b38a1dd99884f5b Mon Sep 17 00:00:00 2001 From: Andrea Musuruane Date: Fri, 27 Jun 2025 12:08:55 +0200 Subject: [PATCH 08/10] Updated to new upstream release --- .gitignore | 1 + abbayedesmorts-gpl.spec | 9 +++++---- sources | 2 +- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index b3d413d..d17e7c9 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ /abbayedesmorts-gpl-2.0.1-3d12ed6.tar.gz /abbayedesmorts-gpl-2.0.2.tar.gz /abbayedesmorts-gpl-2.0.4.tar.gz +/abbayedesmorts-gpl-2.0.5.tar.gz diff --git a/abbayedesmorts-gpl.spec b/abbayedesmorts-gpl.spec index a3254ca..1f1fc28 100644 --- a/abbayedesmorts-gpl.spec +++ b/abbayedesmorts-gpl.spec @@ -1,6 +1,6 @@ Name: abbayedesmorts-gpl -Version: 2.0.4 -Release: 3%{?dist} +Version: 2.0.5 +Release: 1%{?dist} Summary: Platform game set in 13th century # Graphics and Sounds are licensed under @@ -10,8 +10,6 @@ License: GPL-3.0-only AND CC-BY-3.0 # https://locomalito.com/abbaye_des_morts.php URL: https://github.com/nevat/abbayedesmorts-gpl Source0: https://github.com/nevat/abbayedesmorts-gpl/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz -# Fix building with gcc 15 -Patch0: %{name}-2.0.4-gcc15.patch BuildRequires: gcc BuildRequires: make @@ -77,6 +75,9 @@ appstream-util validate-relax --nonet %{buildroot}%{_datadir}/appdata/abbaye.app %changelog +* Fri Jun 27 2025 Andrea Musuruane - 2.0.5-1 +- Updated to new upstream release + * Thu Jan 23 2025 Andrea Musuruane - 2.0.4-3 - Fix FTBFS (BZ #2339459) diff --git a/sources b/sources index 64c561d..627ab94 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (abbayedesmorts-gpl-2.0.4.tar.gz) = 46e2384c2f176dd54c3056d2e8a7ea1ea40da918bc1598414c68a2449f198e49c3dba30dc8c3c771f8d37e7a6eaa38caccbc2275d1712b7a8e5332ca400c5562 +SHA512 (abbayedesmorts-gpl-2.0.5.tar.gz) = 49264ab4e9299323bf7a49c6bc44874c7945014d4a771b0a9bb2981fd52fc5edee8fe23dccf54984af66f72dc458485b0319c13f18b82346e8a58a9193d2aac1 From e43b1c337689484ff8909b260aa1c38e97e5c07b Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 23 Jul 2025 16:41:28 +0000 Subject: [PATCH 09/10] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild --- abbayedesmorts-gpl.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/abbayedesmorts-gpl.spec b/abbayedesmorts-gpl.spec index 1f1fc28..8159f0a 100644 --- a/abbayedesmorts-gpl.spec +++ b/abbayedesmorts-gpl.spec @@ -1,6 +1,6 @@ Name: abbayedesmorts-gpl Version: 2.0.5 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Platform game set in 13th century # Graphics and Sounds are licensed under @@ -75,6 +75,9 @@ appstream-util validate-relax --nonet %{buildroot}%{_datadir}/appdata/abbaye.app %changelog +* Wed Jul 23 2025 Fedora Release Engineering - 2.0.5-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild + * Fri Jun 27 2025 Andrea Musuruane - 2.0.5-1 - Updated to new upstream release From 3da7390a67f1caae7a2f0292e8a0e0486a13954d Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 16 Jan 2026 03:22:47 +0000 Subject: [PATCH 10/10] Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild --- abbayedesmorts-gpl.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/abbayedesmorts-gpl.spec b/abbayedesmorts-gpl.spec index 8159f0a..4034eb1 100644 --- a/abbayedesmorts-gpl.spec +++ b/abbayedesmorts-gpl.spec @@ -1,6 +1,6 @@ Name: abbayedesmorts-gpl Version: 2.0.5 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Platform game set in 13th century # Graphics and Sounds are licensed under @@ -75,6 +75,9 @@ appstream-util validate-relax --nonet %{buildroot}%{_datadir}/appdata/abbaye.app %changelog +* Fri Jan 16 2026 Fedora Release Engineering - 2.0.5-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild + * Wed Jul 23 2025 Fedora Release Engineering - 2.0.5-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild