[kdebase-workspace] cleanup/remove some old/deprecated pieces

[Rex Dieter]

commit 646c3d0f3c0dd78b973ad0ae4e721a18a33de311
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Thu Jun 30 08:56:32 2011 -0500

    cleanup/remove some old/deprecated pieces

 kdebase-workspace-4.6.3-nm-09-compat.patch |  318 ----------------------------
 kdebase-workspace.spec                     |   19 +--
 2 files changed, 5 insertions(+), 332 deletions(-)
---
diff --git a/kdebase-workspace.spec b/kdebase-workspace.spec
index c2f9dd1..ce61064 100644
--- a/kdebase-workspace.spec
+++ b/kdebase-workspace.spec
@@ -73,8 +73,6 @@ Patch50: kdebase-workspace-4.6.80-kde#171685.patch
 ## HAL-ectomy
 Patch200: kdebase-workspace-4.5.85-no_HAL.patch
 Patch210: kdebase-workspace-4.5.90-no_HAL2.patch
-## other
-Patch220: kdebase-workspace-4.6.3-nm-09-compat.patch
 
 ## trunk patches
 
@@ -108,8 +106,6 @@ BuildRequires: desktop-file-utils
 %if 0%{?fedora}
 BuildRequires: google-gadgets-devel >= 0.10.5
 BuildRequires: gpsd-devel
-## libcaptury not used anymore, only as a "test" kwin effect (not built by default)
-#BuildRequires: libcaptury-devel
 %endif
 BuildRequires: glib2-devel
 BuildRequires: kdelibs4-devel >= %{version}
@@ -124,8 +120,10 @@ BuildRequires: libXres-devel
 BuildRequires: lm_sensors-devel
 BuildRequires: libraw1394-devel
 %endif
+%if 0%{?fedora} && 0%{?fedora} < 15
 # added nm-glib-devel to workaround https://bugzilla.redhat.com/show_bug.cgi?id=685442
 BuildRequires: NetworkManager-devel NetworkManager-glib-devel
+%endif
 BuildRequires: pam-devel
 BuildRequires: polkit-qt-devel
 BuildRequires: prison-devel
@@ -143,17 +141,13 @@ Requires: kdebase-runtime >= %{version}
 
 # for kcm_keyboard
 Requires: iso-codes
-# pkg-splits, upgrade path
-%if 0%{?fedora} < 12 && 0%{?rhel} <= 6
-Requires: kdm = %{version}-%{release}
-%endif
 Requires: kio_sysinfo
 Requires: ksysguardd = %{version}-%{release}
 # startkde references: dbus-launch df mkdir test xmessage xprop xrandr xrdb xset xsetroot
 Requires: coreutils
 Requires: dbus-x11
 # See http://bugzilla.redhat.com/537609
-#Requires(hint): xorg-x11-apps
+#Requires: xorg-x11-apps
 Requires: xorg-x11-utils
 Requires: xorg-x11-server-utils
 
@@ -194,7 +188,6 @@ This package contains:
 %package devel
 Group:    Development/Libraries
 Summary:  Development files for %{name}
-Obsoletes: PolicyKit-kde-devel < 4.3.0
 Provides: solid-bluetooth-devel = %{version}-%{release} 
 Requires: %{name}-libs%{?_isa} = %{version}-%{release}
 Requires: kdelibs4-devel
@@ -288,6 +281,7 @@ Requires: akonadi
 %description akonadi
 %{summary}.
 
+
 %prep
 
 %setup -q -T -c -a 0
@@ -324,12 +318,9 @@ pushd %{name}-%{version}
 # Fedora patches
 %patch200 -p0 -b .no_HAL
 %patch210 -p1 -b .no_HAL2
-%if 0%{?fedora} == 15
-%patch220 -p1 -b .nm-09-compat
-%endif
-
 popd
 
+
 %build
 
 pushd %{name}-%{version}