[kde-workspace/f21: 4/5] Revert "Split kinfocenter, kmenuedit and khotkeys to subpackages"

Sun Jan 18 19:44:12 UTC 2015

commit 52e9b281aa029ed4b5ec160352e7b07d4691ff63
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Sun Jan 18 13:44:19 2015 -0600

    Revert "Split kinfocenter, kmenuedit and khotkeys to subpackages"
    
    This reverts commit 016655c255730e334b5253df5caf321c8bfc45f3.

 kde-workspace.spec |  131 ++++++---------------------------------------------
 1 files changed, 16 insertions(+), 115 deletions(-)
---

diff --git a/kde-workspace.spec b/kde-workspace.spec
index 9f6966d..7ebeca0 100644
--- a/kde-workspace.spec
+++ b/kde-workspace.spec
@@ -22,7 +22,7 @@
 Summary: KDE Workspace
 Name:    kde-workspace
 Version: 4.11.14
-Release: 4%{?dist}
+Release: 3%{?dist}
 
 License: GPLv2
 URL:     https://projects.kde.org/projects/kde/kde-workspace
@@ -269,10 +269,6 @@ Requires: xorg-x11-server-utils
 # Make sure we have kwin, but don't care whether it's our kwin, or kwin5
 Requires: kwin
 
-Requires: khotkeys
-Requires: kmenuedit
-Requires: kinfocenter
-
 %define default_face_icon default1.png
 %if 0%{?fedora} || 0%{?rhel} > 6
 Requires: kde-settings-ksplash
@@ -479,30 +475,6 @@ Requires: akonadi
 %description akonadi
 %{summary}.
 
-%package -n khotkeys
-Summary: Application to configure hotkeys in KDE
-Conflicts: kde-workspace < 4.11.14-4
-Requires: khotkeys-libs%{?_isa} = %{version}-%{release}
-%description -n khotkeys
-%{summary}.
-
-%package -n khotkeys-libs
-Summary: Runtime libraries for %{name}
-Conflicts: kde-workspace < 4.11.14-4
-%description -n khotkeys-libs
-%{summary}.
-
-%package -n kmenuedit
-Summary: KDE Menu Editor
-Conflicts: kde-workspace < 4.11.14-4
-%description -n kmenuedit
-%{summary}.
-
-%package -n kinfocenter
-Summary: KDE Info Center
-Conflicts: kde-workspace < 4.11.14-4
-%description -n kinfocenter
-%{summary}.
 
 %prep
 %setup -q -n kde-workspace-%{version}
@@ -669,7 +641,9 @@ fi
 %{_kde4_bindir}/kcminit                           
 %{_kde4_bindir}/kcminit_startup                   
 %{_kde4_bindir}/kdostartupconfig4                 
+%{_kde4_bindir}/kinfocenter
 %{_kde4_bindir}/klipper
+%{_kde4_bindir}/kmenuedit
 %{_kde4_bindir}/krandom.kss
 %if ! 0%{?kscreen}
 %{_kde4_bindir}/krandrstartup
@@ -701,10 +675,17 @@ fi
 %{_kde4_appsdir}/kcmkeys/
 %{_kde4_appsdir}/kcmsolidactions/
 %{_kde4_appsdir}/kcmstyle/
+%{_kde4_appsdir}/kcmusb/
+%ifnarch s390 s390x
+%{_kde4_appsdir}/kcmview1394/
+%endif
 %{_kde4_appsdir}/kconf_update/
 %exclude %{_kde4_appsdir}/kconf_update/kwin_*
 %{_kde4_appsdir}/kcontrol/
 %{_kde4_appsdir}/kdisplay/
+%{_kde4_appsdir}/khotkeys/
+%{_kde4_appsdir}/kinfocenter/
+%{_kde4_appsdir}/kmenuedit/
 %dir %{_kde4_appsdir}/ksmserver/
 %{_kde4_appsdir}/ksmserver/ksmserver.notifyrc
 %{_kde4_appsdir}/ksmserver/screenlocker/
@@ -736,29 +717,14 @@ fi
 %{_kde4_configdir}/plasma-themes.knsrc
 %{_kde4_configdir}/wallpaper.knsrc
 %{_kde4_configdir}/xcursor.knsrc
+
 %{_kde4_datadir}/kde4/services/ScreenSavers
 %{_kde4_datadir}/kde4/services/ServiceMenus
 %{_kde4_datadir}/kde4/services/kded
-%{_kde4_datadir}/kde4/services/kded/*.desktop
-%exclude %{_kde4_datadir}/kde4/services/kded/khotkeys.desktop
 %{_kde4_datadir}/kde4/services/fonts.protocol
 %{_kde4_datadir}/kde4/services/*.desktop
 %exclude %{_kde4_datadir}/kde4/services/kdm.desktop
 %exclude %{_kde4_datadir}/kde4/services/kwin*.desktop
-%exclude %{_kde4_datadir}/kde4/services/khotkeys.desktop
-# KInfoCenter
-%exclude %{_kde4_datadir}/kde4/services/kcmusb.desktop
-%exclude %{_kde4_datadir}/kde4/services/kcm_infosummary.desktop
-%exclude %{_kde4_datadir}/kde4/services/kcm_memory.desktop
-%exclude %{_kde4_datadir}/kde4/services/devinfo.desktop
-%exclude %{_kde4_datadir}/kde4/services/interrupts.desktop
-%exclude %{_kde4_datadir}/kde4/services/nic.desktop
-%exclude %{_kde4_datadir}/kde4/services/opengl.desktop
-%exclude %{_kde4_datadir}/kde4/services/smbstatus.desktop
-%exclude %{_kde4_datadir}/kde4/services/kcm_pci.desktop
-%ifnarch s390 s390x
-%exclude %{_kde4_datadir}/kde4/services/kcmview1394.desktop
-%endif
 %{_kde4_datadir}/kde4/servicetypes/*
 %exclude %{_kde4_datadir}/kde4/servicetypes/kwin*.desktop
 %{_kde4_datadir}/sounds/pop.wav
@@ -767,8 +733,6 @@ fi
 %{_kde4_datadir}/autostart/plasma.desktop
 %{_kde4_datadir}/autostart/plasma-desktop.desktop
 %{_kde4_datadir}/applications/kde4/*
-%exclude %{_kde4_datadir}/applications/kde4/kmenuedit.desktop
-%exclude %{_kde4_datadir}/applications/kde4/kinfocenter.desktop
 %{_sysconfdir}/dbus-1/system.d/org.kde.fontinst.conf
 %{_sysconfdir}/dbus-1/system.d/org.kde.kcontrol.kcmclock.conf
 %{_sysconfdir}/dbus-1/system.d/org.kde.kcontrol.kcmkdm.conf
@@ -776,6 +740,7 @@ fi
 %{_datadir}/dbus-1/interfaces/com.canonical.AppMenu.Registrar.xml
 %{_datadir}/dbus-1/interfaces/org.kde.kded.appmenu.xml
 %{_datadir}/dbus-1/interfaces/org.kde.KSMServerInterface.xml
+%{_datadir}/dbus-1/interfaces/org.kde.khotkeys.xml
 %{_datadir}/dbus-1/interfaces/org.kde.krunner.App.xml
 %{_datadir}/dbus-1/services/org.kde.fontinst.service
 %{_datadir}/dbus-1/services/org.kde.krunner.service
@@ -790,7 +755,9 @@ fi
 %{_kde4_docdir}/HTML/en/kfontview/
 %{_kde4_docdir}/HTML/en/kcontrol/
 %exclude %{_kde4_docdir}/HTML/en/kcontrol/colors/
+%{_kde4_docdir}/HTML/en/kinfocenter/
 %{_kde4_docdir}/HTML/en/klipper/
+%{_kde4_docdir}/HTML/en/kmenuedit/
 %{_kde4_docdir}/HTML/en/plasma-desktop/
 %{_kde4_docdir}/HTML/en/systemsettings/
 %{_kde4_iconsdir}/hicolor/*/*/*
@@ -804,22 +771,7 @@ fi
 %exclude %{_kde4_libdir}/kde4/kcm_colors.so
 %exclude %{_kde4_libdir}/kde4/kcm_kdm.so
 %exclude %{_kde4_libdir}/kde4/kcm_kwin*
-%exclude %{_kde4_libdir}/kde4/kcm_hotkeys.so
-# KInfoCenter
-%exclude %{_kde4_libdir}/kde4/kcm_usb.so
-%exclude %{_kde4_libdir}/kde4/kcm_infosummary.so
-%exclude %{_kde4_libdir}/kde4/kcm_memory.so
-%exclude %{_kde4_libdir}/kde4/devinfo.so
-%exclude %{_kde4_libdir}/kde4/kcm_info.so
-%exclude %{_kde4_libdir}/kde4/kcm_samba.so
-%exclude %{_kde4_libdir}/kde4/kcm_nic.so
-%exclude %{_kde4_libdir}/kde4/kcm_opengl.so
-%exclude %{_kde4_libdir}/kde4/kcm_pci.so
-%ifnarch s390 s390x
-%exclude %{_kde4_libdir}/kde4/kcm_view1394.so
-%endif
 %{_kde4_libdir}/kde4/kded_*.so
-%exclude %{_kde4_libdir}/kde4/kded_khotkeys.so
 %{_kde4_libdir}/kde4/keyboard_layout_widget.so
 %{_kde4_libdir}/kde4/krunner_*.so
 %{_kde4_libdir}/kde4/plasma_animator_default.so
@@ -850,6 +802,7 @@ fi
 %{_kde4_libdir}/libkdeinit4_kcminit.so
 %{_kde4_libdir}/libkdeinit4_kcminit_startup.so
 %{_kde4_libdir}/libkdeinit4_klipper.so
+%{_kde4_libdir}/libkdeinit4_kmenuedit.so
 %{_kde4_libdir}/libkdeinit4_krunner.so
 %{_kde4_libdir}/libkdeinit4_ksmserver.so
 %{_kde4_libdir}/libkdeinit4_plasma-desktop.so
@@ -917,6 +870,7 @@ fi
 %{_kde4_libdir}/libkephal.so.4*
 %{_kde4_libdir}/libkfontinst.so.4*
 %{_kde4_libdir}/libkfontinstui.so.4*
+%{_kde4_libdir}/libkhotkeysprivate.so.4*
 %{_kde4_libdir}/libkscreensaver.so.5*
 %{_kde4_libdir}/libplasma-geolocation-interface.so.4*
 %{_kde4_libdir}/libplasma_applet-system-monitor.so.4*
@@ -1197,61 +1151,8 @@ fi
 %{_kde4_datadir}/kde4/services/plasma-dataengine-calendar.desktop
 %endif
 
-%files -n khotkeys
-%{_kde4_libdir}/kde4/kded_khotkeys.so
-%{_kde4_libdir}/kde4/kcm_hotkeys.so
-%{_kde4_appsdir}/khotkeys/
-%{_kf5_datadir}/kde4/services/khotkeys.desktop
-%{_kf5_datadir}/kde4/services/kded/khotkeys.desktop
-%{_datadir}/dbus-1/interfaces/org.kde.khotkeys.xml
-
-%post -n khotkeys-libs -p /sbin/ldconfig
-%postun -n khotkeys-libs -p /sbin/ldconfig
-
-%files -n khotkeys-libs
-%{_kde4_libdir}/libkhotkeysprivate.so.4*
-
-%files -n kmenuedit
-%{_kde4_bindir}/kmenuedit
-%{_kde4_libdir}/libkdeinit4_kmenuedit.so
-%{_kde4_appsdir}/kmenuedit
-%{_kde4_datadir}/applications/kde4/kmenuedit.desktop
-%{_kde4_docdir}/HTML/en/kmenuedit/
-
-%files -n kinfocenter
-%{_kde4_bindir}/kinfocenter
-%{_kde4_libdir}/kde4/kcm_usb.so
-%{_kde4_libdir}/kde4/kcm_infosummary.so
-%{_kde4_libdir}/kde4/kcm_memory.so
-%{_kde4_libdir}/kde4/devinfo.so
-%{_kde4_libdir}/kde4/kcm_info.so
-%{_kde4_libdir}/kde4/kcm_samba.so
-%{_kde4_libdir}/kde4/kcm_nic.so
-%{_kde4_libdir}/kde4/kcm_opengl.so
-%{_kde4_libdir}/kde4/kcm_pci.so
-%{_kde4_datadir}/applications/kde4/kinfocenter.desktop
-%{_kde4_datadir}/kde4/services/kcmusb.desktop
-%{_kde4_datadir}/kde4/services/kcm_infosummary.desktop
-%{_kde4_datadir}/kde4/services/kcm_memory.desktop
-%{_kde4_datadir}/kde4/services/devinfo.desktop
-%{_kde4_datadir}/kde4/services/interrupts.desktop
-%{_kde4_datadir}/kde4/services/nic.desktop
-%{_kde4_datadir}/kde4/services/opengl.desktop
-%{_kde4_datadir}/kde4/services/smbstatus.desktop
-%{_kde4_datadir}/kde4/services/kcm_pci.desktop
-%{_kde4_appsdir}/kinfocenter/
-%{_kde4_appsdir}/kcmusb/
-%{_kde4_docdir}/HTML/en/kinfocenter/
-%ifnarch s390 s390x
-%{_kde4_libdir}/kde4/kcm_view1394.so
-%{_kde4_datadir}/kde4/services/kcmview1394.desktop
-%{_kde4_appsdir}/kcmview1394/
-%endif
 
 %changelog
-* Mon Jan 12 2015 Daniel Vrátil <dvratil at redhat.com> 4.11.14-4
-- split kinfocenter, kmenuedit and khotkeys to subpackages
-
 * Wed Dec 03 2014 Rex Dieter <rdieter at fedoraproject.org> 4.11.14-3
 - rename kde-plasma-safe.desktop => kde-plasma99-safe.desktop (#1164783)
 
