From 1f582e9c4ea98fbe9d304337fa51f4bd46a74251 Mon Sep 17 00:00:00 2001 From: Marie Loise Nolden Date: Sun, 10 Apr 2022 16:21:50 +0000 Subject: [PATCH 1/4] Update kf5-plasma.spec --- kf5-plasma.spec | 1 - 1 file changed, 1 deletion(-) diff --git a/kf5-plasma.spec b/kf5-plasma.spec index 283a90f..275442c 100644 --- a/kf5-plasma.spec +++ b/kf5-plasma.spec @@ -22,7 +22,6 @@ Source0: http://download.kde.org/%{stable}/frameworks/%{majmin}/%{framework}-%{v Source10: fedora-plasma-cache.sh.in ## upstream patches -Patch29: 0029-Don-t-install-the-heading-SVG-in-breeze-light-and-br.patch # filter qml provides %global __provides_exclude_from ^%{_kf5_qmldir}/.*\\.so$ From b89cefa7e32cadc425e704579e34f812ae4afef6 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Fri, 13 May 2022 11:27:34 -0500 Subject: [PATCH 2/4] 5.94.0 --- .gitignore | 1 + kf5-plasma.spec | 7 +++++-- sources | 3 +-- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 720fc98..56397c9 100644 --- a/.gitignore +++ b/.gitignore @@ -46,3 +46,4 @@ /plasma-framework-5.91.0.tar.xz /plasma-framework-5.92.0.tar.xz ./plasma-framework-5.93.tar.xz +/plasma-framework-5.94.0.tar.xz diff --git a/kf5-plasma.spec b/kf5-plasma.spec index 275442c..7220c6c 100644 --- a/kf5-plasma.spec +++ b/kf5-plasma.spec @@ -1,8 +1,8 @@ %global framework plasma-framework Name: kf5-plasma -Version: 5.93.0 -Release: 2%{?dist} +Version: 5.94.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 @@ -172,6 +172,9 @@ sed -e "s|@@VERSION@@|%{version}|g" fedora-plasma-cache.sh.in > \ %changelog +* Fri May 13 2022 Rex Dieter - 5.94.0-1 +- 5.94.0 + * Sun Apr 10 2022 Justin Zobel - 5.93-1 - Update to 5.93 diff --git a/sources b/sources index d523e51..7ef0cb0 100644 --- a/sources +++ b/sources @@ -1,2 +1 @@ -SHA512 (plasma-framework-5.92.0.tar.xz) = 6efbb9f03ec11804b12cda209dc665468cf6f56ecf712a136a5cf1ea2cb1deb1d427896770b12c18094a2d7f0ef69da9dcbe52b16ae2126e8382ade74d8ce54c -SHA512 (plasma-framework-5.93.0.tar.xz) = df876c422d2de82325537bfdce4db016dc649202f334de063403c15f44d554c4b0f6707e02c8890e269bdb71c17fdd31f651fad3ed7506f23a110d725fd8ccf8 +SHA512 (plasma-framework-5.94.0.tar.xz) = 071e0ce261516e4a7ab1105f86304e5dae7c16a9663980222cf60922ae6bf785cd2b0447b7a2f2a57e2a2396c1de15655c8a7c02568d81652da946a6384b9eb7 From 3d768c127ea165f0fc12b1c9756f1da65734825f Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Tue, 17 May 2022 08:07:26 -0500 Subject: [PATCH 3/4] fix changelog --- ...e-heading-SVG-in-breeze-light-and-br.patch | 40 ------------------- kf5-plasma.spec | 8 ++-- 2 files changed, 4 insertions(+), 44 deletions(-) delete mode 100644 0029-Don-t-install-the-heading-SVG-in-breeze-light-and-br.patch diff --git a/0029-Don-t-install-the-heading-SVG-in-breeze-light-and-br.patch b/0029-Don-t-install-the-heading-SVG-in-breeze-light-and-br.patch deleted file mode 100644 index d2a5437..0000000 --- a/0029-Don-t-install-the-heading-SVG-in-breeze-light-and-br.patch +++ /dev/null @@ -1,40 +0,0 @@ -From 7352045b388f4b0ef553706bd219457e5018ce4e Mon Sep 17 00:00:00 2001 -From: Marco Martin -Date: Mon, 28 Mar 2022 21:20:16 +0000 -Subject: [PATCH 29/30] Don't install the heading SVG in breeze-light and - breeze-dark Plasma themes - -Installing that file there was an acky workaround that got broken by 2cccf230. ---- - src/desktoptheme/breeze-dark/CMakeLists.txt | 5 +---- - src/desktoptheme/breeze-light/CMakeLists.txt | 4 ---- - 2 files changed, 1 insertion(+), 8 deletions(-) - -diff --git a/src/desktoptheme/breeze-dark/CMakeLists.txt b/src/desktoptheme/breeze-dark/CMakeLists.txt -index 8f2078e4d..7f8f99062 100644 ---- a/src/desktoptheme/breeze-dark/CMakeLists.txt -+++ b/src/desktoptheme/breeze-dark/CMakeLists.txt -@@ -8,7 +8,4 @@ install( - FILES colors "${CMAKE_CURRENT_BINARY_DIR}/metadata.desktop" - DESTINATION ${PLASMA_DATA_INSTALL_DIR}/desktoptheme/breeze-dark - ) --install( -- FILES ${PROJECT_BINARY_DIR}/src/desktoptheme/breeze/default.gzipped/widgets/plasmoidheading.svgz -- DESTINATION ${PLASMA_DATA_INSTALL_DIR}/desktoptheme/breeze-dark/widgets --) -+ -diff --git a/src/desktoptheme/breeze-light/CMakeLists.txt b/src/desktoptheme/breeze-light/CMakeLists.txt -index 678033cec..6688a603b 100644 ---- a/src/desktoptheme/breeze-light/CMakeLists.txt -+++ b/src/desktoptheme/breeze-light/CMakeLists.txt -@@ -8,7 +8,3 @@ install( - FILES colors "${CMAKE_CURRENT_BINARY_DIR}/metadata.desktop" - DESTINATION ${PLASMA_DATA_INSTALL_DIR}/desktoptheme/breeze-light - ) --install( -- FILES ${PROJECT_BINARY_DIR}/src/desktoptheme/breeze/default.gzipped/widgets/plasmoidheading.svgz -- DESTINATION ${PLASMA_DATA_INSTALL_DIR}/desktoptheme/breeze-light/widgets --) --- -2.35.1 - diff --git a/kf5-plasma.spec b/kf5-plasma.spec index 7220c6c..b3d87c0 100644 --- a/kf5-plasma.spec +++ b/kf5-plasma.spec @@ -241,16 +241,16 @@ sed -e "s|@@VERSION@@|%{version}|g" fedora-plasma-cache.sh.in > \ * Tue Jan 26 2021 Fedora Release Engineering - 5.78.0-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild -* Mon Jan 4 08:58:21 CST 2021 Rex Dieter - 5.78.0-1 +* Mon Jan 4 2021 Rex Dieter - 5.78.0-1 - 5.78.0 -* Sun Dec 13 14:21:30 CST 2020 Rex Dieter - 5.77.0-1 +* Sun Dec 13 2020 Rex Dieter - 5.77.0-1 - 5.77.0 -* Thu Nov 19 09:14:50 CST 2020 Rex Dieter - 5.76.0-1 +* Thu Nov 19 2020 Rex Dieter - 5.76.0-1 - 5.76.0 -* Wed Oct 14 10:08:40 CDT 2020 Rex Dieter - 5.75.0-1 +* Wed Oct 14 2020 Rex Dieter - 5.75.0-1 - 5.75.0 * Fri Sep 18 2020 Jan Grulich - 5.74.0-1 From 569cf8b8e751b91b5b960bae050a175796ef369d Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Tue, 17 May 2022 08:50:57 -0500 Subject: [PATCH 4/4] update %%files --- kf5-plasma.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kf5-plasma.spec b/kf5-plasma.spec index b3d87c0..2f79daf 100644 --- a/kf5-plasma.spec +++ b/kf5-plasma.spec @@ -151,7 +151,7 @@ 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}/kservices5/*.desktop %{_kf5_datadir}/kservicetypes5/*.desktop %{_kf5_mandir}/man1/plasmapkg2.1.* # can find_lang handle this too somehow? -- rex