Add CCLP4 and CCLP5 (rhbz#2485409)

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>

.gitignore

@@ -1 +1,2 @@
 /tworld-1.3.2-CCLPs.tar.gz
+/CCLP[0-9].zip

sources

@@ -1 +1,3 @@
 SHA512 (tworld-1.3.2-CCLPs.tar.gz) = 395b1ddbe9df568243d2e8b78704732dbbe931a5b2ea2af63ebc4e93394c5715e58891a3e1f536f785062cb44ba4540538544b3ed10910d9f30843452a26b803
+SHA512 (CCLP4.zip) = 30c5af1cfaed4d8453e0a84f7b6aacc0754f6e754d61c8e3fa92ad019635784912f363c828ef6eb496c75b8bd06d27b37aa364cb06b7a1a9cd29c9988500e6af
+SHA512 (CCLP5.zip) = 1a52f84e938d19af640184e5f0bda3ebc4eae82d78337c78519949e9bb229be52e140575933c64c247db60915797abeb34b4491b4dc43d6fccd5b081c6d3991f

tworld.appdata.xml

@@ -2,7 +2,7 @@
 <component type="desktop">
 <id>tworld.desktop</id>
 	<metadata_license>CC-BY-SA-4.0</metadata_license>
-	<project_license>GPL-2.0+</project_license>
+	<project_license>GPL-2.0-or-later</project_license>
 	<name>Tile World</name>
 	<summary>Intellectually engaging puzzle game</summary>
 	<description>

tworld.spec

@@ -1,30 +1,29 @@
-Name:    tworld
+Name:	 tworld
 %global fullname Tile World
 
 Version: 1.3.2
-Release: 4%{?dist}
+Release: 28%{?dist}
 Summary: Intellectually engaging puzzle game
 
-License: GPLv2+
+License: GPL-2.0-or-later
 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
 
-Source1: tworld-icon-16px.png
-Source2: tworld-icon-32px.png
-Source3: tworld-icon-48px.png
-Source4: tworld.desktop
-Source5: tworld.appdata.xml
+Source11: tworld-icon-16px.png
+Source12: tworld-icon-32px.png
+Source13: tworld-icon-48px.png
+Source14: tworld.desktop
+Source15: tworld.appdata.xml
 
-BuildRequires: gcc SDL SDL-devel
 BuildRequires: desktop-file-utils
-
-# libappstream-glib is not available in EPEL6
-# This is only needed for appstream-util, so it can be safely omitted.
-%if !0%{?el6}
+BuildRequires: gcc
 BuildRequires: libappstream-glib
-%endif
+BuildRequires: make
+BuildRequires: SDL-devel
 
-Requires: filesystem hicolor-icon-theme
+Requires: hicolor-icon-theme
 Requires: %{name}-cclp = %{version}-%{release}
 Requires: %{name}-data = %{version}-%{release}
 
@@ -39,6 +38,9 @@ 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}.
@@ -46,10 +48,13 @@ Data files (graphics, sounds) required to play %{fullname}.
 
 %package cclp
 Summary: Level packs for %{name}
-License: Redistributable, no modification permitted
 BuildArch: noarch
-Requires: %{name}-data = %{version}-%{release}
 
+# 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}.
@@ -57,11 +62,15 @@ Community-created level packs for %{fullname}.
 
 %prep
 %setup -q
-cp -p %{SOURCE1} .
-cp -p %{SOURCE2} .
-cp -p %{SOURCE3} .
-cp -p %{SOURCE4} .
-cp -p %{SOURCE5} .
+
+unzip %{SOURCE4}
+mkdir CCLP5 && pushd CCLP5 && unzip %{SOURCE5} && popd
+
+cp -p %{SOURCE11} .
+cp -p %{SOURCE12} .
+cp -p %{SOURCE13} .
+cp -p %{SOURCE14} .
+cp -p %{SOURCE15} .
 
 
 %build
@@ -72,15 +81,30 @@ 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 <<EOF
+file=CCLP2.dat
+lastlevel=149
+ruleset=ms
+EOF
+
+for EXTRA in 4 5; do
+  pushd "CCLP${EXTRA}"
+  cp -a "./data/CCLP${EXTRA}.dat" -t %{buildroot}%{_datadir}/%{name}/data
+  cp -a "./sets/CCLP${EXTRA}-Lynx.dac" -t %{buildroot}%{_datadir}/%{name}/sets
+  cp -a "./sets/CCLP${EXTRA}-MS.dac"   -t %{buildroot}%{_datadir}/%{name}/sets
+
+  cp -a "./CCLP${EXTRA}.html" -t %{buildroot}%{_datadir}/%{name}/CCLPs
+  cp -a "./cclp${EXTRA}res"   -t %{buildroot}%{_datadir}/%{name}/CCLPs
+  popd
+done
+
 install -m 755 -d %{buildroot}%{_datadir}/applications/
 desktop-file-install  --dir=%{buildroot}%{_datadir}/applications/  %{name}.desktop
 
-# Do not validate the file on EPEL6 as appstream-util is not available
-%if !0%{?el6}
 appstream-util validate-relax --nonet tworld.appdata.xml
-%endif
-install -m 755 -d %{buildroot}%{_datadir}/appdata/
-install -m 644 -p tworld.appdata.xml %{buildroot}%{_datadir}/appdata/%{name}.appdata.xml
+install -m 755 -d %{buildroot}%{_metainfodir}
+install -m 644 -p tworld.appdata.xml %{buildroot}%{_metainfodir}/%{name}.appdata.xml
 
 for SIZE in 16 32 48; do
   install -m 755 -d %{buildroot}%{_datadir}/icons/hicolor/${SIZE}x${SIZE}/apps/
@@ -89,37 +113,15 @@ for SIZE in 16 32 48; do
     %{buildroot}%{_datadir}/icons/hicolor/${SIZE}x${SIZE}/apps/%{name}.png
 done
 
-cp -a CCLPs %{buildroot}%{_datadir}/%{name}/
-cat > %{buildroot}%{_datadir}/%{name}/sets/CCLP2-MS.dac <<EOF
-file=CCLP2.dat
-lastlevel=149
-ruleset=ms
-EOF
-
-
-# Needed for the icon cache to work correctly
-%post
-/bin/touch --no-create %{_datadir}/icons/hicolor &>/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}/appdata/%{name}.*
-%{_datadir}/applications/%{name}.*
-%{_datadir}/icons/hicolor/*/apps/%{name}.*
+%{_datadir}/applications/%{name}.desktop
+%{_datadir}/icons/hicolor/*/apps/%{name}.png
+%{_metainfodir}/%{name}.appdata.xml
 
 
 %files data
@@ -141,15 +143,83 @@ fi
 
 
 %changelog
-* Sun Feb 18 2018 Artur Iwicki <fedora@svgames.pl> 1.3.2-4
+* Fri Jul 31 2026 Artur Frenszek-Iwicki <fedora@svgames.pl> - 1.3.2-28
+- Add CCLP4 and CCLP5 (rhbz#2485409)
+
+* Fri Jul 17 2026 Fedora Release Engineering <releng@fedoraproject.org> - 1.3.2-27
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild
+
+* Sat Jan 17 2026 Fedora Release Engineering <releng@fedoraproject.org> - 1.3.2-26
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild
+
+* Fri Jul 25 2025 Fedora Release Engineering <releng@fedoraproject.org> - 1.3.2-25
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild
+
+* Sun Jan 19 2025 Fedora Release Engineering <releng@fedoraproject.org> - 1.3.2-24
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild
+
+* Sat Jul 20 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1.3.2-23
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
+
+* Sat Jan 27 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1.3.2-22
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
+
+* Mon Oct 16 2023 Artur Frenszek-Iwicki <fedora@svgames.pl> - 1.3.2-21
+- Migrate License tag to SPDX
+
+* Sat Jul 22 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1.3.2-20
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
+
+* Sat Jan 21 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1.3.2-19
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
+
+* Sat Jul 23 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.3.2-18
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
+
+* Sat Jan 22 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.3.2-17
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
+
+* Fri Jul 23 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.3.2-16
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
+
+* Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.3.2-15
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
+
+* Wed Jul 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.3.2-14
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
+
+* Fri Jan 31 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.3.2-13
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
+
+* Sat Jul 27 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.3.2-12
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
+
+* Sun Feb 03 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.3.2-11
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
+
+* Sat Jul 14 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.3.2-10
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
+
+* Sun Feb 28 2018 Artur Iwicki <fedora@svgames.pl> - 1.3.2-9
 - Add missing BuildRequires: for gcc
 - Use a loop for installing icons instead of repeating the lines several times
 
-* Thu Jun 29 2017 Artur Iwicki <fedora@svgames.pl> 1.3.2-3
-- Added conditionals disabling stuff related to appstream-glib,
-  which is not available on EPEL6
+* Fri Feb 09 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.3.2-8
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
 
-* Tue Jun 27 2017 Artur Iwicki <fedora@svgames.pl 1.3.2-3
+* Sun Jan 20 2018 Artur Iwicki <fedora@svgames.pl> 1.3.2-7
+- Actually remove the scriplets instead of just writing a changelog entry
+
+* Sun Jan 20 2018 Artur Iwicki <fedora@svgames.pl> 1.3.2-6
+- Remove obsolete scriptlets (updating icon cache for hicolor-icon-theme)
+
+* Thu Aug 03 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.3.2-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
+
+* Thu Jul 27 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.3.2-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
+
+* Tue Jun 27 2017 Artur Iwicki <fedora@svgames.pl> 1.3.2-3
 - Fix license tags in appdata file
 - Add dependency on hicolor-icon-theme
 - Remove unnecessary slashes after buildroot macro in install section