diff --git a/.gitignore b/.gitignore index 7c2ba45..920273b 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,3 @@ -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 1491e2a..d576e20 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-sdl ++Exec=angband -msdl2 TryExec=angband Icon=angband Categories=Game;RolePlaying; diff --git a/angband-sdl b/angband-sdl deleted file mode 100644 index e1e6196..0000000 --- a/angband-sdl +++ /dev/null @@ -1,23 +0,0 @@ -#!/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 e88ff10..345b640 100644 --- a/angband.spec +++ b/angband.spec @@ -1,10 +1,9 @@ Name: angband Version: 4.2.5 -Release: 9%{?dist} +Release: 1%{?dist} Summary: Popular roguelike role playing game -# Automatically converted from old format: GPLv2 - review is highly recommended. -License: GPL-2.0-only +License: GPLv2 URL: https://rephial.org/ Source0: angband-%{version}-norestricted.tar.gz # angband contains assets and code that don't comply to Fedora's @@ -16,8 +15,6 @@ 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 @@ -39,8 +36,6 @@ 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 @@ -51,8 +46,7 @@ Morgoth - "The Dark Enemy". %package data Summary: Angband data files -# Automatically converted from old format: GPLv2 and CC-BY - review is highly recommended. -License: GPL-2.0-only AND LicenseRef-Callaway-CC-BY +License: GPLv2 and CC-BY BuildArch: noarch %description data @@ -106,13 +100,11 @@ 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 @@ -142,31 +134,6 @@ 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 - -* 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 - -* 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 - -* 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 - * Thu Sep 7 2023 Diego Herrera 4.2.5-1 - Updated version to 4.2.5 - Upstreamed assets