From dbe749f089f87ff9995909dadb22c2f570457a1a Mon Sep 17 00:00:00 2001 From: Artur Iwicki Date: Thu, 29 Jun 2017 20:28:54 +0200 Subject: [PATCH 01/28] Remove libappstream-glib dependency (not available on EPEL6) --- tworld.spec | 22 ++++++++++++++++++---- 1 file changed, 18 insertions(+), 4 deletions(-) diff --git a/tworld.spec b/tworld.spec index d4154eb..cd94338 100644 --- a/tworld.spec +++ b/tworld.spec @@ -1,4 +1,4 @@ -Name: tworld +Name: tworld %global fullname Tile World Version: 1.3.2 @@ -7,7 +7,7 @@ Summary: Intellectually engaging puzzle game License: GPLv2+ 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 Source1: tworld-icon-16px.png Source2: tworld-icon-32px.png @@ -15,8 +15,15 @@ Source3: tworld-icon-48px.png Source4: tworld.desktop Source5: tworld.appdata.xml -BuildRequires: SDL SDL-devel -BuildRequires: desktop-file-utils libappstream-glib +BuildRequires: 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: libappstream-glib +%endif + Requires: filesystem hicolor-icon-theme Requires: %{name}-cclp = %{version}-%{release} Requires: %{name}-data = %{version}-%{release} @@ -68,7 +75,10 @@ make install prefix=%{buildroot}%{_prefix} bindir=%{buildroot}%{_bindir} mandir= 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 @@ -132,6 +142,10 @@ fi %changelog +* Thu Jun 29 2017 Artur Iwicki 1.3.2-3 +- Added conditionals disabling stuff related to appstream-glib, + which is not available on EPEL6 + * Tue Jun 27 2017 Artur Iwicki Date: Thu, 27 Jul 2017 20:49:00 +0000 Subject: [PATCH 02/28] - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild --- tworld.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/tworld.spec b/tworld.spec index d4154eb..14b85ea 100644 --- a/tworld.spec +++ b/tworld.spec @@ -2,7 +2,7 @@ Name: tworld %global fullname Tile World Version: 1.3.2 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Intellectually engaging puzzle game License: GPLv2+ @@ -132,6 +132,9 @@ fi %changelog +* 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 Date: Thu, 3 Aug 2017 09:40:41 +0000 Subject: [PATCH 03/28] - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild --- tworld.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/tworld.spec b/tworld.spec index 14b85ea..1321066 100644 --- a/tworld.spec +++ b/tworld.spec @@ -2,7 +2,7 @@ Name: tworld %global fullname Tile World Version: 1.3.2 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Intellectually engaging puzzle game License: GPLv2+ @@ -132,6 +132,9 @@ fi %changelog +* 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 From 869e862eaad5b73afd57e9da2831f50965111ac4 Mon Sep 17 00:00:00 2001 From: Artur Iwicki Date: Sat, 20 Jan 2018 14:11:31 +0100 Subject: [PATCH 04/28] Remove obsolete scriptlets --- tworld.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/tworld.spec b/tworld.spec index 1321066..eccedec 100644 --- a/tworld.spec +++ b/tworld.spec @@ -2,7 +2,7 @@ Name: tworld %global fullname Tile World Version: 1.3.2 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Intellectually engaging puzzle game License: GPLv2+ @@ -132,13 +132,16 @@ fi %changelog +* 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 - Fix license tags in appdata file - Add dependency on hicolor-icon-theme - Remove unnecessary slashes after buildroot macro in install section From dd89c37d33f748724d8983cc1f6447a5cb6ab0ae Mon Sep 17 00:00:00 2001 From: Artur Iwicki Date: Sat, 20 Jan 2018 14:14:56 +0100 Subject: [PATCH 05/28] Actually remove the scriptlets --- tworld.spec | 20 ++++---------------- 1 file changed, 4 insertions(+), 16 deletions(-) diff --git a/tworld.spec b/tworld.spec index eccedec..b55ce00 100644 --- a/tworld.spec +++ b/tworld.spec @@ -2,7 +2,7 @@ Name: tworld %global fullname Tile World Version: 1.3.2 -Release: 6%{?dist} +Release: 7%{?dist} Summary: Intellectually engaging puzzle game License: GPLv2+ @@ -88,21 +88,6 @@ 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 @@ -132,6 +117,9 @@ fi %changelog +* 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) From 0a685ee1111a7510a6a13a693db1ef69a6aa1458 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 9 Feb 2018 19:46:43 +0000 Subject: [PATCH 06/28] - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- tworld.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/tworld.spec b/tworld.spec index b55ce00..3399534 100644 --- a/tworld.spec +++ b/tworld.spec @@ -2,7 +2,7 @@ Name: tworld %global fullname Tile World Version: 1.3.2 -Release: 7%{?dist} +Release: 8%{?dist} Summary: Intellectually engaging puzzle game License: GPLv2+ @@ -117,6 +117,9 @@ EOF %changelog +* Fri Feb 09 2018 Fedora Release Engineering - 1.3.2-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + * Sun Jan 20 2018 Artur Iwicki 1.3.2-7 - Actually remove the scriplets instead of just writing a changelog entry From 3c4aa2051bba31bc7d324f1645f0d6860122d294 Mon Sep 17 00:00:00 2001 From: Artur Iwicki Date: Sun, 18 Feb 2018 20:06:12 +0100 Subject: [PATCH 07/28] Add missing gcc build-time dependency --- tworld.spec | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/tworld.spec b/tworld.spec index 3399534..7155f89 100644 --- a/tworld.spec +++ b/tworld.spec @@ -2,7 +2,7 @@ Name: tworld %global fullname Tile World Version: 1.3.2 -Release: 8%{?dist} +Release: 9%{?dist} Summary: Intellectually engaging puzzle game License: GPLv2+ @@ -15,7 +15,7 @@ Source3: tworld-icon-48px.png Source4: tworld.desktop Source5: tworld.appdata.xml -BuildRequires: SDL SDL-devel +BuildRequires: gcc SDL SDL-devel BuildRequires: desktop-file-utils libappstream-glib Requires: filesystem hicolor-icon-theme Requires: %{name}-cclp = %{version}-%{release} @@ -72,12 +72,12 @@ appstream-util validate-relax --nonet tworld.appdata.xml 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}%{_datadir}/icons/hicolor/16x16/apps/ -install -m 755 -d %{buildroot}%{_datadir}/icons/hicolor/32x32/apps/ -install -m 755 -d %{buildroot}%{_datadir}/icons/hicolor/48x48/apps/ -install -m 644 -p tworld-icon-16px.png %{buildroot}%{_datadir}/icons/hicolor/16x16/apps/%{name}.png -install -m 644 -p tworld-icon-32px.png %{buildroot}%{_datadir}/icons/hicolor/32x32/apps/%{name}.png -install -m 644 -p tworld-icon-48px.png %{buildroot}%{_datadir}/icons/hicolor/48x48/apps/%{name}.png +for SIZE in 16 32 48; do + install -m 755 -d %{buildroot}%{_datadir}/icons/hicolor/${SIZE}x${SIZE}/apps/ + install -m 644 -p \ + tworld-icon-${SIZE}px.png \ + %{buildroot}%{_datadir}/icons/hicolor/${SIZE}x${SIZE}/apps/%{name}.png +done cp -a CCLPs %{buildroot}%{_datadir}/%{name}/ @@ -117,6 +117,10 @@ EOF %changelog +* Sun Feb 28 2018 Artur Iwicki - 1.3.2-9 +- 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 From dff24967f002c3c6865652884731f21ea3283064 Mon Sep 17 00:00:00 2001 From: Artur Iwicki Date: Sun, 18 Feb 2018 20:23:46 +0100 Subject: [PATCH 08/28] Add missing gcc build-time dependency --- tworld.spec | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/tworld.spec b/tworld.spec index cd94338..4a5f8fa 100644 --- a/tworld.spec +++ b/tworld.spec @@ -2,7 +2,7 @@ Name: tworld %global fullname Tile World Version: 1.3.2 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Intellectually engaging puzzle game License: GPLv2+ @@ -15,7 +15,7 @@ Source3: tworld-icon-48px.png Source4: tworld.desktop Source5: tworld.appdata.xml -BuildRequires: SDL SDL-devel +BuildRequires: gcc SDL SDL-devel BuildRequires: desktop-file-utils # libappstream-glib is not available in EPEL6 @@ -82,13 +82,12 @@ appstream-util validate-relax --nonet tworld.appdata.xml 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}%{_datadir}/icons/hicolor/16x16/apps/ -install -m 755 -d %{buildroot}%{_datadir}/icons/hicolor/32x32/apps/ -install -m 755 -d %{buildroot}%{_datadir}/icons/hicolor/48x48/apps/ -install -m 644 -p tworld-icon-16px.png %{buildroot}%{_datadir}/icons/hicolor/16x16/apps/%{name}.png -install -m 644 -p tworld-icon-32px.png %{buildroot}%{_datadir}/icons/hicolor/32x32/apps/%{name}.png -install -m 644 -p tworld-icon-48px.png %{buildroot}%{_datadir}/icons/hicolor/48x48/apps/%{name}.png - +for SIZE in 16 32 48; do + install -m 755 -d %{buildroot}%{_datadir}/icons/hicolor/${SIZE}x${SIZE}/apps/ + install -m 644 -p \ + tworld-icon-${SIZE}px.png \ + %{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 < 1.3.2-4 +- Add missing BuildRequires: for gcc +- Use a loop for installing icons instead of repeating the lines several times + * Thu Jun 29 2017 Artur Iwicki 1.3.2-3 - Added conditionals disabling stuff related to appstream-glib, which is not available on EPEL6 From 5b3c7d45b13a183e6a7d046bc8affba50e7d9fc1 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 14 Jul 2018 08:04:50 +0000 Subject: [PATCH 09/28] - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- tworld.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/tworld.spec b/tworld.spec index 7155f89..d7a29b5 100644 --- a/tworld.spec +++ b/tworld.spec @@ -2,7 +2,7 @@ Name: tworld %global fullname Tile World Version: 1.3.2 -Release: 9%{?dist} +Release: 10%{?dist} Summary: Intellectually engaging puzzle game License: GPLv2+ @@ -117,6 +117,9 @@ EOF %changelog +* 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 - Add missing BuildRequires: for gcc - Use a loop for installing icons instead of repeating the lines several times From 32ef6597f8a850c8ad16e01bf2d29d36c77f4019 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sun, 3 Feb 2019 10:34:22 +0000 Subject: [PATCH 10/28] - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- tworld.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/tworld.spec b/tworld.spec index d7a29b5..0ca3397 100644 --- a/tworld.spec +++ b/tworld.spec @@ -2,7 +2,7 @@ Name: tworld %global fullname Tile World Version: 1.3.2 -Release: 10%{?dist} +Release: 11%{?dist} Summary: Intellectually engaging puzzle game License: GPLv2+ @@ -117,6 +117,9 @@ EOF %changelog +* 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 From 35212d5e83f513163c7c89f681469367045f5ba8 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 27 Jul 2019 02:13:20 +0000 Subject: [PATCH 11/28] - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- tworld.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/tworld.spec b/tworld.spec index 0ca3397..b0d114d 100644 --- a/tworld.spec +++ b/tworld.spec @@ -2,7 +2,7 @@ Name: tworld %global fullname Tile World Version: 1.3.2 -Release: 11%{?dist} +Release: 12%{?dist} Summary: Intellectually engaging puzzle game License: GPLv2+ @@ -117,6 +117,9 @@ EOF %changelog +* 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 From c18e2e72fabebf296ef46000dde0debc8402c712 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 31 Jan 2020 02:20:34 +0000 Subject: [PATCH 12/28] - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- tworld.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/tworld.spec b/tworld.spec index b0d114d..847b3cf 100644 --- a/tworld.spec +++ b/tworld.spec @@ -2,7 +2,7 @@ Name: tworld %global fullname Tile World Version: 1.3.2 -Release: 12%{?dist} +Release: 13%{?dist} Summary: Intellectually engaging puzzle game License: GPLv2+ @@ -117,6 +117,9 @@ EOF %changelog +* 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 From 79ffc727d55cc7abbab723fd7240715907c9258f Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 29 Jul 2020 13:05:50 +0000 Subject: [PATCH 13/28] - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- tworld.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/tworld.spec b/tworld.spec index 847b3cf..a12cef2 100644 --- a/tworld.spec +++ b/tworld.spec @@ -2,7 +2,7 @@ Name: tworld %global fullname Tile World Version: 1.3.2 -Release: 13%{?dist} +Release: 14%{?dist} Summary: Intellectually engaging puzzle game License: GPLv2+ @@ -117,6 +117,9 @@ EOF %changelog +* 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 From 27ba91524f959445e344c67a0864eb8909e76ce2 Mon Sep 17 00:00:00 2001 From: Tom Stellard Date: Sat, 9 Jan 2021 00:15:34 +0000 Subject: [PATCH 14/28] Add BuildRequires: make https://fedoraproject.org/wiki/Changes/Remove_make_from_BuildRoot --- tworld.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/tworld.spec b/tworld.spec index a12cef2..efc1736 100644 --- a/tworld.spec +++ b/tworld.spec @@ -15,6 +15,7 @@ Source3: tworld-icon-48px.png Source4: tworld.desktop Source5: tworld.appdata.xml +BuildRequires: make BuildRequires: gcc SDL SDL-devel BuildRequires: desktop-file-utils libappstream-glib Requires: filesystem hicolor-icon-theme From 8f329439c8529483cd652b4af55a1fb5f83ed8be Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 27 Jan 2021 22:29:34 +0000 Subject: [PATCH 15/28] - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- tworld.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/tworld.spec b/tworld.spec index efc1736..8e31ca4 100644 --- a/tworld.spec +++ b/tworld.spec @@ -2,7 +2,7 @@ Name: tworld %global fullname Tile World Version: 1.3.2 -Release: 14%{?dist} +Release: 15%{?dist} Summary: Intellectually engaging puzzle game License: GPLv2+ @@ -118,6 +118,9 @@ EOF %changelog +* 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 From 10df0c4ab7b2d29a4c006fc6c0b13f5511fdb0ff Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 23 Jul 2021 19:50:41 +0000 Subject: [PATCH 16/28] - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- tworld.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/tworld.spec b/tworld.spec index 8e31ca4..a540566 100644 --- a/tworld.spec +++ b/tworld.spec @@ -2,7 +2,7 @@ Name: tworld %global fullname Tile World Version: 1.3.2 -Release: 15%{?dist} +Release: 16%{?dist} Summary: Intellectually engaging puzzle game License: GPLv2+ @@ -118,6 +118,9 @@ EOF %changelog +* 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 From ad76319e9949e5b582022a42833bf44dc0f33883 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 22 Jan 2022 03:19:41 +0000 Subject: [PATCH 17/28] - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- tworld.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/tworld.spec b/tworld.spec index a540566..80999ea 100644 --- a/tworld.spec +++ b/tworld.spec @@ -2,7 +2,7 @@ Name: tworld %global fullname Tile World Version: 1.3.2 -Release: 16%{?dist} +Release: 17%{?dist} Summary: Intellectually engaging puzzle game License: GPLv2+ @@ -118,6 +118,9 @@ EOF %changelog +* 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 From 00fc4f651f6f66ac994d62a6aba35c70a833e546 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 23 Jul 2022 11:10:40 +0000 Subject: [PATCH 18/28] Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- tworld.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/tworld.spec b/tworld.spec index 80999ea..0424ee9 100644 --- a/tworld.spec +++ b/tworld.spec @@ -2,7 +2,7 @@ Name: tworld %global fullname Tile World Version: 1.3.2 -Release: 17%{?dist} +Release: 18%{?dist} Summary: Intellectually engaging puzzle game License: GPLv2+ @@ -118,6 +118,9 @@ EOF %changelog +* 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 From dc002189fb0de950350206865b47a3d652a1ed3f Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 21 Jan 2023 05:34:52 +0000 Subject: [PATCH 19/28] Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- tworld.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/tworld.spec b/tworld.spec index 0424ee9..fae2406 100644 --- a/tworld.spec +++ b/tworld.spec @@ -2,7 +2,7 @@ Name: tworld %global fullname Tile World Version: 1.3.2 -Release: 18%{?dist} +Release: 19%{?dist} Summary: Intellectually engaging puzzle game License: GPLv2+ @@ -118,6 +118,9 @@ EOF %changelog +* 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 From 09d8d5a97f36aa34c724d30c1283cac4deeb7a12 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 22 Jul 2023 16:53:39 +0000 Subject: [PATCH 20/28] Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- tworld.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/tworld.spec b/tworld.spec index fae2406..bdaac31 100644 --- a/tworld.spec +++ b/tworld.spec @@ -2,7 +2,7 @@ Name: tworld %global fullname Tile World Version: 1.3.2 -Release: 19%{?dist} +Release: 20%{?dist} Summary: Intellectually engaging puzzle game License: GPLv2+ @@ -118,6 +118,9 @@ EOF %changelog +* 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 From 51154dac9fdafaba535b48f366431fdb7d8b837e Mon Sep 17 00:00:00 2001 From: Artur Frenszek-Iwicki Date: Mon, 16 Oct 2023 15:00:00 +0200 Subject: [PATCH 21/28] Migrate license tag to SPDX --- tworld.appdata.xml | 2 +- tworld.spec | 35 ++++++++++++++++++++++++----------- 2 files changed, 25 insertions(+), 12 deletions(-) diff --git a/tworld.appdata.xml b/tworld.appdata.xml index cbdfbd9..b51549f 100644 --- a/tworld.appdata.xml +++ b/tworld.appdata.xml @@ -2,7 +2,7 @@ tworld.desktop CC-BY-SA-4.0 - GPL-2.0+ + GPL-2.0-or-later Tile World Intellectually engaging puzzle game diff --git a/tworld.spec b/tworld.spec index bdaac31..5b6ea4f 100644 --- a/tworld.spec +++ b/tworld.spec @@ -2,10 +2,10 @@ Name: tworld %global fullname Tile World Version: 1.3.2 -Release: 20%{?dist} +Release: 21%{?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 @@ -15,10 +15,13 @@ Source3: tworld-icon-48px.png Source4: tworld.desktop Source5: tworld.appdata.xml +BuildRequires: desktop-file-utils +BuildRequires: gcc +BuildRequires: libappstream-glib BuildRequires: make -BuildRequires: gcc SDL SDL-devel -BuildRequires: desktop-file-utils libappstream-glib -Requires: filesystem hicolor-icon-theme +BuildRequires: SDL-devel + +Requires: hicolor-icon-theme Requires: %{name}-cclp = %{version}-%{release} Requires: %{name}-data = %{version}-%{release} @@ -33,6 +36,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}. @@ -40,8 +46,12 @@ 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} @@ -70,8 +80,8 @@ install -m 755 -d %{buildroot}%{_datadir}/applications/ desktop-file-install --dir=%{buildroot}%{_datadir}/applications/ %{name}.desktop appstream-util validate-relax --nonet tworld.appdata.xml -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/ @@ -94,9 +104,9 @@ EOF %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 @@ -118,6 +128,9 @@ EOF %changelog +* 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 From 33abc40509410fc2b2532bc11da890e65cfd00da Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 27 Jan 2024 06:52:16 +0000 Subject: [PATCH 22/28] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- tworld.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/tworld.spec b/tworld.spec index 5b6ea4f..131924a 100644 --- a/tworld.spec +++ b/tworld.spec @@ -2,7 +2,7 @@ Name: tworld %global fullname Tile World Version: 1.3.2 -Release: 21%{?dist} +Release: 22%{?dist} Summary: Intellectually engaging puzzle game License: GPL-2.0-or-later @@ -128,6 +128,9 @@ EOF %changelog +* 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 From 66bce4465eac7d99ca713acf8e9d33c6c1720e61 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 20 Jul 2024 08:02:10 +0000 Subject: [PATCH 23/28] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild --- tworld.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/tworld.spec b/tworld.spec index 131924a..941c29f 100644 --- a/tworld.spec +++ b/tworld.spec @@ -2,7 +2,7 @@ Name: tworld %global fullname Tile World Version: 1.3.2 -Release: 22%{?dist} +Release: 23%{?dist} Summary: Intellectually engaging puzzle game License: GPL-2.0-or-later @@ -128,6 +128,9 @@ EOF %changelog +* 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 From fe3681a80e5803f065b22712907e68b4b3f7deea Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sun, 19 Jan 2025 13:29:48 +0000 Subject: [PATCH 24/28] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild --- tworld.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/tworld.spec b/tworld.spec index 941c29f..442a869 100644 --- a/tworld.spec +++ b/tworld.spec @@ -2,7 +2,7 @@ Name: tworld %global fullname Tile World Version: 1.3.2 -Release: 23%{?dist} +Release: 24%{?dist} Summary: Intellectually engaging puzzle game License: GPL-2.0-or-later @@ -128,6 +128,9 @@ EOF %changelog +* 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 From 20ac7d4dff54fb3c460fcedbc5d1184033060fbc Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 25 Jul 2025 19:39:31 +0000 Subject: [PATCH 25/28] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild --- tworld.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/tworld.spec b/tworld.spec index 442a869..52e25e4 100644 --- a/tworld.spec +++ b/tworld.spec @@ -2,7 +2,7 @@ Name: tworld %global fullname Tile World Version: 1.3.2 -Release: 24%{?dist} +Release: 25%{?dist} Summary: Intellectually engaging puzzle game License: GPL-2.0-or-later @@ -128,6 +128,9 @@ EOF %changelog +* 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 From 6b2a14d2c00a7fd32e753b3f5d2abb107a014ec0 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 17 Jan 2026 19:29:22 +0000 Subject: [PATCH 26/28] Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild --- tworld.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/tworld.spec b/tworld.spec index 52e25e4..9e483c1 100644 --- a/tworld.spec +++ b/tworld.spec @@ -2,7 +2,7 @@ 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 @@ -128,6 +128,9 @@ EOF %changelog +* 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 From b12e15525a86362753f9917713298d49122b702a Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 17 Jul 2026 08:02:48 +0000 Subject: [PATCH 27/28] Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild --- tworld.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/tworld.spec b/tworld.spec index 9e483c1..9b719ff 100644 --- a/tworld.spec +++ b/tworld.spec @@ -2,7 +2,7 @@ Name: tworld %global fullname Tile World Version: 1.3.2 -Release: 26%{?dist} +Release: 27%{?dist} Summary: Intellectually engaging puzzle game License: GPL-2.0-or-later @@ -128,6 +128,9 @@ EOF %changelog +* 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 From 15e2d81fdf75b402d2f6849e3205d822d43e10fd Mon Sep 17 00:00:00 2001 From: Artur Frenszek-Iwicki Date: Fri, 31 Jul 2026 11:00:00 +0200 Subject: [PATCH 28/28] 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 9b719ff..6f984a9 100644 --- a/tworld.spec +++ b/tworld.spec @@ -2,18 +2,20 @@ Name: tworld %global fullname Tile World Version: 1.3.2 -Release: 27%{?dist} +Release: 28%{?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 < %{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