Merge branch epel9-next into epel9

epel9 imports/epel9/plasma-workspace-5.27.11-1.el9
Troy Dawson 9 months ago
commit fb34369a60

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

@ -1,2 +1,2 @@
SHA512 (breeze-fedora-0.2.tar.gz) = ff800e686b0dcb498f321bb94d3a8274c89c092f5408ef1ec3fc65333f046aea43444144ecaf166792f807014383af87b1180dc7540905fc10dc375309f8b2a8 SHA512 (breeze-fedora-0.2.tar.gz) = ff800e686b0dcb498f321bb94d3a8274c89c092f5408ef1ec3fc65333f046aea43444144ecaf166792f807014383af87b1180dc7540905fc10dc375309f8b2a8
SHA512 (plasma-workspace-5.27.6.tar.xz) = 090c65ecb1664d5e55d52ff7a11e6402a2b9bb7a31c99fe3406c2c4111aada6102aaf3f5a110c6a13223e88ee164caf209d859fcb6823b638ca42bcbb683984d SHA512 (plasma-workspace-5.27.11.tar.xz) = d49b717bf4b074cd201a6807329d73d0defebc814c2d3dc2eb473e00bf030d1334fe9eb8cc8b3f3e019b54faf67dcc992c5a7bef1c85d7d2fb8ee70a6c6b3443

Loading…
Cancel
Save