[kde-workspace/f18] revert kded_randrmonitor subpkg

[Rex Dieter]

commit a49ccebe699092b243e61c973a9d52f9ecfa0507
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Mon Jan 28 11:09:18 2013 -0600

    revert kded_randrmonitor subpkg

 kde-workspace.spec |   24 +++++++-----------------
 1 files changed, 7 insertions(+), 17 deletions(-)
---
diff --git a/kde-workspace.spec b/kde-workspace.spec
index cd775f7..8d405ca 100644
--- a/kde-workspace.spec
+++ b/kde-workspace.spec
@@ -11,7 +11,7 @@
 Summary: KDE Workspace
 Name:    kde-workspace
 Version: 4.9.5
-Release: 3%{?dist}
+Release: 4%{?dist}
 
 License: GPLv2
 URL:     https://projects.kde.org/projects/kde/kde-workspace
@@ -213,8 +213,8 @@ Requires: kcm_colors = %{version}-%{release}
 %{?_kde4_macros_api:Requires: kde4-macros(api) = %{_kde4_macros_api} }
 Requires: kde-runtime >= %{version}
 
-# to use of kded_randrmonitor or kscreen
-Requires: kde-display-management
+# short-lived subpkg, never to be spoken-of again. -- rex
+Obsoletes: kded_randrmonitor < 4.9.5-4
 
 # for kcm_keyboard
 Requires: iso-codes
@@ -317,13 +317,6 @@ Requires: ConsoleKit-x11
 KDM provides the graphical login screen, shown shortly after boot up,
 log out, and when user switching.
 
-%package -n kded_randrmonitor
-Summary: RandR monitor kded plugin
-Provides: kde-display-management
-Requires: %{name} = %{version}-%{release}
-%description -n kded_randrmonitor
-%{summary}.
-
 %package -n kdm-themes
 Summary: KDM Themes 
 group: User Interface/X
@@ -639,7 +632,6 @@ fi
 
 %{_kde4_datadir}/kde4/services/*
 %exclude %{_kde4_datadir}/kde4/services/kdm.desktop
-%exclude %{_kde4_datadir}/kde4/services/kded/randrmonitor.desktop
 %{_kde4_datadir}/kde4/servicetypes/*
 %{_kde4_datadir}/sounds/pop.wav
 %{_kde4_datadir}/autostart/klipper.desktop
@@ -683,7 +675,6 @@ fi
 %exclude %{_kde4_libdir}/kde4/kcm_colors.so
 %exclude %{_kde4_libdir}/kde4/kcm_kdm.so
 %{_kde4_libdir}/kde4/kded_*.so
-%exclude %{_kde4_libdir}/kde4/kded_randrmonitor.so
 %{_kde4_libdir}/kde4/keyboard_layout_widget.so
 %{_kde4_libdir}/kde4/krunner_*.so
 %{_kde4_libdir}/kde4/kstyle_oxygen_config.so
@@ -870,10 +861,6 @@ fi
 %{_kde4_appsdir}/color-schemes/Zion.colors
 %{_kde4_appsdir}/color-schemes/ZionReversed.colors
 
-%files -n kded_randrmonitor
-%{_kde4_libdir}/kde4/kded_randrmonitor.so
-%{_kde4_datadir}/kde4/services/kded/randrmonitor.desktop
-
 %files -n kdm
 %defattr(-,root,root,-)
 %{_kde4_bindir}/genkdmconf
@@ -1014,8 +1001,11 @@ fi
 
 
 %changelog
+* Mon Jan 28 2013 Rex Dieter <rdieter at fedoraproject.org> 4.9.5-4
+- revert kded_randrmonitor subpkg
+
 * Thu Jan 24 2013 Rex Dieter <rdieter at fedoraproject.org> 4.9.5-3
-- kded_xrandrmonitor subpkg, to allow use of it or kscreen
+- kded_randrmonitor subpkg, to allow use of it or kscreen
 
 * Mon Jan 14 2013 Rex Dieter <rdieter at fedoraproject.org> - 4.9.5-2
 - proper powerdevil systemd-login1 support (#859227,kde review#108407)