[kde-workspace] Requires: kscreen, Obsoletes: kded_xrandrmonitor (f19+)

[Rex Dieter]

commit b76b424cbd33bc89ef2f99f8ac785ceaf8d50e21
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Mon Jan 28 10:58:46 2013 -0600

    Requires: kscreen, Obsoletes: kded_xrandrmonitor (f19+)

 kde-workspace.spec |   36 ++++++++++++++++--------------------
 1 files changed, 16 insertions(+), 20 deletions(-)
---
diff --git a/kde-workspace.spec b/kde-workspace.spec
index c2bb72c..913193f 100644
--- a/kde-workspace.spec
+++ b/kde-workspace.spec
@@ -2,10 +2,14 @@
 %define gpsd 1
 %endif
 
+%if 0%{?fedora} > 18
+%define kscreen
+%endif
+
 Summary: KDE Workspace
 Name:    kde-workspace
 Version: 4.9.98
-Release: 4%{?dist}
+Release: 5%{?dist}
 
 License: GPLv2
 URL:     https://projects.kde.org/projects/kde/kde-workspace
@@ -206,10 +210,10 @@ 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
-# omit hard dep for now, makes switching between conflicting providers difficult
-# (without having to resort to --nodeps)
-#Requires: kde-display-management
+%if 0%{?kscreen}
+Obsoletes: kded_randrmonitor < 4.9.98-5
+Requires: kscreen
+%endif
 
 # for kcm_keyboard
 Requires: iso-codes
@@ -302,15 +306,6 @@ Requires: kde-settings-kdm
 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
-# when split out, upgrade path for now in case Requires: kde-display-management isn't good enough
-Obsoletes: kde-workspace < 4.9.97-2
-Requires: %{name} = %{version}-%{release}
-%description -n kded_randrmonitor
-%{summary}.
-
 %package -n kdm-themes
 Summary: KDM Themes 
 group: User Interface/X
@@ -504,6 +499,10 @@ install -m644 -p %{SOURCE10} %{buildroot}%{_sysconfdir}/kde/env/
 
 # unpackaged files
 rm -rfv %{buildroot}%{_kde4_appsdir}/ksplash/Themes/Default/
+%if 0%{?kscreen}
+rm -fv %{buildroot}%{_kde4_libdir}/kde4/kded_randrmonitor.so
+rm -fv %{buildroot}%{_kde4_datadir}/kde4/services/kded/randrmonitor.desktop
+%endif
 
 
 %check
@@ -624,7 +623,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
@@ -669,7 +667,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
@@ -849,10 +846,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
 %{_kde4_bindir}/genkdmconf
 %{_kde4_bindir}/kdm
@@ -986,6 +979,9 @@ fi
 
 
 %changelog
+* Mon Jan 28 2013 Rex Dieter <rdieter at fedoraproject.org> 4.9.98-5
+- Requires: kscreen, Obsoletes: kded_xrandrmonitor (f19+)
+
 * Mon Jan 28 2013 Rex Dieter <rdieter at fedoraproject.org> 4.9.98-4
 - drop Requires: kde-display-management (for now)
 - switch fedora-plasma-cache hack to env script