Accepting request 623180 from KDE:Frameworks5

OBS-URL: https://build.opensuse.org/request/show/623180
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/plasma5-workspace?expand=0&rev=97

plasma5-workspace.changes

@@ -1,3 +1,15 @@
+-------------------------------------------------------------------
+Mon Jul 16 08:25:26 UTC 2018 - fabian@ritter-vogt.de
+
+- Also split off gmenudbusmenuproxy to allow for Recommends
+- plasma-framework-private is no more
+- Improve description of xembedsniproxy
+
+-------------------------------------------------------------------
+Wed Jul 11 08:17:32 UTC 2018 - mimi.vx@gmail.com
+
+- move xembedsniproxy to own subpackage 
+
 -------------------------------------------------------------------
 Tue Jul 10 14:02:22 CEST 2018 - fabian@ritter-vogt.de
 

plasma5-workspace.spec

@@ -25,8 +25,8 @@
 Name:           plasma5-workspace
 # Full Plasma 5 version (e.g. 5.9.1)
 %{!?_plasma5_bugfix: %global _plasma5_bugfix %{version}}
-# Lasted ABI-stable Plasma (e.g. 5.8 in KF5, but 5.9.1 in KUF)
-%{!?_plasma5_version: %global _plasma5_version %(echo %{_plasma5_bugfix} | awk -F. '{print $1"."$2}')}
+# Latest ABI-stable Plasma (e.g. 5.8 in KF5, but 5.9.1 in KUF)
+%{!?_plasma5_version: %define _plasma5_version %(echo %{_plasma5_bugfix} | awk -F. '{print $1"."$2}')}
 Version:        5.13.3
 Release:        0
 Summary:        The KDE Plasma Workspace Components
@@ -145,13 +145,15 @@ Requires:       libqt5-qtquickcontrols
 # needed by krunner
 Requires:       milou5 >= %{_plasma5_version}
 # boo#912317
+Requires:       gmenudbusmenuproxy >= %{_plasma5_version}
 Requires:       oxygen5-sounds >= %{_plasma5_version}
 Requires:       solid-imports
+Requires:       xembedsniproxy >= %{_plasma5_version}
 # /usr/bin/startkde calls xprop
 Requires:       xprop
 # hardcode versions of plasma-framework-components and plasma-framework-private packages, as upstream doesn't keep backwards compability there
 %requires_ge    plasma-framework-components
-%requires_ge    plasma-framework-private
+%requires_ge    plasma-framework
 Recommends:     %{name}-lang
 Recommends:     kio-extras5
 # The lockscreen has a button to open a virtual keyboard
@@ -168,8 +170,6 @@ Provides:       %{name}-branding = %{_plasma5_bugfix}
 Provides:       %{name}-branding-upstream = %{version}
 Provides:       dbus(org.freedesktop.Notifications)
 Obsoletes:      %{name}-branding-upstream < %{version}
-Provides:       xembed-sni-proxy = %{version}
-Obsoletes:      xembed-sni-proxy < %{version}
 # Later versions have a supplements in sni-qt
 %if 0%{?suse_version} < 1330
 # so Qt4-only apps have some colors in tray
@@ -200,6 +200,28 @@ Group:          Development/Libraries/KDE
 This package contains the basic packages for a K Desktop Environment
 workspace.
 
+%package -n xembedsniproxy
+Summary:        XEmbed SNI Proxy
+Group:          System/Gui/KDE
+Provides:       xembed-sni-proxy = %{version}
+Obsoletes:      xembed-sni-proxy < %{version}
+
+%description -n xembedsniproxy
+This package provides a proxy translating XEmbed for SNI trays.
+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
+standard), useful for global menu implementations.
+
 %package devel
 Summary:        The KDE Plasma Workspace Components
 Group:          Development/Libraries/KDE
@@ -345,7 +367,6 @@ fi
 
 %files
 %license COPYING*
-%{_kf5_bindir}/xembedsniproxy
 %{_kf5_bindir}/kcheckrunning
 %{_kf5_bindir}/kcminit
 %{_kf5_bindir}/kcminit_startup
@@ -362,11 +383,9 @@ fi
 %{_kf5_bindir}/startplasmacompositor
 %{_kf5_bindir}/systemmonitor
 %{_kf5_bindir}/plasma_waitforname
-%{_kf5_bindir}/gmenudbusmenuproxy
 %{_kf5_configdir}/autostart/org.kde.plasmashell.desktop
 %{_kf5_configdir}/autostart/klipper.desktop
 %{_kf5_configdir}/autostart/krunner.desktop
-%{_kf5_configdir}/autostart/xembedsniproxy.desktop
 %config %{_kf5_configdir}/plasmoids.knsrc
 %config %{_kf5_configdir}/wallpaper.knsrc
 %config %{_kf5_configdir}/taskmanagerrulesrc
@@ -415,6 +434,15 @@ fi
 %dir %{_kf5_sharedir}/sddm/themes
 %{_kf5_sharedir}/sddm/themes/breeze/
 %{_kf5_debugdir}/*.categories
+
+%files -n xembedsniproxy
+%license COPYING*
+%{_kf5_bindir}/xembedsniproxy
+%{_kf5_configdir}/autostart/xembedsniproxy.desktop
+
+%files -n gmenudbusmenuproxy
+%license COPYING*
+%{_kf5_bindir}/gmenudbusmenuproxy
 %{_kf5_configdir}/autostart/gmenudbusmenuproxy.desktop
 
 %files devel
@@ -437,7 +465,7 @@ fi
 %{_kf5_sharedir}/dbus-1/interfaces/
 
 %files -n plasma5-session
-%doc COPYING*
+%license COPYING*
 %{_kf5_sharedir}/xsessions/plasma5.desktop
 %{_kf5_sharedir}/xsessions/kde-plasma.desktop
 %ghost %{_sysconfdir}/alternatives/default-xsession.desktop
@@ -446,7 +474,7 @@ fi
 # No wayland for 42.x as no Xwayland available
 %if 0%{?suse_version} > 1320
 %files -n plasma5-session-wayland
-%doc COPYING*
+%license COPYING*
 %dir %{_datadir}/wayland-sessions/
 %{_datadir}/wayland-sessions/plasmawayland.desktop
 %endif