diff --git a/.gitignore b/.gitignore index 1934383..d17e7c9 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,5 @@ /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 +/abbayedesmorts-gpl-2.0.5.tar.gz 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 6523798..4034eb1 100644 --- a/abbayedesmorts-gpl.spec +++ b/abbayedesmorts-gpl.spec @@ -1,18 +1,15 @@ -%global commit 3d12ed6361ef17db536b3004a1a61921e5aadfd4 -%global shortcommit %(c=%{commit}; echo ${c:0:7}) - Name: abbayedesmorts-gpl -Version: 2.0.1 -Release: 16.20210509git%{?dist} +Version: 2.0.5 +Release: 3%{?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 +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 -Source0: https://github.com/nevat/abbayedesmorts-gpl/archive/%{commit}/%{name}-%{version}-%{shortcommit}.tar.gz +Source0: https://github.com/nevat/abbayedesmorts-gpl/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz BuildRequires: gcc BuildRequires: make @@ -21,6 +18,7 @@ BuildRequires: SDL2_mixer-devel BuildRequires: SDL2_image-devel BuildRequires: libappstream-glib BuildRequires: desktop-file-utils +Requires: hicolor-icon-theme %description In the 13th century, the Cathars, who preach about good Christian beliefs, @@ -36,7 +34,10 @@ Also, the gameplay is directly inspired by Manic Miner and Jet Set Willy. %prep -%autosetup -n %{name}-%{commit} +%autosetup -p1 + +# Enable verbose build +sed -i 's/@$(CC)/$(CC)/' Makefile %build @@ -47,6 +48,15 @@ Also, the gameplay is directly inspired by Manic Miner and Jet Set Willy. %install %make_install +# Install icons +rm %{buildroot}%{_datadir}/pixmaps/abbaye.png +cp -a abbaye.png abbaye48.png +for px in 48 64 128; do + install -d %{buildroot}%{_datadir}/icons/hicolor/${px}x${px}/apps + install -p -m 644 abbaye${px}.png \ + %{buildroot}%{_datadir}/icons/hicolor/${px}x${px}/apps/abbaye.png +done + # Validate desktop file desktop-file-validate %{buildroot}%{_datadir}/applications/abbaye.desktop @@ -59,12 +69,57 @@ appstream-util validate-relax --nonet %{buildroot}%{_datadir}/appdata/abbaye.app %{_datadir}/abbayev2 %{_datadir}/appdata/abbaye.appdata.xml %{_datadir}/applications/abbaye.desktop -%{_datadir}/pixmaps/abbaye.png +%{_datadir}/icons/hicolor/*/apps/abbaye.png %doc ReadMe.md ChangeLog.md screenshots %license COPYING %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 + +* 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) + +* 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 + +* 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 + +* 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 + +* Tue Oct 24 2023 Andrea Musuruane - 2.0.2-1 +- Updated to new upstream release + +* Wed Jul 19 2023 Fedora Release Engineering - 2.0.1-20.20210509git +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + +* Wed Jan 18 2023 Fedora Release Engineering - 2.0.1-19.20210509git +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + +* Wed Jul 20 2022 Fedora Release Engineering - 2.0.1-18.20210509git +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + +* Wed Jan 19 2022 Fedora Release Engineering - 2.0.1-17.20210509git +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + * Wed Sep 29 2021 Andrea Musuruane - 2.0.1-16.20210509git - Updated to new upstream post-release diff --git a/sources b/sources index 88eac0a..627ab94 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (abbayedesmorts-gpl-2.0.1-3d12ed6.tar.gz) = eee8da9ef86fa42322807f7cdbb6348c7a8535a5f84e14115f4a6a5095d2fcb2a081e5266c7339647f8c4d4df03cf4348fc14b842763b8668c821806f9de1de3 +SHA512 (abbayedesmorts-gpl-2.0.5.tar.gz) = 49264ab4e9299323bf7a49c6bc44874c7945014d4a771b0a9bb2981fd52fc5edee8fe23dccf54984af66f72dc458485b0319c13f18b82346e8a58a9193d2aac1