diff --git a/.gitignore b/.gitignore index 7702365..290be64 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1 @@ /tworld-1.3.2-CCLPs.tar.gz -/CCLP[0-9].zip diff --git a/sources b/sources index 51c8523..c983cf4 100644 --- a/sources +++ b/sources @@ -1,3 +1 @@ SHA512 (tworld-1.3.2-CCLPs.tar.gz) = 395b1ddbe9df568243d2e8b78704732dbbe931a5b2ea2af63ebc4e93394c5715e58891a3e1f536f785062cb44ba4540538544b3ed10910d9f30843452a26b803 -SHA512 (CCLP4.zip) = 30c5af1cfaed4d8453e0a84f7b6aacc0754f6e754d61c8e3fa92ad019635784912f363c828ef6eb496c75b8bd06d27b37aa364cb06b7a1a9cd29c9988500e6af -SHA512 (CCLP5.zip) = 1a52f84e938d19af640184e5f0bda3ebc4eae82d78337c78519949e9bb229be52e140575933c64c247db60915797abeb34b4491b4dc43d6fccd5b081c6d3991f diff --git a/tworld.appdata.xml b/tworld.appdata.xml index b51549f..cbdfbd9 100644 --- a/tworld.appdata.xml +++ b/tworld.appdata.xml @@ -2,7 +2,7 @@ tworld.desktop CC-BY-SA-4.0 - GPL-2.0-or-later + GPL-2.0+ Tile World Intellectually engaging puzzle game diff --git a/tworld.spec b/tworld.spec index 6f984a9..fae2406 100644 --- a/tworld.spec +++ b/tworld.spec @@ -2,28 +2,23 @@ Name: tworld %global fullname Tile World Version: 1.3.2 -Release: 28%{?dist} +Release: 19%{?dist} Summary: Intellectually engaging puzzle game -License: GPL-2.0-or-later +License: GPLv2+ URL: http://www.muppetlabs.com/~breadbox/software/tworld/ -Source0: http://www.muppetlabs.com/~breadbox/pub/software/tworld/tworld-%{version}-CCLPs.tar.gz -Source4: https://bitbusters.club/cclp4/CCLP4.zip -Source5: https://bitbusters.club/downloads/CCLP5.zip +Source0: http://www.muppetlabs.com/~breadbox/pub/software/tworld/tworld-%{version}-CCLPs.tar.gz -Source11: tworld-icon-16px.png -Source12: tworld-icon-32px.png -Source13: tworld-icon-48px.png -Source14: tworld.desktop -Source15: tworld.appdata.xml +Source1: tworld-icon-16px.png +Source2: tworld-icon-32px.png +Source3: tworld-icon-48px.png +Source4: tworld.desktop +Source5: tworld.appdata.xml -BuildRequires: desktop-file-utils -BuildRequires: gcc -BuildRequires: libappstream-glib BuildRequires: make -BuildRequires: SDL-devel - -Requires: hicolor-icon-theme +BuildRequires: gcc SDL SDL-devel +BuildRequires: desktop-file-utils libappstream-glib +Requires: filesystem hicolor-icon-theme Requires: %{name}-cclp = %{version}-%{release} Requires: %{name}-data = %{version}-%{release} @@ -38,9 +33,6 @@ This simple task, however, can sometimes be extremely challenging. Summary: Data files for %{name} BuildArch: noarch -# The README says that all sound files and some of the graphics -# have been placed by their authors in the public domain. -License: GPL-2.0-or-later AND LicenseRef-Fedora-Public-Domain %description data Data files (graphics, sounds) required to play %{fullname}. @@ -48,29 +40,22 @@ Data files (graphics, sounds) required to play %{fullname}. %package cclp Summary: Level packs for %{name} +License: Redistributable, no modification permitted BuildArch: noarch - -# For discussion regarding the license classification, see: -# https://gitlab.com/fedora/legal/fedora-license-data/-/issues/127 -License: LicenseRef-CCLP1 AND LicenseRef-CCLP2 - Requires: %{name}-data = %{version}-%{release} + %description cclp Community-created level packs for %{fullname}. %prep %setup -q - -unzip %{SOURCE4} -mkdir CCLP5 && pushd CCLP5 && unzip %{SOURCE5} && popd - -cp -p %{SOURCE11} . -cp -p %{SOURCE12} . -cp -p %{SOURCE13} . -cp -p %{SOURCE14} . -cp -p %{SOURCE15} . +cp -p %{SOURCE1} . +cp -p %{SOURCE2} . +cp -p %{SOURCE3} . +cp -p %{SOURCE4} . +cp -p %{SOURCE5} . %build @@ -81,30 +66,12 @@ make %{?_smp_mflags} prefix=%{_prefix} %install make install prefix=%{buildroot}%{_prefix} bindir=%{buildroot}%{_bindir} mandir=%{buildroot}%{_mandir} -cp -a CCLPs %{buildroot}%{_datadir}/%{name}/ -cat > %{buildroot}%{_datadir}/%{name}/sets/CCLP2-MS.dac < %{buildroot}%{_datadir}/%{name}/sets/CCLP2-MS.dac < - 1.3.2-28 -- Add CCLP4 and CCLP5 (rhbz#2485409) - -* Fri Jul 17 2026 Fedora Release Engineering - 1.3.2-27 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild - -* Sat Jan 17 2026 Fedora Release Engineering - 1.3.2-26 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild - -* Fri Jul 25 2025 Fedora Release Engineering - 1.3.2-25 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild - -* Sun Jan 19 2025 Fedora Release Engineering - 1.3.2-24 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild - -* Sat Jul 20 2024 Fedora Release Engineering - 1.3.2-23 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild - -* Sat Jan 27 2024 Fedora Release Engineering - 1.3.2-22 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - -* Mon Oct 16 2023 Artur Frenszek-Iwicki - 1.3.2-21 -- Migrate License tag to SPDX - -* Sat Jul 22 2023 Fedora Release Engineering - 1.3.2-20 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild - * Sat Jan 21 2023 Fedora Release Engineering - 1.3.2-19 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild