.gitignore

@@ -1,3 +1,2 @@
 wordwarvi-0.25.tar.gz
 /wordwarvi-1.1-6beed31.tar.gz
-/wordwarvi-1.0.4.tar.gz

sources

@@ -1 +1 @@
-SHA512 (wordwarvi-1.0.4.tar.gz) = 3bbb17f8c93aa0250ff25d0851c550872353fb0925a3495c8b073409094b4e8bbbb9c335c4ddd360588d29e27906624e3dfc61a5335dcfe6ca1fd5dfd6d26bca
+d7b1e62c72302d93d5f36b50500d9d31  wordwarvi-1.1-6beed31.tar.gz

wordwarvi.rpmlintrc

@@ -1,4 +0,0 @@
-addFilter("E: spelling-error")
-addFilter("E: incorrect-fsf-address")
-addFilter("W: no-%check-section")
-addFilter("W: invalid-license")

wordwarvi.spec

@@ -1,24 +1,20 @@
-%global forgeurl https://github.com/smcameron/wordwarvi/
+%global commit 6beed311c2ecb3f9662f35ecc06948bd89ed9455
+%global shortcommit %(c=%{commit}; echo ${c:0:7})
 
 Name:           wordwarvi
-Version:        1.0.4
-Release:        3%{?dist}
-# Accidentally used 1.1 for 1.0.1
-Epoch:          1
-%forgemeta
+Version:        1.1
+Release:        19.git%{shortcommit}%{?dist}
 Summary:        Side-scrolling shoot 'em up '80s style arcade game
-# Code is GPL-2.0-or-later except 'ogg_to_pcm.c' / 'ogg_to_pcm.h' which are
-# GPL-2.0-only (from vorbis-tools 'oggdec.c'); effective code license is
-# GPL-2.0-only. Some sounds are CC-BY-3.0, rest are CC-BY-SA-3.0.
-License:        GPL-2.0-only AND CC-BY-3.0 AND CC-BY-SA-3.0
+License:        GPLv2+ and CC-BY and CC-BY-SA
 URL:            https://smcameron.github.io/wordwarvi/
-Source0:        %{forgesource}
+# The 1.1 release never got a tag in git, so we use the commit-id
+Source0:        https://github.com/smcameron/wordwarvi/archive/%{commit}/%{name}-%{version}-%{shortcommit}.tar.gz
 Source1:        %{name}.desktop
 Source2:        %{name}.png
 Source3:        %{name}.appdata.xml
-Patch1:         Port-to-GTK-3.patch
-BuildRequires:  make gcc
-BuildRequires:  gtk3-devel portaudio-devel libvorbis-devel
+BuildRequires: make
+BuildRequires:  gcc
+BuildRequires:  gtk2-devel portaudio-devel libvorbis-devel
 BuildRequires:  desktop-file-utils libappstream-glib
 Requires:       hicolor-icon-theme
 
@@ -35,15 +31,15 @@ vi, mmm-kay?
 
 
 %prep
-%autosetup -p1
+%setup -qn %{name}-%{commit}
 
 
 %build
-%make_build PREFIX=%{_prefix}
+make %{?_smp_mflags} PREFIX=%{_prefix} CFLAGS="$RPM_OPT_FLAGS"
 
 
 %install
-%make_install PREFIX=%{_prefix} BINDIR=%{_bindir}
+make install PREFIX=%{_prefix} DESTDIR=$RPM_BUILD_ROOT
 
 # below is the desktop file and icon stuff.
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications
@@ -56,10 +52,8 @@ install -p -m 644 %{SOURCE3} $RPM_BUILD_ROOT%{_datadir}/appdata
 appstream-util validate-relax --nonet \
   $RPM_BUILD_ROOT%{_datadir}/appdata/%{name}.appdata.xml
 
-
 %files
-%doc AUTHORS README changelog.txt sounds/Attribution.txt
-%license COPYING
+%doc AUTHORS COPYING README changelog.txt sounds/Attribution.txt
 %{_bindir}/%{name}
 %{_datadir}/%{name}
 %{_mandir}/man6/%{name}.6*
@@ -69,33 +63,6 @@ appstream-util validate-relax --nonet \
 
 
 %changelog
-* Fri Jul 17 2026 Fedora Release Engineering <releng@fedoraproject.org> - 1:1.0.4-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild
-
-* Tue Jul 14 2026 Michal Schorm <mschorm@redhat.com> - 1:1.0.4-2
-- Fix SPDX license expression: 'GPL-2.0-only AND CC-BY-3.0 AND CC-BY-SA-3.0'
-- 'ogg_to_pcm.c' is GPL-2.0-only (from vorbis-tools), not GPL-2.0-or-later
-
-* Tue May 12 2026 Hans de Goede <johannes.goede@oss.qualcomm.com> - 1:1.0.4-1
-- Update to 1.0.4 release
-- Add Epoch because the 1.1 release from git was 1.0.1
-- Add Debian patch to port to GTK3
-
-* Sat Jan 17 2026 Fedora Release Engineering <releng@fedoraproject.org> - 1.1-24.git6beed31
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild
-
-* Fri Jul 25 2025 Fedora Release Engineering <releng@fedoraproject.org> - 1.1-23.git6beed31
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild
-
-* Sun Jan 19 2025 Fedora Release Engineering <releng@fedoraproject.org> - 1.1-22.git6beed31
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild
-
-* Wed Sep 04 2024 Miroslav Suchý <msuchy@redhat.com> - 1.1-21.git6beed31
-- convert license to SPDX
-
-* Sat Jul 20 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1.1-20.git6beed31
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
-
 * Sat Jan 27 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1.1-19.git6beed31
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild