diff --git a/.gitignore b/.gitignore index 3810187..07acf2d 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,2 @@ SOURCES/breeze-fedora-0.2.tar.gz -SOURCES/plasma-workspace-5.27.6.tar.xz +SOURCES/plasma-workspace-5.27.11.tar.xz diff --git a/.plasma-workspace.metadata b/.plasma-workspace.metadata index c94e4b7..2496952 100644 --- a/.plasma-workspace.metadata +++ b/.plasma-workspace.metadata @@ -1,2 +1,2 @@ 8807a1fdc13aa7a952d7e9d9e9f6b5ebe754fe5b SOURCES/breeze-fedora-0.2.tar.gz -4098c89c67501b813a87b3d52b955449d6fb66a2 SOURCES/plasma-workspace-5.27.6.tar.xz +2e6608a96467fc88579b8bb717231e334992cb45 SOURCES/plasma-workspace-5.27.11.tar.xz diff --git a/SPECS/plasma-workspace.spec b/SPECS/plasma-workspace.spec index 8896f50..db6bde6 100644 --- a/SPECS/plasma-workspace.spec +++ b/SPECS/plasma-workspace.spec @@ -5,14 +5,14 @@ %global kf5_version_min 5.98.0 # Control wayland by default -%if (0%{?rhel} && 0%{?rhel} <= 9) +%if (0%{?rhel} && 0%{?rhel} < 9) %bcond_with wayland_default %else %bcond_without wayland_default %endif # Control sddm wayland by default -%if (0%{?fedora} && 0%{?fedora} < 38) || (0%{?rhel} && 0%{?rhel} <= 9) +%if (0%{?fedora} && 0%{?fedora} < 38) || (0%{?rhel} && 0%{?rhel} < 9) %bcond_with sddm_wayland_default %else %bcond_without sddm_wayland_default @@ -27,21 +27,13 @@ Name: plasma-workspace Summary: Plasma workspace, applications and applets -Version: 5.27.6 -Release: 1%{?dist}.1 +Version: 5.27.11 +Release: 1%{?dist} License: GPLv2+ URL: https://invent.kde.org/plasma/%{name} -%global revision %(echo %{version} | cut -d. -f3) -%if %{revision} >= 50 -%global majmin_ver %(echo %{version} | cut -d. -f1,2).50 -%global stable unstable -%else -%global majmin_ver %(echo %{version} | cut -d. -f1,2) -%global stable stable -%endif -Source0: http://download.kde.org/%{stable}/plasma/%{version}/%{name}-%{version}.tar.xz +Source0: http://download.kde.org/%{stable_kf5}/plasma/%{version}/%{name}-%{version}.tar.xz # filter qml/plugins provides %global __provides_exclude_from ^(%{_kf5_qmldir}/.*\\.so|%{_kf5_qtplugindir}/.*\\.so)$ @@ -62,7 +54,7 @@ Source20: breeze-fedora-0.2.tar.gz Source40: ssh-agent.conf Source41: spice-vdagent.conf -## upstream Patches (master branch) +# upstream patches ## upstreamable Patches @@ -174,11 +166,11 @@ BuildRequires: kf5-kquickcharts-devel >= %{kf5_version_min} BuildRequires: kf5-kwayland-devel >= %{kf5_version_min} BuildRequires: wayland-devel >= 1.3.0 -BuildRequires: libkscreen-qt5-devel >= %{majmin_ver} -BuildRequires: libksysguard-devel >= %{majmin_ver} -BuildRequires: kscreenlocker-devel >= %{majmin_ver} -BuildRequires: kwin-devel >= %{majmin_ver} -BuildRequires: layer-shell-qt-devel >= %{majmin_ver} +BuildRequires: libkscreen-qt5-devel >= %{majmin_ver_kf5} +BuildRequires: libksysguard-devel >= %{majmin_ver_kf5} +BuildRequires: kscreenlocker-devel >= %{majmin_ver_kf5} +BuildRequires: kwin-devel >= %{majmin_ver_kf5} +BuildRequires: layer-shell-qt-devel >= %{majmin_ver_kf5} BuildRequires: PackageKit-Qt5-devel @@ -228,9 +220,9 @@ Requires: (policycoreutils if selinux-policy) # for libkdeinit5_* %{?kf5_kinit_requires} -Requires: kactivitymanagerd%{?_isa} >= %{majmin_ver} -Requires: khotkeys%{?_isa} >= %{majmin_ver} -Requires: ksystemstats%{?_isa} >= %{majmin_ver} +Requires: kactivitymanagerd%{?_isa} >= %{majmin_ver_kf5} +Requires: khotkeys%{?_isa} >= %{majmin_ver_kf5} +Requires: ksystemstats%{?_isa} >= %{majmin_ver_kf5} Requires: kf5-baloo >= %{kf5_version_min} Requires: kf5-kded >= %{kf5_version_min} Requires: kf5-kdoctools >= %{kf5_version_min} @@ -242,14 +234,14 @@ Requires: qt5-qtgraphicaleffects # The new volume control for PulseAudio %if 0%{?fedora} || 0%{?rhel} > 7 -Recommends: plasma-pa >= %{majmin_ver} +Recommends: plasma-pa >= %{majmin_ver_kf5} %endif # Without the platformtheme plugins we get broken fonts Requires: kf5-frameworkintegration # For krunner -Recommends: plasma-milou >= %{majmin_ver} +Recommends: plasma-milou >= %{majmin_ver_kf5} # https://pagure.io/fedora-kde/SIG/issue/303 Recommends: kde-inotify-survey @@ -257,11 +249,14 @@ Recommends: kde-inotify-survey # https://pagure.io/fedora-kde/SIG/issue/354 Recommends: kf5-audiocd-kio +# For a11y +Recommends: orca + # powerdevil has a versioned dep on libkworkspace5, so (may?) # need to avoid this dep when bootstrapping %if ! 0%{?bootstrap} # Power management -Requires: powerdevil >= %{majmin_ver} +Requires: powerdevil >= %{majmin_ver_kf5} %endif Requires: dbus @@ -287,10 +282,10 @@ Requires: plasma-lookandfeel-fedora = %{version}-%{release} Requires: systemd # Oxygen -Requires: oxygen-sounds >= %{majmin_ver} +Requires: oxygen-sounds >= %{majmin_ver_kf5} # PolicyKit authentication agent -Requires: polkit-kde >= %{majmin_ver} +Requires: polkit-kde >= %{majmin_ver_kf5} # onscreen keyboard Requires: maliit-keyboard @@ -310,7 +305,7 @@ Provides: plasmashell = %{version} # Note: We should require >= %%{version}, but that creates a circular dependency # at build time of plasma-desktop, because it provides the needed dependency, but # also needs plasma-workspace to build. So for now the dependency is unversioned. -Requires: plasmashell >= %{majmin_ver} +Requires: plasmashell >= %{majmin_ver_kf5} %endif # when -common, libkworkspace5 was split out @@ -427,7 +422,7 @@ BuildArch: noarch Summary: Plasma Wayland SDDM greeter configuration Provides: sddm-greeter-displayserver Conflicts: sddm-greeter-displayserver -Requires: kwin-wayland >= %{majmin_ver} +Requires: kwin-wayland >= %{majmin_ver_kf5} Requires: maliit-keyboard %if %{with sddm_wayland_default} Supplements: (sddm and plasma-workspace-wayland) @@ -446,14 +441,13 @@ to use KWin for the Wayland compositor for the greeter. %package wayland Summary: Wayland support for Plasma Requires: %{name} = %{version}-%{release} -Requires: kwin-wayland >= %{majmin_ver} -Requires: kwayland-integration%{?_isa} >= %{majmin_ver} +Requires: kwin-wayland >= %{majmin_ver_kf5} +Requires: kwayland-integration%{?_isa} >= %{majmin_ver_kf5} Requires: xorg-x11-server-Xwayland Requires: qt5-qtwayland%{?_isa} # startplasmacompositor deps Requires: qt5-qttools -# start with soft dep -- rdieter -Recommends: xdg-desktop-portal-kde >= %{majmin_ver} +Requires: xdg-desktop-portal-kde >= %{majmin_ver_kf5} %description wayland %{summary}. @@ -466,9 +460,11 @@ Provides: %{name}-xorg%{?_isa} = %{version}-%{release} # Split of Xorg session into subpackage Obsoletes: %{name} < 5.19.5-2 Requires: %{name} = %{version}-%{release} -Requires: kwin-x11 >= %{majmin_ver} +Requires: kwin-x11 >= %{majmin_ver_kf5} Requires: xorg-x11-server-Xorg Requires: xsetroot +# Plasma X11 is deprecated and will be removed with Plasma 6.0 +Provides: deprecated() %description x11 %{summary}. @@ -804,11 +800,45 @@ fi %changelog -* Mon Jan 15 2024 Arkady L. Shane - 5.27.6-1.1 +* Sat Mar 09 2024 Alessandro Astone - 5.27.11-1 +- 5.27.11 + +* Mon Jan 15 2024 Arkady L. Shane - 5.27.10-1 - Rebuilt for MSVSphere 9.3 -* Wed Nov 29 2023 Troy Dawson - 5.27.6-1.1 -- Requires: desktop-backgrounds-compat for RHEL +* Sat Dec 16 2023 Marc Deop i Argemí - 5.27.10-1 +- 5.27.10 + +* Sat Nov 25 2023 Marc Deop i Argemí - 5.27.9.1-3 +- Add upstream patch #2250757 + +* Fri Nov 03 2023 Neal Gompa - 5.27.9.1-2 +- Mark plasma-workspace-x11 as deprecated + +* Wed Oct 25 2023 Marc Deop i Argemí - 5.27.9.1-1 +- 5.27.9.1 +- Replace old %%stable macro + +* Tue Oct 24 2023 Steve Cossette - 5.27.9-1 +- 5.27.9 + +* Fri Sep 22 2023 Neal Gompa - 5.27.8-2 +- Recommend orca for a11y and require xdg-desktop-portal-kde for wayland + +* Tue Sep 12 2023 justin.zobel@gmail.com - 5.27.8-1 +- 5.27.8 + +* Sat Aug 12 2023 Marc Deop i Argemí - 5.27.7-2 +- Add upstream patch + +* Tue Aug 01 2023 Marc Deop i Argemí - 5.27.7-1 +- 5.27.7 + +* Fri Jul 21 2023 Fedora Release Engineering - 5.27.6-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + +* Tue Jul 11 2023 František Zatloukal - 5.27.6-2 +- Rebuilt for ICU 73.2 * Sun Jun 25 2023 Marc Deop i Argemí - 5.27.6-1 - 5.27.6 @@ -1841,7 +1871,7 @@ fi - Plasma 5.5.3 * Thu Dec 31 2015 Rex Dieter - 5.5.2-2 -- use %%majmin_ver for most plasma-related deps +- use %%majmin_ver_kf5 for most plasma-related deps - tighten plugin deps using %%_isa - update URL @@ -1901,7 +1931,7 @@ fi - startkde: don't try to source things in a subshell, don't munge XDG_DATA_DIRS needlessly * Sun Oct 04 2015 Rex Dieter 5.4.2-3 -- consistently use %%{majmin_ver} macro for other plasma5-related deps +- consistently use %%{majmin_ver_kf5} macro for other plasma5-related deps * Sat Oct 03 2015 Rex Dieter - 5.4.2-2 - .spec cosmetics, use %%license