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..4a5f8fa 100644 --- a/tworld.spec +++ b/tworld.spec @@ -1,29 +1,30 @@ -Name: tworld +Name: tworld %global fullname Tile World Version: 1.3.2 -Release: 28%{?dist} +Release: 4%{?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 -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: gcc SDL SDL-devel BuildRequires: desktop-file-utils -BuildRequires: gcc -BuildRequires: libappstream-glib -BuildRequires: make -BuildRequires: SDL-devel -Requires: hicolor-icon-theme +# libappstream-glib is not available in EPEL6 +# This is only needed for appstream-util, so it can be safely omitted. +%if !0%{?el6} +BuildRequires: libappstream-glib +%endif + +Requires: filesystem hicolor-icon-theme Requires: %{name}-cclp = %{version}-%{release} Requires: %{name}-data = %{version}-%{release} @@ -38,9 +39,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 +46,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 +72,15 @@ 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 </dev/null || : + +%postun +if [ $1 -eq 0 ] ; then + /bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null + /usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : +fi + +%posttrans +/usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : +# End of icon cache related stuff + %files %doc README BUGS docs/tworld.html %license COPYING %{_bindir}/%{name} %{_mandir}/*/%{name}.* -%{_datadir}/applications/%{name}.desktop -%{_datadir}/icons/hicolor/*/apps/%{name}.png -%{_metainfodir}/%{name}.appdata.xml +%{_datadir}/appdata/%{name}.* +%{_datadir}/applications/%{name}.* +%{_datadir}/icons/hicolor/*/apps/%{name}.* %files data @@ -143,83 +141,15 @@ done %changelog -* Fri Jul 31 2026 Artur Frenszek-Iwicki - 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 - -* Sat Jul 23 2022 Fedora Release Engineering - 1.3.2-18 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild - -* Sat Jan 22 2022 Fedora Release Engineering - 1.3.2-17 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild - -* Fri Jul 23 2021 Fedora Release Engineering - 1.3.2-16 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild - -* Wed Jan 27 2021 Fedora Release Engineering - 1.3.2-15 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild - -* Wed Jul 29 2020 Fedora Release Engineering - 1.3.2-14 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild - -* Fri Jan 31 2020 Fedora Release Engineering - 1.3.2-13 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild - -* Sat Jul 27 2019 Fedora Release Engineering - 1.3.2-12 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild - -* Sun Feb 03 2019 Fedora Release Engineering - 1.3.2-11 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild - -* Sat Jul 14 2018 Fedora Release Engineering - 1.3.2-10 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild - -* Sun Feb 28 2018 Artur Iwicki - 1.3.2-9 +* Sun Feb 18 2018 Artur Iwicki 1.3.2-4 - Add missing BuildRequires: for gcc - Use a loop for installing icons instead of repeating the lines several times -* Fri Feb 09 2018 Fedora Release Engineering - 1.3.2-8 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild +* Thu Jun 29 2017 Artur Iwicki 1.3.2-3 +- Added conditionals disabling stuff related to appstream-glib, + which is not available on EPEL6 -* Sun Jan 20 2018 Artur Iwicki 1.3.2-7 -- Actually remove the scriplets instead of just writing a changelog entry - -* Sun Jan 20 2018 Artur Iwicki 1.3.2-6 -- Remove obsolete scriptlets (updating icon cache for hicolor-icon-theme) - -* Thu Aug 03 2017 Fedora Release Engineering - 1.3.2-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild - -* Thu Jul 27 2017 Fedora Release Engineering - 1.3.2-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild - -* Tue Jun 27 2017 Artur Iwicki 1.3.2-3 +* Tue Jun 27 2017 Artur Iwicki