From 336d49bc0c3cba67c41e77275e27af99d9b28b1e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc=20Deop=20i=20Argem=C3=AD?= Date: Sun, 2 Apr 2023 10:21:00 +0200 Subject: [PATCH 1/3] 5.105.0 --- .gitignore | 1 + kf5-plasma.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 2eb04a0..507aa31 100644 --- a/.gitignore +++ b/.gitignore @@ -57,3 +57,4 @@ /plasma-framework-5.102.0.tar.xz /plasma-framework-5.103.0.tar.xz /plasma-framework-5.104.0.tar.xz +/plasma-framework-5.105.0.tar.xz diff --git a/kf5-plasma.spec b/kf5-plasma.spec index 84d945a..1e619c8 100644 --- a/kf5-plasma.spec +++ b/kf5-plasma.spec @@ -1,8 +1,8 @@ %global framework plasma-framework Name: kf5-plasma -Version: 5.104.0 -Release: 2%{?dist} +Version: 5.105.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 @@ -167,6 +167,9 @@ sed -e "s|@@VERSION@@|%{version}|g" fedora-plasma-cache.sh.in > \ %changelog +* Sun Apr 02 2023 Marc Deop i Argemí - 5.105.0-1 +- 5.105.0 + * Thu Mar 09 2023 Marc Deop i Argemí - 5.104.0-2 - 5.104.0 re-spin diff --git a/sources b/sources index dc61601..b459155 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (plasma-framework-5.104.0.tar.xz) = 0c327d8cb96b75e41a75fa1ff9a68f4d983f27e8c03c1121efba3dc031b286c331b7aad069a7432b51ca3255e246b980e2e44f60c7f769d291fc25665b17e19f +SHA512 (plasma-framework-5.105.0.tar.xz) = 271218b45176366a34bae6a813eb07a9d4f69f65f3665bbd237721537d58c2406a02d322ce32bb2b760bc28f82653b402d0c977cf9c67844181330c1c9d97c5a From 69070ebe75fdae977fb892809d16a0fc44171c61 Mon Sep 17 00:00:00 2001 From: Neal Gompa Date: Tue, 25 Apr 2023 00:16:18 -0400 Subject: [PATCH 2/3] Restore kf5-kwayland BR to RHEL builds This should correct the various glitches we've been seeing with the Wayland session for KDE Plasma on RHEL/CentOS systems. --- kf5-plasma.spec | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/kf5-plasma.spec b/kf5-plasma.spec index 1e619c8..d12fe5c 100644 --- a/kf5-plasma.spec +++ b/kf5-plasma.spec @@ -2,7 +2,7 @@ Name: kf5-plasma Version: 5.105.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 @@ -42,9 +42,7 @@ BuildRequires: kf5-kpackage-devel >= %{majmin} BuildRequires: kf5-kparts-devel >= %{majmin} BuildRequires: kf5-kservice-devel >= %{majmin} BuildRequires: kf5-kirigami2-devel >= %{majmin} -%if 0%{?fedora} BuildRequires: kf5-kwayland-devel >= %{majmin} -%endif BuildRequires: kf5-kwidgetsaddons-devel >= %{majmin} BuildRequires: kf5-kwindowsystem-devel >= %{majmin} BuildRequires: kf5-kxmlgui-devel >= %{majmin} @@ -167,6 +165,9 @@ sed -e "s|@@VERSION@@|%{version}|g" fedora-plasma-cache.sh.in > \ %changelog +* Tue Apr 25 2023 Neal Gompa - 5.105.0-2 +- Restore kf5-kwayland BR to RHEL builds + * Sun Apr 02 2023 Marc Deop i Argemí - 5.105.0-1 - 5.105.0 From 3c07dd4023ca20586cd189893063971a0740c78f Mon Sep 17 00:00:00 2001 From: Troy Dawson Date: Tue, 25 Apr 2023 09:11:23 -0700 Subject: [PATCH 3/3] Remove all fedora conditionals. --- kf5-plasma.spec | 6 ------ 1 file changed, 6 deletions(-) diff --git a/kf5-plasma.spec b/kf5-plasma.spec index d12fe5c..b825e57 100644 --- a/kf5-plasma.spec +++ b/kf5-plasma.spec @@ -67,10 +67,8 @@ BuildRequires: qt5-qtx11extras-devel Requires: qt5-qtquickcontrols%{?_isa} Requires: qt5-qtquickcontrols2%{?_isa} -%if 0%{?fedora} # https://bugzilla.redhat.com/1293415 Conflicts: kdeplasma-addons < 5.5.0-3 -%endif # upstream name Provides: plasma-framework = %{version}-%{release} @@ -114,11 +112,9 @@ install -m644 -p %{SOURCE10} . mkdir -p %{buildroot}%{_kf5_datadir}/plasma/plasmoids mkdir -p %{buildroot}%{_kf5_qmldir}/org/kde/private -%if 0%{?fedora} mkdir -p %{buildroot}%{_sysconfdir}/xdg/plasma-workspace/env sed -e "s|@@VERSION@@|%{version}|g" fedora-plasma-cache.sh.in > \ %{buildroot}%{_sysconfdir}/xdg/plasma-workspace/env/fedora-plasma-cache.sh -%endif %ldconfig_scriptlets @@ -126,9 +122,7 @@ sed -e "s|@@VERSION@@|%{version}|g" fedora-plasma-cache.sh.in > \ %files -f %{name}.lang %doc README.md %license LICENSES/*.txt -%if 0%{?fedora} %{_sysconfdir}/xdg/plasma-workspace/env/fedora-plasma-cache.sh -%endif %{_kf5_bindir}/plasmapkg2 %{_kf5_libdir}/libKF5Plasma.so.* %{_kf5_libdir}/libKF5PlasmaQuick.so.*