From 091ceb4486f1f8ea080c2bea0682889f8e245357 Mon Sep 17 00:00:00 2001
From: Artur Frenszek-Iwicki <fedora@svgames.pl>
Date: Fri, 31 Jul 2026 11:00:00 +0200
Subject: [PATCH] Add CCLP4 and CCLP5 (rhbz#2485409)

---
 .gitignore  |  1 +
 sources     |  2 ++
 tworld.spec | 60 ++++++++++++++++++++++++++++++++++-------------------
 3 files changed, 42 insertions(+), 21 deletions(-)

diff --git a/.gitignore b/.gitignore
index 290be64..7702365 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 /tworld-1.3.2-CCLPs.tar.gz
+/CCLP[0-9].zip
diff --git a/sources b/sources
index c983cf4..51c8523 100644
--- a/sources
+++ b/sources
@@ -1 +1,3 @@
 SHA512 (tworld-1.3.2-CCLPs.tar.gz) = 395b1ddbe9df568243d2e8b78704732dbbe931a5b2ea2af63ebc4e93394c5715e58891a3e1f536f785062cb44ba4540538544b3ed10910d9f30843452a26b803
+SHA512 (CCLP4.zip) = 30c5af1cfaed4d8453e0a84f7b6aacc0754f6e754d61c8e3fa92ad019635784912f363c828ef6eb496c75b8bd06d27b37aa364cb06b7a1a9cd29c9988500e6af
+SHA512 (CCLP5.zip) = 1a52f84e938d19af640184e5f0bda3ebc4eae82d78337c78519949e9bb229be52e140575933c64c247db60915797abeb34b4491b4dc43d6fccd5b081c6d3991f
diff --git a/tworld.spec b/tworld.spec
index 52e25e4..1ce9500 100644
--- a/tworld.spec
+++ b/tworld.spec
@@ -2,18 +2,20 @@ Name:	 tworld
 %global fullname Tile World
 
 Version: 1.3.2
-Release: 25%{?dist}
+Release: 26%{?dist}
 Summary: Intellectually engaging puzzle game
 
 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	
+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: desktop-file-utils
 BuildRequires: gcc
@@ -54,18 +56,21 @@ License: LicenseRef-CCLP1 AND LicenseRef-CCLP2
 
 Requires: %{name}-data = %{version}-%{release}
 
-
 %description cclp
 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
@@ -76,6 +81,24 @@ 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
 
@@ -91,14 +114,6 @@ for SIZE in 16 32 48; do
 done
 
 
-cp -a CCLPs %{buildroot}%{_datadir}/%{name}/
-cat > %{buildroot}%{_datadir}/%{name}/sets/CCLP2-MS.dac <<EOF
-file=CCLP2.dat
-lastlevel=149
-ruleset=ms
-EOF
-
-
 %files
 %doc README BUGS docs/tworld.html
 %license COPYING
@@ -128,6 +143,9 @@ EOF
 
 
 %changelog
+* Fri Jul 31 2026 Artur Frenszek-Iwicki <fedora@svgames.pl> - 1.3.2-26
+- Add CCLP4 and CCLP5 (rhbz#2485409)
+
 * Fri Jul 25 2025 Fedora Release Engineering <releng@fedoraproject.org> - 1.3.2-25
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild