[kdebase-workspace] ksysguard(-libs) subpkg libkworkspace subpkg kdm: Requires: libkworkspace

Mon Oct 10 22:15:40 UTC 2011

commit 5df796ea847d71db099d8aae04fa9cc919405d11
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Mon Oct 10 17:15:31 2011 -0500

    ksysguard(-libs) subpkg
    libkworkspace subpkg
    kdm: Requires: libkworkspace

 kdebase-workspace.spec |  135 ++++++++++++++++++++++++++++++++++++++---------
 1 files changed, 109 insertions(+), 26 deletions(-)
---

diff --git a/kdebase-workspace.spec b/kdebase-workspace.spec
index 753c5fc..d45e126 100644
--- a/kdebase-workspace.spec
+++ b/kdebase-workspace.spec
@@ -9,7 +9,7 @@
 Summary: KDE Workspace
 Name:    kdebase-workspace
 Version: 4.7.2
-Release: 1%{?dist}
+Release: 3%{?dist}
 
 License: GPLv2
 Group:   User Interface/Desktops
@@ -156,7 +156,10 @@ Requires: kdebase-runtime >= %{version}
 # for kcm_keyboard
 Requires: iso-codes
 Requires: kio_sysinfo
-Requires: ksysguardd = %{version}-%{release}
+%if 0%{?fedora} < 17
+# upgrade path
+Requires: ksysguard = %{version}-%{release}
+%endif
 # startkde references: dbus-launch df mkdir test xmessage xprop xrandr xrdb xset xsetroot
 Requires: coreutils
 Requires: dbus-x11
@@ -191,7 +194,6 @@ This package contains:
 * kmenuedit (the menu editor)
 * krandrtray (resize and rotate X screens)
 * krunner (a command run interface)
-* ksysguard (a performance monitor)
 * kwin (the window manager of KDE)
 * plasma (the KDE desktop, panels and widgets workspace application)
 * systemsettings (the configuration editor)
@@ -200,7 +202,9 @@ This package contains:
 Group:    Development/Libraries
 Summary:  Development files for %{name}
 Provides: solid-bluetooth-devel = %{version}-%{release} 
+Requires: ksysguard-libs%{?_isa} = %{version}-%{release}
 Requires: %{name}-libs%{?_isa} = %{version}-%{release}
+Requires: libkworkspace%{?_isa} = %{version}-%{release}
 Requires: kdelibs4-devel
 %description devel
 %{summary}.
@@ -238,18 +242,42 @@ Summary: The KDE login manager
 group: User Interface/X
 Provides: kdebase-kdm = %{version}-%{release}
 Provides: service(graphical-login) = kdm
-Requires: kdelibs4%{?_isa} >= %{version}
+Requires: libkworkspace%{?_isa} =  %{version}-%{release}
 Requires: kde-settings-kdm
 %description -n kdm
 KDM provides the graphical login screen, shown shortly after boot up,
 log out, and when user switching.
 
+%package -n ksysguard
+Summary: KDE System Monitor
+Requires: ksysguardd = %{version}-%{release}
+Requires: ksysguard-libs%{?_isa} = %{version}-%{release}
+%description -n ksysguard
+%{summary}
+
+%package -n ksysguard-libs
+Summary: Runtime libraries for ksysguard
+# when spilt occurred
+Conflicts: kdebase-workspace-libs < 4.7.2-2
+Requires: kdelibs4%{?_isa} >= %{version}
+%description -n ksysguard-libs
+%{summary}.
+
 %package -n ksysguardd
 Summary: Performance monitor daemon
 Group:   System Environment/Daemons
 %description -n ksysguardd
 %{summary}.
 
+%package -n libkworkspace
+Summary: Runtime libkworkspace library
+# when spilt occurred
+Conflicts: kdebase-workspace-libs < 4.7.2-2
+Obsoletes: kdebase-workspace-libs-kworkspace < 4.7.2-3
+Requires: kdelibs4%{?_isa} >= %{version}
+%description -n libkworkspace
+%{summary}.
+
 %package -n oxygen-cursor-themes
 Summary: Oxygen cursor themes
 Group: User Interface/Desktops
@@ -414,10 +442,6 @@ gtk-update-icon-cache %{_kde4_iconsdir}/oxygen &> /dev/null || :
 update-desktop-database -q &> /dev/null || :
 fi
 
-%post libs -p /sbin/ldconfig
-
-%postun libs -p /sbin/ldconfig
-
 
 %files
 %defattr(-,root,root,-)
@@ -442,7 +466,6 @@ fi
 %{_kde4_bindir}/ksplashx
 %{_kde4_bindir}/ksplashx_scale
 %{_kde4_bindir}/kstartupconfig4
-%{_kde4_bindir}/ksysguard
 %{_kde4_bindir}/ksystraycmd
 %{_kde4_bindir}/kwin*
 %{_kde4_bindir}/oxygen-demo
@@ -460,8 +483,6 @@ fi
 %{_kde4_bindir}/solid-network
 %{_kde4_bindir}/startkde
 %{_kde4_bindir}/systemsettings
-
-
 %{_kde4_appsdir}/color-schemes/
 %{_kde4_appsdir}/desktoptheme/
 %{_kde4_appsdir}/freespacenotifier/
@@ -487,7 +508,6 @@ fi
 %{_kde4_appsdir}/ksplash/Themes/None/
 %{_kde4_appsdir}/ksplash/Themes/Simple/
 %{_kde4_appsdir}/ksplash/Themes/SimpleSmall/
-%{_kde4_appsdir}/ksysguard/
 %{_kde4_appsdir}/kthememanager/
 %{_kde4_appsdir}/kwin/
 %{_kde4_appsdir}/kwrited/
@@ -506,7 +526,6 @@ fi
 %{_kde4_configdir}/background.knsrc
 %{_kde4_configdir}/colorschemes.knsrc
 %{_kde4_configdir}/ksplash.knsrc
-%{_kde4_configdir}/ksysguard.knsrc
 %{_kde4_configdir}/plasma-overlayrc
 %{_kde4_configdir}/plasma-themes.knsrc
 %{_kde4_configdir}/wallpaper.knsrc
@@ -532,7 +551,6 @@ fi
 %{_kde4_docdir}/HTML/en/kinfocenter/
 %{_kde4_docdir}/HTML/en/klipper/
 %{_kde4_docdir}/HTML/en/kmenuedit/
-%{_kde4_docdir}/HTML/en/ksysguard/
 %{_kde4_docdir}/HTML/en/plasma-desktop/
 %{_kde4_docdir}/HTML/en/systemsettings/
 %{_kde4_iconsdir}/hicolor/*/*/*
@@ -571,7 +589,6 @@ fi
 %{_kde4_libexecdir}/kcmkdmhelper
 %{_kde4_libexecdir}/krootimage
 %{_kde4_libexecdir}/kscreenlocker
-%{_kde4_libexecdir}/ksysguardprocesslist_helper
 %{_kde4_libexecdir}/kwin_killer_helper
 %{_kde4_libexecdir}/kwin_opengl_test
 %{_kde4_libexecdir}/kwin_rules_dialog
@@ -583,7 +600,6 @@ fi
 %{_kde4_libdir}/libsystemsettingsview.so
 %{_kde4_libdir}/kconf_update_bin/*
 %{_mandir}/man1/plasm*.1*
-
 %if 0%{?googlegadgets}
 # googlegadgets
 %exclude %{_kde4_libdir}/kde4/plasma_package_ggl.so
@@ -612,11 +628,30 @@ fi
 %{_polkit_qt_policydir}/org.kde.fontinst.policy
 %{_polkit_qt_policydir}/org.kde.kcontrol.kcmclock.policy
 %{_polkit_qt_policydir}/org.kde.kcontrol.kcmkdm.policy
-%{_polkit_qt_policydir}/org.kde.ksysguard.processlisthelper.policy
 %{_polkit_qt_policydir}/org.kde.powerdevil.backlighthelper.policy
 %{_kde4_appsdir}/kfontinst/
 %{_kde4_appsdir}/kfontview/
 %{_kde4_appsdir}/konqsidebartng/virtual_folders/services/fonts.desktop
+# exclude ksysguard bits
+%exclude %{_kde4_libdir}/libkdeinit4_ksysguard.so
+%exclude %{_sysconfdir}/dbus-1/system.d/org.kde.ksysguard.processlisthelper.conf
+%exclude /usr/share/applications/kde4/ksysguard.desktop
+%exclude %{_datadir}/dbus-1/system-services/org.kde.ksysguard.processlisthelper.service
+# exclude ksysguard icons
+%exclude %{_kde4_iconsdir}/oxygen/*/apps/computer.*
+%exclude %{_kde4_iconsdir}/oxygen/*/apps/daemon.*
+%exclude %{_kde4_iconsdir}/oxygen/*/apps/computer.*
+%exclude %{_kde4_iconsdir}/oxygen/*/apps/kdeapp.*
+%exclude %{_kde4_iconsdir}/oxygen/*/apps/kernel.*
+%exclude %{_kde4_iconsdir}/oxygen/*/apps/ksysguardd.*
+%exclude %{_kde4_iconsdir}/oxygen/*/apps/running.*
+%exclude %{_kde4_iconsdir}/oxygen/*/apps/shell.*
+%exclude %{_kde4_iconsdir}/oxygen/*/apps/unknownapp.*
+%exclude %{_kde4_iconsdir}/oxygen/*/apps/waiting.*
+
+
+%post libs -p /sbin/ldconfig
+%postun libs -p /sbin/ldconfig
 
 %files libs
 %defattr(-,root,root,-)
@@ -626,28 +661,19 @@ fi
 %{_kde4_libdir}/libkfontinstui.so.4*
 %{_kde4_libdir}/libkhotkeysprivate.so.4*
 %{_kde4_libdir}/libkscreensaver.so.5*
-%{_kde4_libdir}/libksgrd.so.4*
-%{_kde4_libdir}/libksignalplotter.so.4*
 %{_kde4_libdir}/libkwineffects.so.1*
 %{_kde4_libdir}/libkwinnvidiahack.so.4*
-%{_kde4_libdir}/libkworkspace.so.4*
-%{_kde4_libdir}/liblsofui.so.4*
 %{_kde4_libdir}/liboxygenstyle.so.4*
 %{_kde4_libdir}/libplasma-geolocation-interface.so.4*
 %{_kde4_libdir}/libplasma_applet-system-monitor.so.4*
 %{_kde4_libdir}/libplasmaclock.so.4*
 %{_kde4_libdir}/libplasmagenericshell.so.4*
-%{_kde4_libdir}/libprocesscore.so.4*
-%{_kde4_libdir}/libprocessui.so.4*
 %{_kde4_libdir}/libsolidcontrol.so.4*
 %{_kde4_libdir}/libsolidcontrolifaces.so.4*
 %{_kde4_libdir}/libsystemsettingsview.so.2*
 %{_kde4_libdir}/libtaskmanager.so.4*
 %{_kde4_libdir}/libweather_ion.so.6*
 %{_kde4_libdir}/libpowerdevilcore.so.0*
-%{_kde4_libdir}/kde4/plugins/designer/ksignalplotterwidgets.so
-%{_kde4_libdir}/kde4/plugins/designer/ksysguardwidgets.so
-%{_kde4_libdir}/kde4/plugins/designer/ksysguardlsofwidgets.so
 %{_kde4_libdir}/kde4/plugins/gui_platform/libkde.so
 %{_kde4_libdir}/kde4/plugins/styles/oxygen.so
 
@@ -716,11 +742,63 @@ fi
 %{_kde4_appsdir}/kdm/
 %{_kde4_datadir}/kde4/services/kdm.desktop
 
+%post -n ksysguard
+touch --no-create %{_kde4_iconsdir}/oxygen &> /dev/null || :
+
+%posttrans -n ksysguard
+gtk-update-icon-cache %{_kde4_iconsdir}/oxygen &> /dev/null || :
+
+%postun -n ksysguard
+if [ $1 -eq 0 ] ; then
+touch --no-create %{_kde4_iconsdir}/oxygen &> /dev/null || :
+gtk-update-icon-cache %{_kde4_iconsdir}/oxygen &> /dev/null || :
+fi
+
+%files -n ksysguard
+#doc %{name}-%{version}/ksysguard/README
+%{_kde4_bindir}/ksysguard
+%{_kde4_libdir}/libkdeinit4_ksysguard.so
+%{_kde4_appsdir}/ksysguard/
+%{_kde4_configdir}/ksysguard.knsrc
+%{_kde4_docdir}/HTML/en/ksysguard/
+%{_kde4_iconsdir}/oxygen/*/apps/computer.*
+%{_kde4_iconsdir}/oxygen/*/apps/daemon.*
+%{_kde4_iconsdir}/oxygen/*/apps/computer.*
+%{_kde4_iconsdir}/oxygen/*/apps/kdeapp.*
+%{_kde4_iconsdir}/oxygen/*/apps/kernel.*
+%{_kde4_iconsdir}/oxygen/*/apps/ksysguardd.*
+%{_kde4_iconsdir}/oxygen/*/apps/running.*
+%{_kde4_iconsdir}/oxygen/*/apps/shell.*
+%{_kde4_iconsdir}/oxygen/*/apps/unknownapp.*
+%{_kde4_iconsdir}/oxygen/*/apps/waiting.*
+%{_kde4_libexecdir}/ksysguardprocesslist_helper
+%{_polkit_qt_policydir}/org.kde.ksysguard.processlisthelper.policy
+
+%post -n ksysguard-libs -p /sbin/ldconfig
+%postun -n ksysguard-libs -p /sbin/ldconfig
+
+%files -n ksysguard-libs
+%{_kde4_libdir}/kde4/plugins/designer/ksignalplotterwidgets.so
+%{_kde4_libdir}/libksignalplotter.so.4*
+%{_kde4_libdir}/kde4/plugins/designer/ksysguardwidgets.so
+%{_kde4_libdir}/kde4/plugins/designer/ksysguardlsofwidgets.so
+%{_kde4_libdir}/libksgrd.so.4*
+%{_kde4_libdir}/liblsofui.so.4*
+%{_kde4_libdir}/libprocesscore.so.4*
+%{_kde4_libdir}/libprocessui.so.4*
+
 %files -n ksysguardd
 %defattr(-,root,root,-)
 %config(noreplace) %{_kde4_sysconfdir}/ksysguarddrc
 %{_kde4_bindir}/ksysguardd
 
+%post -n libkworkspace -p /sbin/ldconfig
+%postun -n libkworkspace -p /sbin/ldconfig
+
+%files -n libkworkspace
+%{_kde4_libdir}/libkworkspace.so.4*
+
+
 %files -n oxygen-cursor-themes
 %defattr(-,root,root,-)
 %{_kde4_iconsdir}/Oxygen_Black/
@@ -762,6 +840,11 @@ fi
 
 
 %changelog
+* Mon Oct 10 2011 Rex Dieter <rdieter at fedoraproject.org> 4.7.2-3
+- ksysguard(-libs) subpkg
+- libkworkspace subpkg
+- kdm: Requires: libkworkspace
+
 * Tue Oct 04 2011 Rex Dieter <rdieter at fedoraproject.org> 4.7.2-1
 - 4.7.2
 
