From 35204cf2e631c6e45ccdeafb621d8031f3cebced Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 19 Jan 2024 12:56:10 +0000 Subject: [PATCH 1/8] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- angband.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/angband.spec b/angband.spec index 345b640..f458509 100644 --- a/angband.spec +++ b/angband.spec @@ -1,6 +1,6 @@ Name: angband Version: 4.2.5 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Popular roguelike role playing game License: GPLv2 @@ -134,6 +134,9 @@ install -p -m 644 src/angband.man $RPM_BUILD_ROOT%{_mandir}/man6/angband.6 %changelog +* Fri Jan 19 2024 Fedora Release Engineering - 4.2.5-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Thu Sep 7 2023 Diego Herrera 4.2.5-1 - Updated version to 4.2.5 - Upstreamed assets From cdaefe3cbe73bb9709b1033f86256b55f33e422c Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Mon, 22 Jan 2024 23:02:41 +0000 Subject: [PATCH 2/8] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- angband.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/angband.spec b/angband.spec index f458509..1e650f5 100644 --- a/angband.spec +++ b/angband.spec @@ -1,6 +1,6 @@ Name: angband Version: 4.2.5 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Popular roguelike role playing game License: GPLv2 @@ -134,6 +134,9 @@ install -p -m 644 src/angband.man $RPM_BUILD_ROOT%{_mandir}/man6/angband.6 %changelog +* Mon Jan 22 2024 Fedora Release Engineering - 4.2.5-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Fri Jan 19 2024 Fedora Release Engineering - 4.2.5-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From 7bc3916f8f7b537bbd59cb1e70a08fb1b5b60669 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 17 Jul 2024 16:59:24 +0000 Subject: [PATCH 3/8] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild --- angband.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/angband.spec b/angband.spec index 1e650f5..d30f346 100644 --- a/angband.spec +++ b/angband.spec @@ -1,6 +1,6 @@ Name: angband Version: 4.2.5 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Popular roguelike role playing game License: GPLv2 @@ -134,6 +134,9 @@ install -p -m 644 src/angband.man $RPM_BUILD_ROOT%{_mandir}/man6/angband.6 %changelog +* Wed Jul 17 2024 Fedora Release Engineering - 4.2.5-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + * Mon Jan 22 2024 Fedora Release Engineering - 4.2.5-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From 3b9fe5494c1d2748832e6e5b7f98ddfc263b964e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20Such=C3=BD?= Date: Wed, 28 Aug 2024 07:52:55 +0200 Subject: [PATCH 4/8] convert license to SPDX This is part of https://fedoraproject.org/wiki/Changes/SPDX_Licenses_Phase_4 --- angband.spec | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/angband.spec b/angband.spec index d30f346..25bbd95 100644 --- a/angband.spec +++ b/angband.spec @@ -1,9 +1,10 @@ Name: angband Version: 4.2.5 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Popular roguelike role playing game -License: GPLv2 +# Automatically converted from old format: GPLv2 - review is highly recommended. +License: GPL-2.0-only URL: https://rephial.org/ Source0: angband-%{version}-norestricted.tar.gz # angband contains assets and code that don't comply to Fedora's @@ -46,7 +47,8 @@ Morgoth - "The Dark Enemy". %package data Summary: Angband data files -License: GPLv2 and CC-BY +# Automatically converted from old format: GPLv2 and CC-BY - review is highly recommended. +License: GPL-2.0-only AND LicenseRef-Callaway-CC-BY BuildArch: noarch %description data @@ -134,6 +136,9 @@ install -p -m 644 src/angband.man $RPM_BUILD_ROOT%{_mandir}/man6/angband.6 %changelog +* Wed Aug 28 2024 Miroslav Suchý - 4.2.5-5 +- convert license to SPDX + * Wed Jul 17 2024 Fedora Release Engineering - 4.2.5-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild From 349ccac290c028f495a669c63a6a92182e5a36bd Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 16 Jan 2025 11:02:18 +0000 Subject: [PATCH 5/8] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild --- angband.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/angband.spec b/angband.spec index 25bbd95..8f0bbdc 100644 --- a/angband.spec +++ b/angband.spec @@ -1,6 +1,6 @@ Name: angband Version: 4.2.5 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Popular roguelike role playing game # Automatically converted from old format: GPLv2 - review is highly recommended. @@ -136,6 +136,9 @@ install -p -m 644 src/angband.man $RPM_BUILD_ROOT%{_mandir}/man6/angband.6 %changelog +* Thu Jan 16 2025 Fedora Release Engineering - 4.2.5-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + * Wed Aug 28 2024 Miroslav Suchý - 4.2.5-5 - convert license to SPDX From 4045b7f7e9d7cae6c068fc7178ad83ecb9771cbd Mon Sep 17 00:00:00 2001 From: Diego Herrera Date: Mon, 27 Jan 2025 16:12:07 -0300 Subject: [PATCH 6/8] Fix missing dependency and add gnome warning --- .gitignore | 2 ++ angband-4.2.5-1-desktop_fix.patch | 2 +- angband-sdl | 23 +++++++++++++++++++++++ angband.spec | 12 +++++++++++- 4 files changed, 37 insertions(+), 2 deletions(-) create mode 100644 angband-sdl diff --git a/.gitignore b/.gitignore index 920273b..7c2ba45 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,5 @@ +results_* +*.rpm /angband-4.2.3-norestricted.tar.gz /angband-4.2.4-norestricted.tar.gz /angband-4.2.5-norestricted.tar.gz diff --git a/angband-4.2.5-1-desktop_fix.patch b/angband-4.2.5-1-desktop_fix.patch index d576e20..1491e2a 100644 --- a/angband-4.2.5-1-desktop_fix.patch +++ b/angband-4.2.5-1-desktop_fix.patch @@ -6,7 +6,7 @@ diff -ruN angband-4.2.5-orig/lib/icons/angband-sdl2.desktop angband-4.2.5/lib/ic Type=Application Comment=A roguelike dungeon exploration game based on the books of J.R.R.Tolkien -Exec=sh -c "if [ \\$XDG_SESSION_TYPE == \"wayland\" ]; then env SDL_VIDEODRIVER=wayland angband -msdl2; else angband -msdl2; fi" -+Exec=angband -msdl2 ++Exec=angband-sdl TryExec=angband Icon=angband Categories=Game;RolePlaying; diff --git a/angband-sdl b/angband-sdl new file mode 100644 index 0000000..e1e6196 --- /dev/null +++ b/angband-sdl @@ -0,0 +1,23 @@ +#!/usr/bin/bash + +RUN_SDL=1 + +MESSAGE="\ +Angband (SDL) doesn't work on Gnome Desktop because GTK+ refuses to initialize on excecutables that require the setgid feature.\n\n\ +Run Angband (X11) instead?" + + +if [[ "$DESKTOP_SESSION" == "gnome" ]]; then + zenity \ + --title="Warning" \ + --icon="dialog-warning" \ + --question \ + --text "$MESSAGE" + RUN_SDL=$? +fi + +if [[ "$RUN_SDL" == "0" ]]; then + angband -mx11 +else + angband -msdl2 +fi \ No newline at end of file diff --git a/angband.spec b/angband.spec index 8f0bbdc..f6ec1c6 100644 --- a/angband.spec +++ b/angband.spec @@ -1,6 +1,6 @@ Name: angband Version: 4.2.5 -Release: 6%{?dist} +Release: 7%{?dist} Summary: Popular roguelike role playing game # Automatically converted from old format: GPLv2 - review is highly recommended. @@ -16,6 +16,8 @@ Source1: generate-tarball.sh # The fix-restricted.patch file is used by generate-tarball.sh to fix # the source to work without the restricted assets. Source2: fix-restricted.patch +# Add warning when running on gnome desktop +Source3: angband-sdl # Specific Fedora restriction on chown usage during install process Patch0: angband-4.2.4-1-chown_fix.patch @@ -37,6 +39,8 @@ BuildRequires: python3-docutils Requires: hicolor-icon-theme Requires: freetype >= 2.11.0-3 +Requires: xorg-x11-fonts-misc +Requires: zenity Requires: %{name}-data = %{version}-%{release} %description @@ -102,11 +106,13 @@ appstream-util validate-relax --nonet \ mkdir -p $RPM_BUILD_ROOT%{_mandir}/man6/ install -p -m 644 src/angband.man $RPM_BUILD_ROOT%{_mandir}/man6/angband.6 +install -p -m 755 %{SOURCE3} $RPM_BUILD_ROOT%{_bindir}/angband-sdl %files %license docs/copying.rst %attr(2755,root,games) %{_bindir}/%{name} +%{_bindir}/angband-sdl %{_datadir}/applications/*.desktop %{_metainfodir}/angband.metainfo.xml %dir %{_sysconfdir}/angband @@ -136,6 +142,10 @@ install -p -m 644 src/angband.man $RPM_BUILD_ROOT%{_mandir}/man6/angband.6 %changelog +* Mon Jan 27 2025 Diego Herrera 4.2.5-7 +- Require xorg-x11-fonts-misc +- Add extra warning when running Angband (SDL) on Gnome + * Thu Jan 16 2025 Fedora Release Engineering - 4.2.5-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild From 909343b5c13fe40dbe39045ef21092d02b289330 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 23 Jul 2025 16:58:53 +0000 Subject: [PATCH 7/8] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild --- angband.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/angband.spec b/angband.spec index f6ec1c6..b8472ff 100644 --- a/angband.spec +++ b/angband.spec @@ -1,6 +1,6 @@ Name: angband Version: 4.2.5 -Release: 7%{?dist} +Release: 8%{?dist} Summary: Popular roguelike role playing game # Automatically converted from old format: GPLv2 - review is highly recommended. @@ -142,6 +142,9 @@ install -p -m 755 %{SOURCE3} $RPM_BUILD_ROOT%{_bindir}/angband-sdl %changelog +* Wed Jul 23 2025 Fedora Release Engineering - 4.2.5-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild + * Mon Jan 27 2025 Diego Herrera 4.2.5-7 - Require xorg-x11-fonts-misc - Add extra warning when running Angband (SDL) on Gnome From 7155982235756e9d32f3a92393c88e13b165cd15 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 16 Jan 2026 03:40:27 +0000 Subject: [PATCH 8/8] Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild --- angband.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/angband.spec b/angband.spec index b8472ff..e88ff10 100644 --- a/angband.spec +++ b/angband.spec @@ -1,6 +1,6 @@ Name: angband Version: 4.2.5 -Release: 8%{?dist} +Release: 9%{?dist} Summary: Popular roguelike role playing game # Automatically converted from old format: GPLv2 - review is highly recommended. @@ -142,6 +142,9 @@ install -p -m 755 %{SOURCE3} $RPM_BUILD_ROOT%{_bindir}/angband-sdl %changelog +* Fri Jan 16 2026 Fedora Release Engineering - 4.2.5-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild + * Wed Jul 23 2025 Fedora Release Engineering - 4.2.5-8 - Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild