From af41e48a7777edb6f07dbce42b1aa54719aaa529 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 24 Jul 2019 17:25:22 +0000 Subject: [PATCH 01/24] - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- abbayedesmorts-gpl.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/abbayedesmorts-gpl.spec b/abbayedesmorts-gpl.spec index 661b028..965e194 100644 --- a/abbayedesmorts-gpl.spec +++ b/abbayedesmorts-gpl.spec @@ -3,7 +3,7 @@ Name: abbayedesmorts-gpl Version: 2.0.1 -Release: 9.20170709git%{?dist} +Release: 10.20170709git%{?dist} Summary: Platform game set in 13th century # Graphics and Sounds are licensed under @@ -69,6 +69,9 @@ appstream-util validate-relax --nonet %{buildroot}%{_datadir}/metainfo/abbaye.ap %changelog +* 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 From 9f87a40007247fddfb7dee25ea187eed8f5ef660 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Tue, 28 Jan 2020 11:05:30 +0000 Subject: [PATCH 02/24] - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- abbayedesmorts-gpl.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/abbayedesmorts-gpl.spec b/abbayedesmorts-gpl.spec index 965e194..ea335d8 100644 --- a/abbayedesmorts-gpl.spec +++ b/abbayedesmorts-gpl.spec @@ -3,7 +3,7 @@ Name: abbayedesmorts-gpl Version: 2.0.1 -Release: 10.20170709git%{?dist} +Release: 11.20170709git%{?dist} Summary: Platform game set in 13th century # Graphics and Sounds are licensed under @@ -69,6 +69,9 @@ appstream-util validate-relax --nonet %{buildroot}%{_datadir}/metainfo/abbaye.ap %changelog +* 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 From 3e24642f497f5965f8ba0d910c97b9b18683caee Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Mon, 27 Jul 2020 11:38:35 +0000 Subject: [PATCH 03/24] - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- abbayedesmorts-gpl.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/abbayedesmorts-gpl.spec b/abbayedesmorts-gpl.spec index ea335d8..9a563ea 100644 --- a/abbayedesmorts-gpl.spec +++ b/abbayedesmorts-gpl.spec @@ -3,7 +3,7 @@ Name: abbayedesmorts-gpl Version: 2.0.1 -Release: 11.20170709git%{?dist} +Release: 12.20170709git%{?dist} Summary: Platform game set in 13th century # Graphics and Sounds are licensed under @@ -69,6 +69,9 @@ appstream-util validate-relax --nonet %{buildroot}%{_datadir}/metainfo/abbaye.ap %changelog +* 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 From 5121a2f12f48afc99599db2a4f699fdbbaf44e5c Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 31 Jul 2020 23:46:22 +0000 Subject: [PATCH 04/24] - Second attempt - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- abbayedesmorts-gpl.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/abbayedesmorts-gpl.spec b/abbayedesmorts-gpl.spec index 9a563ea..502e6c3 100644 --- a/abbayedesmorts-gpl.spec +++ b/abbayedesmorts-gpl.spec @@ -3,7 +3,7 @@ Name: abbayedesmorts-gpl Version: 2.0.1 -Release: 12.20170709git%{?dist} +Release: 13.20170709git%{?dist} Summary: Platform game set in 13th century # Graphics and Sounds are licensed under @@ -69,6 +69,10 @@ appstream-util validate-relax --nonet %{buildroot}%{_datadir}/metainfo/abbaye.ap %changelog +* 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 From 76bdb293d1297071ce33369c21848ca45c87113d Mon Sep 17 00:00:00 2001 From: Tom Stellard Date: Tue, 15 Dec 2020 01:38:43 +0000 Subject: [PATCH 05/24] Add BuildRequires: make https://fedoraproject.org/wiki/Changes/Remove_make_from_BuildRoot --- abbayedesmorts-gpl.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/abbayedesmorts-gpl.spec b/abbayedesmorts-gpl.spec index 502e6c3..49334e2 100644 --- a/abbayedesmorts-gpl.spec +++ b/abbayedesmorts-gpl.spec @@ -22,6 +22,7 @@ BuildRequires: SDL2_mixer-devel BuildRequires: SDL2_image-devel BuildRequires: libappstream-glib BuildRequires: desktop-file-utils +BuildRequires: make %description In the 13th century, the Cathars, who preach about good Christian beliefs, From 8073c2c2f9f3db0ced88ce9babae67b0f855ba7b Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Mon, 25 Jan 2021 23:42:34 +0000 Subject: [PATCH 06/24] - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- abbayedesmorts-gpl.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/abbayedesmorts-gpl.spec b/abbayedesmorts-gpl.spec index 49334e2..e79e57f 100644 --- a/abbayedesmorts-gpl.spec +++ b/abbayedesmorts-gpl.spec @@ -3,7 +3,7 @@ Name: abbayedesmorts-gpl Version: 2.0.1 -Release: 13.20170709git%{?dist} +Release: 14.20170709git%{?dist} Summary: Platform game set in 13th century # Graphics and Sounds are licensed under @@ -70,6 +70,9 @@ appstream-util validate-relax --nonet %{buildroot}%{_datadir}/metainfo/abbaye.ap %changelog +* 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 From 8be31d9236efa09dff04037d2f5a21019b3cea68 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 21 Jul 2021 12:14:25 +0000 Subject: [PATCH 07/24] - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild Signed-off-by: Fedora Release Engineering From 214ecf50c5194d6b2d9136eb5aea14770489b20e Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 21 Jul 2021 17:09:29 +0000 Subject: [PATCH 08/24] - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- abbayedesmorts-gpl.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/abbayedesmorts-gpl.spec b/abbayedesmorts-gpl.spec index e79e57f..1fd752c 100644 --- a/abbayedesmorts-gpl.spec +++ b/abbayedesmorts-gpl.spec @@ -3,7 +3,7 @@ Name: abbayedesmorts-gpl Version: 2.0.1 -Release: 14.20170709git%{?dist} +Release: 15.20170709git%{?dist} Summary: Platform game set in 13th century # Graphics and Sounds are licensed under @@ -70,6 +70,9 @@ appstream-util validate-relax --nonet %{buildroot}%{_datadir}/metainfo/abbaye.ap %changelog +* 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 From c80a4cd02a4133dc1691aca55f5190214b8038e8 Mon Sep 17 00:00:00 2001 From: Andrea Musuruane Date: Thu, 30 Sep 2021 14:20:47 +0200 Subject: [PATCH 09/24] Updated to new upstream post-release --- .gitignore | 1 + abbaye.appdata.xml | 34 -------------------------- abbayedesmorts-gpl-2.0.1-ldflags.patch | 20 --------------- abbayedesmorts-gpl.spec | 22 ++++++++--------- sources | 2 +- 5 files changed, 12 insertions(+), 67 deletions(-) delete mode 100644 abbaye.appdata.xml delete mode 100644 abbayedesmorts-gpl-2.0.1-ldflags.patch diff --git a/.gitignore b/.gitignore index 80968b0..1934383 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ /abbayedesmorts-gpl-2.0.1-9ce56f6.tar.gz +/abbayedesmorts-gpl-2.0.1-3d12ed6.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.spec b/abbayedesmorts-gpl.spec index 1fd752c..6523798 100644 --- a/abbayedesmorts-gpl.spec +++ b/abbayedesmorts-gpl.spec @@ -1,9 +1,9 @@ -%global commit 9ce56f69dec5e185058508cb924b1f597a1380e5 +%global commit 3d12ed6361ef17db536b3004a1a61921e5aadfd4 %global shortcommit %(c=%{commit}; echo ${c:0:7}) Name: abbayedesmorts-gpl Version: 2.0.1 -Release: 15.20170709git%{?dist} +Release: 16.20210509git%{?dist} Summary: Platform game set in 13th century # Graphics and Sounds are licensed under @@ -13,16 +13,14 @@ License: GPLv3 and CC-BY # 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 BuildRequires: gcc +BuildRequires: make BuildRequires: SDL2-devel BuildRequires: SDL2_mixer-devel BuildRequires: SDL2_image-devel BuildRequires: libappstream-glib BuildRequires: desktop-file-utils -BuildRequires: make %description In the 13th century, the Cathars, who preach about good Christian beliefs, @@ -42,8 +40,7 @@ Also, the gameplay is directly inspired by Manic Miner and Jet Set Willy. %build -export CFLAGS="%{optflags}" -export LDFLAGS="%{__global_ldflags}" +%set_build_flags %make_build @@ -53,16 +50,14 @@ export LDFLAGS="%{__global_ldflags}" # Validate desktop file desktop-file-validate %{buildroot}%{_datadir}/applications/abbaye.desktop -# Install AppData file -install -d %{buildroot}%{_datadir}/metainfo -install -p -m 644 %{SOURCE1} %{buildroot}%{_datadir}/metainfo -appstream-util validate-relax --nonet %{buildroot}%{_datadir}/metainfo/abbaye.appdata.xml +# Validate AppData file +appstream-util validate-relax --nonet %{buildroot}%{_datadir}/appdata/abbaye.appdata.xml %files %{_bindir}/abbayev2 %{_datadir}/abbayev2 -%{_datadir}/metainfo/abbaye.appdata.xml +%{_datadir}/appdata/abbaye.appdata.xml %{_datadir}/applications/abbaye.desktop %{_datadir}/pixmaps/abbaye.png %doc ReadMe.md ChangeLog.md screenshots @@ -70,6 +65,9 @@ appstream-util validate-relax --nonet %{buildroot}%{_datadir}/metainfo/abbaye.ap %changelog +* 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 diff --git a/sources b/sources index c6638ae..88eac0a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (abbayedesmorts-gpl-2.0.1-9ce56f6.tar.gz) = bfd9c295c3078d61c0cf774a6472c4462ce3e02b85dd0f617e487193278de7cb8a07f24bc4083f918d6142e086b4e8ee63c29d7fcb6eb2015456af5383b2e143 +SHA512 (abbayedesmorts-gpl-2.0.1-3d12ed6.tar.gz) = eee8da9ef86fa42322807f7cdbb6348c7a8535a5f84e14115f4a6a5095d2fcb2a081e5266c7339647f8c4d4df03cf4348fc14b842763b8668c821806f9de1de3 From e0ea31977ced8868a911f563326d7fabebeb19d7 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 19 Jan 2022 20:49:15 +0000 Subject: [PATCH 10/24] - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- abbayedesmorts-gpl.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/abbayedesmorts-gpl.spec b/abbayedesmorts-gpl.spec index 6523798..4c29603 100644 --- a/abbayedesmorts-gpl.spec +++ b/abbayedesmorts-gpl.spec @@ -3,7 +3,7 @@ Name: abbayedesmorts-gpl Version: 2.0.1 -Release: 16.20210509git%{?dist} +Release: 17.20210509git%{?dist} Summary: Platform game set in 13th century # Graphics and Sounds are licensed under @@ -65,6 +65,9 @@ appstream-util validate-relax --nonet %{buildroot}%{_datadir}/appdata/abbaye.app %changelog +* 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 From f9feac8269288d5ddc1ec6a6c57bfc62295df25f Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 20 Jul 2022 20:19:57 +0000 Subject: [PATCH 11/24] Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- abbayedesmorts-gpl.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/abbayedesmorts-gpl.spec b/abbayedesmorts-gpl.spec index 4c29603..60a2583 100644 --- a/abbayedesmorts-gpl.spec +++ b/abbayedesmorts-gpl.spec @@ -3,7 +3,7 @@ Name: abbayedesmorts-gpl Version: 2.0.1 -Release: 17.20210509git%{?dist} +Release: 18.20210509git%{?dist} Summary: Platform game set in 13th century # Graphics and Sounds are licensed under @@ -65,6 +65,9 @@ appstream-util validate-relax --nonet %{buildroot}%{_datadir}/appdata/abbaye.app %changelog +* 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 From f94fd5e099343ac63343089ef1cb1d616617cea6 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 18 Jan 2023 21:17:35 +0000 Subject: [PATCH 12/24] Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- abbayedesmorts-gpl.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/abbayedesmorts-gpl.spec b/abbayedesmorts-gpl.spec index 60a2583..d9444b3 100644 --- a/abbayedesmorts-gpl.spec +++ b/abbayedesmorts-gpl.spec @@ -3,7 +3,7 @@ Name: abbayedesmorts-gpl Version: 2.0.1 -Release: 18.20210509git%{?dist} +Release: 19.20210509git%{?dist} Summary: Platform game set in 13th century # Graphics and Sounds are licensed under @@ -65,6 +65,9 @@ appstream-util validate-relax --nonet %{buildroot}%{_datadir}/appdata/abbaye.app %changelog +* 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 From 980bd89c1f24b684406c15aea0f47b5082603150 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 19 Jul 2023 12:47:27 +0000 Subject: [PATCH 13/24] Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- abbayedesmorts-gpl.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/abbayedesmorts-gpl.spec b/abbayedesmorts-gpl.spec index d9444b3..03217f0 100644 --- a/abbayedesmorts-gpl.spec +++ b/abbayedesmorts-gpl.spec @@ -3,7 +3,7 @@ Name: abbayedesmorts-gpl Version: 2.0.1 -Release: 19.20210509git%{?dist} +Release: 20.20210509git%{?dist} Summary: Platform game set in 13th century # Graphics and Sounds are licensed under @@ -65,6 +65,9 @@ appstream-util validate-relax --nonet %{buildroot}%{_datadir}/appdata/abbaye.app %changelog +* 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 From d8fb9c16a96f213219356f0b5ac0c59c023b91ec Mon Sep 17 00:00:00 2001 From: Andrea Musuruane Date: Tue, 24 Oct 2023 18:33:03 +0200 Subject: [PATCH 14/24] Updated to new upstream release --- .gitignore | 1 + abbayedesmorts-gpl.spec | 26 ++++++++++++++++++-------- sources | 2 +- 3 files changed, 20 insertions(+), 9 deletions(-) diff --git a/.gitignore b/.gitignore index 1934383..316c873 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ /abbayedesmorts-gpl-2.0.1-9ce56f6.tar.gz /abbayedesmorts-gpl-2.0.1-3d12ed6.tar.gz +/abbayedesmorts-gpl-2.0.2.tar.gz diff --git a/abbayedesmorts-gpl.spec b/abbayedesmorts-gpl.spec index 03217f0..7d2dd34 100644 --- a/abbayedesmorts-gpl.spec +++ b/abbayedesmorts-gpl.spec @@ -1,9 +1,6 @@ -%global commit 3d12ed6361ef17db536b3004a1a61921e5aadfd4 -%global shortcommit %(c=%{commit}; echo ${c:0:7}) - Name: abbayedesmorts-gpl -Version: 2.0.1 -Release: 20.20210509git%{?dist} +Version: 2.0.2 +Release: 1%{?dist} Summary: Platform game set in 13th century # Graphics and Sounds are licensed under @@ -12,7 +9,7 @@ License: GPLv3 and CC-BY # 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,7 @@ Also, the gameplay is directly inspired by Manic Miner and Jet Set Willy. %prep -%autosetup -n %{name}-%{commit} +%autosetup %build @@ -47,6 +45,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 +66,15 @@ 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 +* 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 diff --git a/sources b/sources index 88eac0a..4253092 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (abbayedesmorts-gpl-2.0.1-3d12ed6.tar.gz) = eee8da9ef86fa42322807f7cdbb6348c7a8535a5f84e14115f4a6a5095d2fcb2a081e5266c7339647f8c4d4df03cf4348fc14b842763b8668c821806f9de1de3 +SHA512 (abbayedesmorts-gpl-2.0.2.tar.gz) = 07947c4e4a58e1e039a48df5a03c6ccf6af917bec92bba8a45b74dc03552644e6625abf603f77213804c4438138ee691bea665de6c3aed6a6b79199b49d46245 From e51807c54fc72e1c445edc033374fb13a83ebe61 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 19 Jan 2024 11:58:58 +0000 Subject: [PATCH 15/24] 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 16/24] 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 17/24] 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 18/24] 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 19/24] 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 20/24] 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 21/24] 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 22/24] 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 23/24] 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 24/24] 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