From e3cb291f8724efd65581084d40580c328ce26579 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 20 Jul 2023 09:08:52 +0000 Subject: [PATCH 01/11] Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- kf5-plasma.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/kf5-plasma.spec b/kf5-plasma.spec index 296999d..42325bf 100644 --- a/kf5-plasma.spec +++ b/kf5-plasma.spec @@ -2,7 +2,7 @@ Name: kf5-plasma Version: 5.108.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: KDE Frameworks 5 Tier 3 framework is foundation to build a primary user interface License: GPLv2+ and LGPLv2+ and BSD @@ -159,6 +159,9 @@ sed -e "s|@@VERSION@@|%{version}|g" fedora-plasma-cache.sh.in > \ %changelog +* Thu Jul 20 2023 Fedora Release Engineering - 5.108.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + * Sun Jul 02 2023 Marc Deop i Argemí - 5.108.0-1 - 5.108.0 From f9a48327fdf9b1dd45ec3f8f781a3becb79de7e1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc=20Deop=20i=20Argem=C3=AD?= Date: Sat, 5 Aug 2023 17:59:28 +0200 Subject: [PATCH 02/11] 5.109.0 --- .gitignore | 1 + kf5-plasma.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 130a990..319413a 100644 --- a/.gitignore +++ b/.gitignore @@ -61,3 +61,4 @@ /plasma-framework-5.106.0.tar.xz /plasma-framework-5.107.0.tar.xz /plasma-framework-5.108.0.tar.xz +/plasma-framework-5.109.0.tar.xz diff --git a/kf5-plasma.spec b/kf5-plasma.spec index 42325bf..25bbb05 100644 --- a/kf5-plasma.spec +++ b/kf5-plasma.spec @@ -1,8 +1,8 @@ %global framework plasma-framework Name: kf5-plasma -Version: 5.108.0 -Release: 2%{?dist} +Version: 5.109.0 +Release: 1%{?dist} Summary: KDE Frameworks 5 Tier 3 framework is foundation to build a primary user interface License: GPLv2+ and LGPLv2+ and BSD @@ -159,6 +159,9 @@ sed -e "s|@@VERSION@@|%{version}|g" fedora-plasma-cache.sh.in > \ %changelog +* Sat Aug 05 2023 Marc Deop i Argemí - 5.109.0-1 +- 5.109.0 + * Thu Jul 20 2023 Fedora Release Engineering - 5.108.0-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild diff --git a/sources b/sources index a671c6a..553ce12 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (plasma-framework-5.108.0.tar.xz) = 58b69b8c99d63dc96a82be852314dfe6d000b51a630c15927436911e2fe6fe842c0b5b4b17dbfa9bb985cd98fcdae772f22e5571ec610472fd1f856417194b3e +SHA512 (plasma-framework-5.109.0.tar.xz) = ec301a696f3f7db95f6e7408f1e71470e42f97ebd97d2cc205d03c384d2de11682613ce32b66c4e65303068a4ba2307e1df4374b7db484e5f0b3e3b2da24e4b6 From a46245ea59204e1f7dd9d937e0a2f6da7055b492 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc=20Deop=20i=20Argem=C3=AD?= Date: Wed, 6 Sep 2023 00:07:18 +0200 Subject: [PATCH 03/11] 5.110.0 --- .gitignore | 1 + kf5-plasma.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 319413a..f59f115 100644 --- a/.gitignore +++ b/.gitignore @@ -62,3 +62,4 @@ /plasma-framework-5.107.0.tar.xz /plasma-framework-5.108.0.tar.xz /plasma-framework-5.109.0.tar.xz +/plasma-framework-5.110.0.tar.xz diff --git a/kf5-plasma.spec b/kf5-plasma.spec index 25bbb05..ecd57af 100644 --- a/kf5-plasma.spec +++ b/kf5-plasma.spec @@ -1,7 +1,7 @@ %global framework plasma-framework Name: kf5-plasma -Version: 5.109.0 +Version: 5.110.0 Release: 1%{?dist} Summary: KDE Frameworks 5 Tier 3 framework is foundation to build a primary user interface @@ -159,6 +159,9 @@ sed -e "s|@@VERSION@@|%{version}|g" fedora-plasma-cache.sh.in > \ %changelog +* Tue Sep 05 2023 Marc Deop i Argemí - 5.110.0-1 +- 5.110.0 + * Sat Aug 05 2023 Marc Deop i Argemí - 5.109.0-1 - 5.109.0 diff --git a/sources b/sources index 553ce12..8596c88 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (plasma-framework-5.109.0.tar.xz) = ec301a696f3f7db95f6e7408f1e71470e42f97ebd97d2cc205d03c384d2de11682613ce32b66c4e65303068a4ba2307e1df4374b7db484e5f0b3e3b2da24e4b6 +SHA512 (plasma-framework-5.110.0.tar.xz) = dda20bee357c18405a56cb8cd0b73d1da3f8838921290e5890873b80d1b970a82f18194c26a598c670e85bb4db16477ef770d5e1d7d19d79b210dec574704039 From a6d4aa5f8d9dae24c78e3061ed93c88cba4e4cc7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc=20Deop=20i=20Argem=C3=AD?= Date: Tue, 10 Oct 2023 22:57:21 +0200 Subject: [PATCH 04/11] 5.111.0 --- .gitignore | 1 + kf5-plasma.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index f59f115..9706b38 100644 --- a/.gitignore +++ b/.gitignore @@ -63,3 +63,4 @@ /plasma-framework-5.108.0.tar.xz /plasma-framework-5.109.0.tar.xz /plasma-framework-5.110.0.tar.xz +/plasma-framework-5.111.0.tar.xz diff --git a/kf5-plasma.spec b/kf5-plasma.spec index ecd57af..4524f40 100644 --- a/kf5-plasma.spec +++ b/kf5-plasma.spec @@ -1,7 +1,7 @@ %global framework plasma-framework Name: kf5-plasma -Version: 5.110.0 +Version: 5.111.0 Release: 1%{?dist} Summary: KDE Frameworks 5 Tier 3 framework is foundation to build a primary user interface @@ -159,6 +159,9 @@ sed -e "s|@@VERSION@@|%{version}|g" fedora-plasma-cache.sh.in > \ %changelog +* Tue Oct 10 2023 Marc Deop i Argemí - 5.111.0-1 +- 5.111.0 + * Tue Sep 05 2023 Marc Deop i Argemí - 5.110.0-1 - 5.110.0 diff --git a/sources b/sources index 8596c88..68858cf 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (plasma-framework-5.110.0.tar.xz) = dda20bee357c18405a56cb8cd0b73d1da3f8838921290e5890873b80d1b970a82f18194c26a598c670e85bb4db16477ef770d5e1d7d19d79b210dec574704039 +SHA512 (plasma-framework-5.111.0.tar.xz) = 6e8a4821b295743b552e95900ed3f8a0ffdd4dc81a05748b4c1f59584f34638b1e0ddd8eef3686c71d9f61e5f11c4629982badb6632918e5c2296c60a6338462 From 13702acba5fea0433729e7538232d5297a8d87c3 Mon Sep 17 00:00:00 2001 From: Alessandro Astone Date: Fri, 13 Oct 2023 01:24:27 +0200 Subject: [PATCH 05/11] Add KF6 compatibility flag --- kf5-plasma.spec | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/kf5-plasma.spec b/kf5-plasma.spec index 4524f40..700a66b 100644 --- a/kf5-plasma.spec +++ b/kf5-plasma.spec @@ -1,8 +1,10 @@ +%bcond kf6_compat %[0%{?fedora} >= 40 || 0%{?rhel} >= 10] + %global framework plasma-framework Name: kf5-plasma Version: 5.111.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: KDE Frameworks 5 Tier 3 framework is foundation to build a primary user interface License: GPLv2+ and LGPLv2+ and BSD @@ -98,7 +100,7 @@ install -m644 -p %{SOURCE10} . %build -%cmake_kf5 +%cmake_kf5 %{?with_kf6_compat:-DBUILD_DESKTOPTHEMES=OFF} %cmake_build @@ -159,6 +161,9 @@ sed -e "s|@@VERSION@@|%{version}|g" fedora-plasma-cache.sh.in > \ %changelog +* Thu Oct 12 2023 Alessandro Astone - 5.111.0-2 +- Add KF6 compatibility flag + * Tue Oct 10 2023 Marc Deop i Argemí - 5.111.0-1 - 5.111.0 From f9e9d2b9d4c18461465ba542f8eacbd986b5b3af Mon Sep 17 00:00:00 2001 From: Alessandro Astone Date: Mon, 16 Oct 2023 22:22:30 +0200 Subject: [PATCH 06/11] Add KF6 compatibility flag --- kf5-plasma.spec | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/kf5-plasma.spec b/kf5-plasma.spec index 700a66b..eca56a9 100644 --- a/kf5-plasma.spec +++ b/kf5-plasma.spec @@ -4,7 +4,7 @@ Name: kf5-plasma Version: 5.111.0 -Release: 2%{?dist} +Release: 3%{?dist} Summary: KDE Frameworks 5 Tier 3 framework is foundation to build a primary user interface License: GPLv2+ and LGPLv2+ and BSD @@ -69,6 +69,10 @@ BuildRequires: qt5-qtx11extras-devel Requires: qt5-qtquickcontrols%{?_isa} Requires: qt5-qtquickcontrols2%{?_isa} +%if %{with kf6_compat} +Requires: kf6-plasma +%endif + # https://bugzilla.redhat.com/1293415 Conflicts: kdeplasma-addons < 5.5.0-3 @@ -161,6 +165,9 @@ sed -e "s|@@VERSION@@|%{version}|g" fedora-plasma-cache.sh.in > \ %changelog +* Mon Oct 16 2023 Alessandro Astone - 5.111.0-3 +- Require kf6-plasma if compat build + * Thu Oct 12 2023 Alessandro Astone - 5.111.0-2 - Add KF6 compatibility flag From 2dd3f3ca4d1916b5bb04219aa5b24ed144aed556 Mon Sep 17 00:00:00 2001 From: Alessandro Astone Date: Mon, 16 Oct 2023 23:38:01 +0200 Subject: [PATCH 07/11] Fix kf6-plasma requires to be arch-specific --- kf5-plasma.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/kf5-plasma.spec b/kf5-plasma.spec index eca56a9..5077157 100644 --- a/kf5-plasma.spec +++ b/kf5-plasma.spec @@ -4,7 +4,7 @@ Name: kf5-plasma Version: 5.111.0 -Release: 3%{?dist} +Release: 4%{?dist} Summary: KDE Frameworks 5 Tier 3 framework is foundation to build a primary user interface License: GPLv2+ and LGPLv2+ and BSD @@ -70,7 +70,7 @@ Requires: qt5-qtquickcontrols%{?_isa} Requires: qt5-qtquickcontrols2%{?_isa} %if %{with kf6_compat} -Requires: kf6-plasma +Requires: kf6-plasma%{?_isa} %endif # https://bugzilla.redhat.com/1293415 @@ -165,6 +165,9 @@ sed -e "s|@@VERSION@@|%{version}|g" fedora-plasma-cache.sh.in > \ %changelog +* Mon Oct 16 2023 Alessandro Astone - 5.111.0-4 +- Fix kf6-plasma requires to be arch-specific + * Mon Oct 16 2023 Alessandro Astone - 5.111.0-3 - Require kf6-plasma if compat build From 62e4373c18e9f3b95be81c40a02e65373a9736b6 Mon Sep 17 00:00:00 2001 From: Steve Cossette Date: Sun, 29 Oct 2023 21:00:34 -0400 Subject: [PATCH 08/11] Updated spec with SPDX Licenses --- kf5-plasma.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kf5-plasma.spec b/kf5-plasma.spec index 5077157..7bcd1f1 100644 --- a/kf5-plasma.spec +++ b/kf5-plasma.spec @@ -7,7 +7,7 @@ Version: 5.111.0 Release: 4%{?dist} Summary: KDE Frameworks 5 Tier 3 framework is foundation to build a primary user interface -License: GPLv2+ and LGPLv2+ and BSD +License: BSD-2-Clause AND BSD-3-Clause AND CC0-1.0 AND GPL-2.0-only AND GPL-2.0-or-later AND GPL-3.0-only AND LGPL-2.0-or-later AND LGPL-2.1-only AND LGPL-2.1-or-later AND LGPL-3.0-only AND LicenseRef-KDE-Accepted-GPL AND LicenseRef-KDE-Accepted-LGPL URL: https://invent.kde.org/frameworks/plasma %global majmin %majmin_ver_kf5 From ac5500ba392fb9ea889b8a07facb9b38016309e2 Mon Sep 17 00:00:00 2001 From: Alessandro Astone Date: Mon, 13 Nov 2023 11:43:16 +0100 Subject: [PATCH 09/11] Don't provide the plasma-frameworks name for Plasma 6 --- kf5-plasma.spec | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/kf5-plasma.spec b/kf5-plasma.spec index 7bcd1f1..3174495 100644 --- a/kf5-plasma.spec +++ b/kf5-plasma.spec @@ -4,7 +4,7 @@ Name: kf5-plasma Version: 5.111.0 -Release: 4%{?dist} +Release: 5%{?dist} Summary: KDE Frameworks 5 Tier 3 framework is foundation to build a primary user interface License: BSD-2-Clause AND BSD-3-Clause AND CC0-1.0 AND GPL-2.0-only AND GPL-2.0-or-later AND GPL-3.0-only AND LGPL-2.0-or-later AND LGPL-2.1-only AND LGPL-2.1-or-later AND LGPL-3.0-only AND LicenseRef-KDE-Accepted-GPL AND LicenseRef-KDE-Accepted-LGPL @@ -77,7 +77,10 @@ Requires: kf6-plasma%{?_isa} Conflicts: kdeplasma-addons < 5.5.0-3 # upstream name +# used by the plasma-framework package in Plasma 6 +%if %{without kf6_compat} Provides: plasma-framework = %{version}-%{release} +%endif %description %{summary}. @@ -91,7 +94,9 @@ Requires: kf5-kpackage-devel >= %{majmin} Requires: kf5-kservice-devel >= %{majmin} Requires: kf5-kwindowsystem-devel >= %{majmin} Requires: qt5-qtbase-devel +%if %{without kf6_compat} Provides: plasma-framework-devel = %{version}-%{release} +%endif %description devel The %{name}-devel package contains libraries and header files for developing applications that use %{name}. @@ -165,6 +170,9 @@ sed -e "s|@@VERSION@@|%{version}|g" fedora-plasma-cache.sh.in > \ %changelog +* Mon Nov 13 2023 Alessandro Astone - 5.111.0-5 +- Don't provide the plasma-frameworks name for Plasma 6 + * Mon Oct 16 2023 Alessandro Astone - 5.111.0-4 - Fix kf6-plasma requires to be arch-specific From 1bf92d42b5039ccf2aee6847f429c37c6743d024 Mon Sep 17 00:00:00 2001 From: Alessandro Astone Date: Fri, 24 Nov 2023 10:55:54 +0100 Subject: [PATCH 10/11] Don't require kf6-plasma --- kf5-plasma.spec | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/kf5-plasma.spec b/kf5-plasma.spec index 3174495..d868a39 100644 --- a/kf5-plasma.spec +++ b/kf5-plasma.spec @@ -4,7 +4,7 @@ Name: kf5-plasma Version: 5.111.0 -Release: 5%{?dist} +Release: 6%{?dist} Summary: KDE Frameworks 5 Tier 3 framework is foundation to build a primary user interface License: BSD-2-Clause AND BSD-3-Clause AND CC0-1.0 AND GPL-2.0-only AND GPL-2.0-or-later AND GPL-3.0-only AND LGPL-2.0-or-later AND LGPL-2.1-only AND LGPL-2.1-or-later AND LGPL-3.0-only AND LicenseRef-KDE-Accepted-GPL AND LicenseRef-KDE-Accepted-LGPL @@ -69,10 +69,6 @@ BuildRequires: qt5-qtx11extras-devel Requires: qt5-qtquickcontrols%{?_isa} Requires: qt5-qtquickcontrols2%{?_isa} -%if %{with kf6_compat} -Requires: kf6-plasma%{?_isa} -%endif - # https://bugzilla.redhat.com/1293415 Conflicts: kdeplasma-addons < 5.5.0-3 @@ -170,6 +166,9 @@ sed -e "s|@@VERSION@@|%{version}|g" fedora-plasma-cache.sh.in > \ %changelog +* Fri Nov 24 2023 Alessandro Astone - 5.111.0-6 +- Don't require kf6-plasma + * Mon Nov 13 2023 Alessandro Astone - 5.111.0-5 - Don't provide the plasma-frameworks name for Plasma 6 From 770500660520392ac252f0bffa6c2f952e275a10 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc=20Deop=20i=20Argem=C3=AD?= Date: Fri, 8 Dec 2023 21:24:50 +0100 Subject: [PATCH 11/11] 5.113.0 --- .gitignore | 1 + kf5-plasma.spec | 10 +++++----- sources | 2 +- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/.gitignore b/.gitignore index 9706b38..5a043d5 100644 --- a/.gitignore +++ b/.gitignore @@ -64,3 +64,4 @@ /plasma-framework-5.109.0.tar.xz /plasma-framework-5.110.0.tar.xz /plasma-framework-5.111.0.tar.xz +/plasma-framework-5.113.0.tar.xz diff --git a/kf5-plasma.spec b/kf5-plasma.spec index d868a39..f6c705b 100644 --- a/kf5-plasma.spec +++ b/kf5-plasma.spec @@ -3,8 +3,8 @@ %global framework plasma-framework Name: kf5-plasma -Version: 5.111.0 -Release: 6%{?dist} +Version: 5.113.0 +Release: 1%{?dist} Summary: KDE Frameworks 5 Tier 3 framework is foundation to build a primary user interface License: BSD-2-Clause AND BSD-3-Clause AND CC0-1.0 AND GPL-2.0-only AND GPL-2.0-or-later AND GPL-3.0-only AND LGPL-2.0-or-later AND LGPL-2.1-only AND LGPL-2.1-or-later AND LGPL-3.0-only AND LicenseRef-KDE-Accepted-GPL AND LicenseRef-KDE-Accepted-LGPL @@ -145,11 +145,8 @@ sed -e "s|@@VERSION@@|%{version}|g" fedora-plasma-cache.sh.in > \ %{_kf5_qtplugindir}/kpackage/packagestructure/*.so %{_kf5_plugindir}/kirigami/ %{_kf5_datadir}/plasma/ -#{_kf5_datadir}/kservices5/*.desktop %{_kf5_datadir}/kservicetypes5/*.desktop %{_kf5_mandir}/man1/plasmapkg2.1.* -# can find_lang handle this too somehow? -- rex -%lang(lt) %{_datadir}/locale/lt/LC_SCRIPTS/libplasma5/ %files devel %{_kf5_libdir}/cmake/KF5Plasma/ @@ -166,6 +163,9 @@ sed -e "s|@@VERSION@@|%{version}|g" fedora-plasma-cache.sh.in > \ %changelog +* Fri Dec 08 2023 Marc Deop i Argemí - 5.113.0-1 +- 5.113.0 + * Fri Nov 24 2023 Alessandro Astone - 5.111.0-6 - Don't require kf6-plasma diff --git a/sources b/sources index 68858cf..6744db1 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (plasma-framework-5.111.0.tar.xz) = 6e8a4821b295743b552e95900ed3f8a0ffdd4dc81a05748b4c1f59584f34638b1e0ddd8eef3686c71d9f61e5f11c4629982badb6632918e5c2296c60a6338462 +SHA512 (plasma-framework-5.113.0.tar.xz) = 46a9a249600b53b8f871fb9703584aba5a62bdf93bb826e6171ab8619d2199dbe98831a10e93f47239559fbd499644c2c4b3e3b7155829b0a3aece5ecaa08cab