Accepting request 835927 from home:Vogtinator:plasma5.20

Other half of the promised cleanup (but not fully built yet):

- Copy icon for org.kde.kcolorschemeeditor.desktop
- Clean up .spec file and remove obsolete workarounds

OBS-URL: https://build.opensuse.org/request/show/835927
OBS-URL: https://build.opensuse.org/package/show/KDE:Frameworks5/plasma5-workspace?expand=0&rev=537

plasma5-workspace.changes

@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Mon Sep 21 18:01:54 UTC 2020 - Fabian Vogt <fabian@ritter-vogt.de>
+
+- Copy icon for org.kde.kcolorschemeeditor.desktop
+- Clean up .spec file and remove obsolete workarounds
+
 -------------------------------------------------------------------
 Thu Sep 17 20:03:11 UTC 2020 - Fabian Vogt <fabian@ritter-vogt.de>
 

plasma5-workspace.spec

@@ -187,11 +187,6 @@ Provides:       %{name}-branding = %{_plasma5_bugfix}
 Provides:       %{name}-branding-upstream = %{version}
 Provides:       dbus(org.freedesktop.Notifications)
 Obsoletes:      %{name}-branding-upstream < %{version}
-# Later versions have a supplements in sni-qt
-%if 0%{?suse_version} < 1330
-# so Qt4-only apps have some colors in tray
-Recommends:     sni-qt
-%endif
 
 %description
 This package contains the basic packages for a Plasma workspace.
@@ -229,10 +224,8 @@ Can also be used by standalone tray apps.
 %package -n gmenudbusmenuproxy
 Summary:        GMenu to DBusMenu Proxy
 Group:          System/GUI/KDE
-%if 0%{?suse_version} >= 1500
 Recommends:     (unity-gtk2-module if libgtk-2_0-0)
 Recommends:     (unity-gtk3-module if libgtk-3-0)
-%endif
 
 %description -n gmenudbusmenuproxy
 This package provides a proxy translating GMenu (GTK Menu) to DBusMenu (the
@@ -303,8 +296,7 @@ Plasma 5 session with Wayland from a display manager.
 %lang_package
 
 %prep
-%setup -q -n plasma-workspace-%{version}
-%autopatch -p1
+%autosetup -p1 -n plasma-workspace-%{version}
 
 %build
   %cmake_kf5 -d build -- -DKDE_DEFAULT_HOME=.kde4 -DCMAKE_INSTALL_LOCALEDIR=%{_kf5_localedir}
@@ -319,18 +311,12 @@ Plasma 5 session with Wayland from a display manager.
   %endif
 
   %suse_update_desktop_file -r %{buildroot}%{_kf5_applicationsdir}/org.kde.klipper.desktop System TrayIcon
-
   mkdir -p %{buildroot}%{_kf5_iconsdir}/hicolor/48x48/apps/
   cp %{_kf5_iconsdir}/breeze/apps/48/klipper.svg %{buildroot}%{_kf5_iconsdir}/hicolor/48x48/apps/
 
-  # remove empty/invalid appstream xml files. kpackagetool5 generates invalid files sometimes...
-  # remove this once kpackagetool5 is fixed
-  find %{buildroot}%{_kf5_appstreamdir} -type f -size 0 -print -delete
-
-  # No wayland for Leap 42.x as no Xwayland available
-  %if 0%{?suse_version} <= 1320
-      rm -rfv %{buildroot}%{_kf5_sharedir}/wayland-sessions
-  %endif
+  # Copy the icon for org.kde.kcolorschemeeditor.desktop
+  mkdir -p %{buildroot}%{_kf5_iconsdir}/hicolor/32x32/apps/
+  cp %{_kf5_iconsdir}/breeze/preferences/32/preferences-desktop-color.svg %{buildroot}%{_kf5_iconsdir}/hicolor/32x32/apps/
 
   # Rename upstream session file to oS location
   mv %{buildroot}%{_kf5_sharedir}/xsessions/{plasma,plasma5}.desktop
@@ -397,6 +383,8 @@ fi
 %{_kf5_applicationsdir}/org.kde.kfontview.desktop
 %{_kf5_bindir}/kcminit
 %{_kf5_bindir}/kcminit_startup
+%{_kf5_bindir}/kfontinst
+%{_kf5_bindir}/kfontview
 %{_kf5_bindir}/klipper
 %{_kf5_bindir}/krunner
 %{_kf5_bindir}/ksmserver
@@ -488,6 +476,7 @@ fi
 %{_kf5_plasmadir}/
 %{_kf5_sharedir}/solid/
 %{_kf5_sharedir}/kio_desktop/
+%{_kf5_iconsdir}/hicolor/32x32/apps/preferences-desktop-color.svg
 %{_kf5_iconsdir}/hicolor/48x48/apps/klipper.svg
 %{_kf5_iconsdir}/hicolor/*/mimetypes/fonts-package.png
 %{_kf5_iconsdir}/hicolor/*/apps/kfontview.png
@@ -504,8 +493,6 @@ fi
 %{_kf5_sharedir}/kpackage/kcms/kcm_feedback
 %{_kf5_sharedir}/kpackage/kcms/kcm5_icons
 %{_kf5_sharedir}/kpackage/kcms/kcm_desktoptheme
-%{_kf5_bindir}/kfontinst
-%{_kf5_bindir}/kfontview
 %dir %{_kf5_libdir}/libexec/kauth
 %{_kf5_libdir}/libexec/kauth/fontinst
 %{_kf5_libdir}/libexec/kauth/fontinst_helper
@@ -555,14 +542,11 @@ fi
 %ghost %{_sysconfdir}/alternatives/default-xsession.desktop
 %{_kf5_sharedir}/xsessions/default.desktop
 
-# No wayland for 42.x as no Xwayland available
-%if 0%{?suse_version} > 1320
 %files -n plasma5-session-wayland
 %license COPYING*
 %dir %{_datadir}/wayland-sessions/
 %{_datadir}/wayland-sessions/plasmawayland.desktop
 %{_datadir}/wayland-sessions/plasmafullwayland.desktop
-%endif
 
 %if %{with lang}
 %files lang -f %{name}.lang