From 8a04b69ac73ed45da6f953abb8ad65a690d1f065101a79832c9739d7fa7b9b85 Mon Sep 17 00:00:00 2001 From: Luca Beltrame Date: Thu, 21 Jan 2021 08:52:59 +0000 Subject: [PATCH] Add compatibility with qml-autoreqprov OBS-URL: https://build.opensuse.org/package/show/KDE:Frameworks5/plasma5-workspace?expand=0&rev=566 --- plasma5-workspace.changes | 5 +++++ plasma5-workspace.spec | 7 +++++++ 2 files changed, 12 insertions(+) diff --git a/plasma5-workspace.changes b/plasma5-workspace.changes index 16fce67..2c5ca2c 100644 --- a/plasma5-workspace.changes +++ b/plasma5-workspace.changes @@ -21,6 +21,11 @@ Wed Dec 30 13:12:07 UTC 2020 - Fabian Vogt - RPM got fixed, so use %fdupes on TW again +------------------------------------------------------------------- +Wed Dec 30 12:19:16 UTC 2020 - Fabian Vogt + +- Add compatibility with qml-autoreqprov + ------------------------------------------------------------------- Tue Dec 1 15:22:18 UTC 2020 - Fabian Vogt diff --git a/plasma5-workspace.spec b/plasma5-workspace.spec index 1920222..a7e0bb4 100644 --- a/plasma5-workspace.spec +++ b/plasma5-workspace.spec @@ -19,6 +19,9 @@ #Compat macro for new _fillupdir macro introduced in Nov 2017 %{!?_fillupdir: %global _fillupdir %{_localstatedir}/adm/fillup-templates} +# Internal QML imports +%global __requires_exclude qmlimport\\((org\\.kde\\.plasma\\.private|org\\.kde\\.private\\.kcm).* + %define kf5_version 5.58.0 %bcond_without lang @@ -191,6 +194,7 @@ Provides: %{name}-branding = %{_plasma5_bugfix} Provides: %{name}-branding-upstream = %{version} Provides: dbus(org.freedesktop.Notifications) Obsoletes: %{name}-branding-upstream < %{version} +Provides: qt5qmlimport(org.kde.plasma.shell.2) = 0 %description This package contains the basic packages for a Plasma workspace. @@ -339,6 +343,9 @@ Plasma 5 session with Wayland from a display manager. touch %{buildroot}%{_sysconfdir}/alternatives/default-xsession.desktop ln -s %{_sysconfdir}/alternatives/default-xsession.desktop %{buildroot}%{_datadir}/xsessions/default.desktop + # Backport of https://invent.kde.org/plasma/plasma-workspace/-/merge_requests/588 + rm -r %{buildroot}%{_kf5_plasmadir}/wallpapers/org.kde.image/platformcontents/touch + %fdupes %{buildroot}/%{_prefix} %post -p /sbin/ldconfig