[kdelibs] solid hardware does not detect NFS drives, halectomy related (#751879)

[Rex Dieter]

commit 40984c14355cc53c9b8324ce484949d3e7942e6f
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Mon Nov 14 08:43:07 2011 -0600

    solid hardware does not detect NFS drives, halectomy related (#751879)

 kdelibs-4.6.80-halectomy.patch |  131 ----------------------------------------
 kdelibs.spec                   |   13 ++---
 2 files changed, 5 insertions(+), 139 deletions(-)
---
diff --git a/kdelibs.spec b/kdelibs.spec
index 03e4931..6782391 100644
--- a/kdelibs.spec
+++ b/kdelibs.spec
@@ -23,7 +23,7 @@
 
 Summary: KDE Libraries
 Version: 4.7.3
-Release: 3%{?dist}
+Release: 4%{?dist}
 
 Name: kdelibs
 Epoch: 6
@@ -135,15 +135,10 @@ Patch200: kdelibs-4.3.1-CVE-2009-2702.patch
 Patch201: kdelibs-4.7.3-CVE-0046.patch
 
 ## Fedora specific patches
-# make forcefully hal-free build
-Patch300: kdelibs-4.6.80-halectomy.patch
-
-%if 0%{?fedora} && 0%{?fedora} < 13
-Conflicts: kdebase-workspace-libs < 4.3.80
-%endif
 
 # force upgrade of apps using the discontinued KatePart Smart* interfaces to
 # versions using the new Moving* interfaces instead
+# conditionize these?  how long to carry them?  -- rex
 Conflicts: kdevplatform < 1.1.80
 Conflicts: kdevelop < 9:4.1.80
 # 2.1-0.9.b4.fc15 is the first build with the fix from beta 5 backported
@@ -329,7 +324,6 @@ sed -i -e "s|@@VERSION_RELEASE@@|%{version}-%{release}|" kio/kio/kprotocolmanage
 %patch201 -p1 -b .CVE-2010-0046
 
 # Fedora patches
-%patch300 -p1 -b .halectomy
 
 
 %build
@@ -576,6 +570,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Mon Nov 14 2011 Rex Dieter <rdieter at fedoraproject.org> 4.7.3-4
+- solid hardware does not detect NFS drives, halectomy related (#751879)
+
 * Mon Nov 07 2011 Than Ngo <than at redhat.com> - 4.7.3-3
 - CVE-2010-0046, security issue in khtml