diff --git a/.gitignore b/.gitignore index 80968b0..d17e7c9 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +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/abbaye.appdata.xml b/abbaye.appdata.xml deleted file mode 100644 index d31ce4b..0000000 --- a/abbaye.appdata.xml +++ /dev/null @@ -1,34 +0,0 @@ - - - - abbaye.desktop - CC-BY-SA-3.0 - GPL-3.0 and CC-BY-3.0 - Abbaye des Morts - Indie platform game by Locomalito - -

- In the 13th century, the Cathars, who preach about good Christian beliefs, - were being expelled by the Catholic Church out of the Languedoc region in - France. -

-

- One of them, called Jean Raymond, found an old church in which to hide, not - knowing that beneath its ruins lay buried an ancient evil. -

-

- A style close to Spectrum ZX, with its dark background and bright colors, - proper fit with the story, because it does look old and somewhat horrifying. - Also, the gameplay is direclty inspired by Manic Miner and Jet Set Willy. -

- - - - https://raw.githubusercontent.com/nevat/abbayedesmorts-gpl/master/screenshots/title.png - - - https://raw.githubusercontent.com/nevat/abbayedesmorts-gpl/master/screenshots/ingame.png - - - https://github.com/nevat/abbayedesmorts-gpl - diff --git a/abbayedesmorts-gpl-2.0.1-ldflags.patch b/abbayedesmorts-gpl-2.0.1-ldflags.patch deleted file mode 100644 index a9c54c1..0000000 --- a/abbayedesmorts-gpl-2.0.1-ldflags.patch +++ /dev/null @@ -1,20 +0,0 @@ -diff -dur abbayedesmorts-gpl-9ce56f69dec5e185058508cb924b1f597a1380e5.orig/Makefile abbayedesmorts-gpl-9ce56f69dec5e185058508cb924b1f597a1380e5/Makefile ---- abbayedesmorts-gpl-9ce56f69dec5e185058508cb924b1f597a1380e5.orig/Makefile 2017-07-09 02:00:41.000000000 +0200 -+++ abbayedesmorts-gpl-9ce56f69dec5e185058508cb924b1f597a1380e5/Makefile 2017-07-15 18:57:15.055808369 +0200 -@@ -2,6 +2,7 @@ - - CC?= gcc - CFLAGS?= -O2 -finline-functions -funswitch-loops -fgcse-after-reload -fpredictive-commoning -ftree-vectorize -+LDFLAGS?= -Wl,-z,relro - - CFLAGS+= `sdl2-config --cflags` -DDATADIR="\"$(PREFIX)/share/abbayev2\"" - LIBS= `sdl2-config --libs` -lSDL2_image -lSDL2_mixer -lm -@@ -21,7 +22,7 @@ - all: $(PROG) - - $(PROG): $(SRCS) -- $(CC) $(CFLAGS) $(SRCS) -o $(PROG) $(LIBS) -+ $(CC) $(CFLAGS) $(LDFLAGS) $(SRCS) -o $(PROG) $(LIBS) - - clean: - rm -f ./abbayev2 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 05ab2cb..4034eb1 100644 --- a/abbayedesmorts-gpl.spec +++ b/abbayedesmorts-gpl.spec @@ -1,26 +1,24 @@ -%global commit 9ce56f69dec5e185058508cb924b1f597a1380e5 -%global shortcommit %(c=%{commit}; echo ${c:0:7}) - Name: abbayedesmorts-gpl -Version: 2.0.1 -Release: 6.20170709git%{?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 -Source1: abbaye.appdata.xml -Patch0: %{name}-2.0.1-ldflags.patch +Source0: https://github.com/nevat/abbayedesmorts-gpl/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz +BuildRequires: gcc +BuildRequires: make BuildRequires: SDL2-devel 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,25 +34,34 @@ 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 -export CFLAGS="%{optflags}" -export LDFLAGS="%{__global_ldflags}" -make %{?_smp_mflags} +%set_build_flags +%make_build %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 -# Install AppData file -install -d %{buildroot}%{_datadir}/appdata -install -p -m 644 %{SOURCE1} %{buildroot}%{_datadir}/appdata -appstream-util validate-relax --nonet %{buildroot}/%{_datadir}/appdata/abbaye.appdata.xml +# Validate AppData file +appstream-util validate-relax --nonet %{buildroot}%{_datadir}/appdata/abbaye.appdata.xml %files @@ -62,12 +69,90 @@ appstream-util validate-relax --nonet %{buildroot}/%{_datadir}/appdata/abbaye.ap %{_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 + +* Wed Jul 21 2021 Fedora Release Engineering - 2.0.1-15.20170709git +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + +* Mon Jan 25 2021 Fedora Release Engineering - 2.0.1-14.20170709git +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + +* Fri Jul 31 2020 Fedora Release Engineering - 2.0.1-13.20170709git +- Second attempt - Rebuilt for + https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Mon Jul 27 2020 Fedora Release Engineering - 2.0.1-12.20170709git +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Tue Jan 28 2020 Fedora Release Engineering - 2.0.1-11.20170709git +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + +* Wed Jul 24 2019 Fedora Release Engineering - 2.0.1-10.20170709git +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + +* Thu Jan 31 2019 Fedora Release Engineering - 2.0.1-9.20170709git +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + +* Thu Jul 12 2018 Fedora Release Engineering - 2.0.1-8.20170709git +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + +* Wed Feb 21 2018 Andrea Musuruane - 2.0.1-7.20170709git +- Added gcc dependency +- Used new AppData directory +- Spec file clean up + * Wed Feb 07 2018 Fedora Release Engineering - 2.0.1-6.20170709git - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild diff --git a/sources b/sources index c6638ae..627ab94 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (abbayedesmorts-gpl-2.0.1-9ce56f6.tar.gz) = bfd9c295c3078d61c0cf774a6472c4462ce3e02b85dd0f617e487193278de7cb8a07f24bc4083f918d6142e086b4e8ee63c29d7fcb6eb2015456af5383b2e143 +SHA512 (abbayedesmorts-gpl-2.0.5.tar.gz) = 49264ab4e9299323bf7a49c6bc44874c7945014d4a771b0a9bb2981fd52fc5edee8fe23dccf54984af66f72dc458485b0319c13f18b82346e8a58a9193d2aac1