[kdelibs/f15] restore halectomy patch (sans fstab-removing pieces)

[Rex Dieter]

commit 96df630504f66bb90e69b704e5aae623f99804a2
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Wed Nov 16 17:30:29 2011 -0600

    restore halectomy patch (sans fstab-removing pieces)

 kdelibs-4.6.5-halectomy.patch |   79 +++++++++++++++++++++++++++++++++++++++++
 kdelibs.spec                  |    8 ++++-
 2 files changed, 86 insertions(+), 1 deletions(-)
---
diff --git a/kdelibs-4.6.5-halectomy.patch b/kdelibs-4.6.5-halectomy.patch
new file mode 100644
index 0000000..3d39c30
--- /dev/null
+++ b/kdelibs-4.6.5-halectomy.patch
@@ -0,0 +1,79 @@
+diff -up kdelibs-4.6.5/solid/solid/CMakeLists.txt.halectomy kdelibs-4.6.5/solid/solid/CMakeLists.txt
+--- kdelibs-4.6.5/solid/solid/CMakeLists.txt.halectomy	2011-04-01 08:56:18.000000000 -0500
++++ kdelibs-4.6.5/solid/solid/CMakeLists.txt	2011-11-16 17:29:09.585793260 -0600
+@@ -39,7 +39,6 @@ configure_file(config-processor.h.cmake
+ 
+ file(MAKE_DIRECTORY
+    ${CMAKE_CURRENT_BINARY_DIR}/backends/fakehw
+-   ${CMAKE_CURRENT_BINARY_DIR}/backends/hal
+    ${CMAKE_CURRENT_BINARY_DIR}/backends/udev
+    ${CMAKE_CURRENT_BINARY_DIR}/backends/wmi
+ )
+@@ -195,33 +194,6 @@ if(NOT WIN32 AND NOT APPLE)
+    endif( UDEV_FOUND )
+ 
+ 
+-   message(STATUS "Building Solid HAL backend." )
+-   set(solid_LIB_SRCS ${solid_LIB_SRCS}
+-   backends/hal/halacadapter.cpp
+-   backends/hal/halaudiointerface.cpp
+-   backends/hal/halbattery.cpp
+-   backends/hal/halblock.cpp
+-   backends/hal/halbutton.cpp
+-   backends/hal/halcamera.cpp
+-   backends/hal/halcdrom.cpp
+-   backends/hal/haldeviceinterface.cpp
+-   backends/hal/haldvbinterface.cpp
+-   backends/hal/halfstabhandling.cpp
+-   backends/hal/halgenericinterface.cpp
+-   backends/hal/haldevice.cpp
+-   backends/hal/halmanager.cpp
+-   backends/hal/halnetworkinterface.cpp
+-   backends/hal/halserialinterface.cpp
+-   backends/hal/halopticaldisc.cpp
+-   backends/hal/halportablemediaplayer.cpp
+-   backends/hal/halprocessor.cpp
+-   backends/hal/halstorageaccess.cpp
+-   backends/hal/halstorage.cpp
+-   backends/hal/halvideo.cpp
+-   backends/hal/halvolume.cpp
+-   backends/hal/halsmartcardreader.cpp
+-   )
+-
+    message(STATUS "Building Solid UPower backend." )
+    set(solid_LIB_SRCS ${solid_LIB_SRCS}
+    backends/upower/upowermanager.cpp
+diff -up kdelibs-4.6.5/solid/solid/managerbase.cpp.halectomy kdelibs-4.6.5/solid/solid/managerbase.cpp
+--- kdelibs-4.6.5/solid/solid/managerbase.cpp.halectomy	2011-04-01 08:55:51.000000000 -0500
++++ kdelibs-4.6.5/solid/solid/managerbase.cpp	2011-11-16 17:29:31.521519022 -0600
+@@ -30,7 +30,6 @@
+ #if defined (Q_OS_MAC)
+ #include "backends/iokit/iokitmanager.h"
+ #elif defined (Q_OS_UNIX)
+-#include "backends/hal/halmanager.h"
+ #include "backends/udisks/udisksmanager.h"
+ #include "backends/upower/upowermanager.h"
+ 
+@@ -71,22 +70,13 @@ void Solid::ManagerBasePrivate::loadBack
+ #        elif defined(Q_WS_WIN) && defined(HAVE_WBEM) && !defined(_WIN32_WCE)
+             m_backends << new Solid::Backends::Wmi::WmiManager(0);
+ 
+-#        elif defined(Q_OS_UNIX) && !defined(Q_OS_LINUX)
+-            m_backends << new Solid::Backends::Hal::HalManager(0);
+-
+ #        elif defined(Q_OS_LINUX)
+-            bool solidHalLegacyEnabled
+-                = QString::fromLocal8Bit(qgetenv("SOLID_HAL_LEGACY")).toInt()==1;
+-            if (solidHalLegacyEnabled) {
+-                m_backends << new Solid::Backends::Hal::HalManager(0);
+-            } else {
+ #               if defined(UDEV_FOUND)
+                     m_backends << new Solid::Backends::UDev::UDevManager(0);
+ #               endif
+                 m_backends << new Solid::Backends::UDisks::UDisksManager(0)
+                            << new Solid::Backends::UPower::UPowerManager(0)
+                            << new Solid::Backends::Fstab::FstabManager(0);
+-            }
+ #        endif
+ 
+ #        if defined (HUPNP_FOUND)
diff --git a/kdelibs.spec b/kdelibs.spec
index 212e9bc..8d81545 100644
--- a/kdelibs.spec
+++ b/kdelibs.spec
@@ -20,7 +20,7 @@
 
 Summary: KDE Libraries
 Version: 4.6.5
-Release: 8%{?dist}
+Release: 9%{?dist}
 
 Name: kdelibs
 Epoch: 6
@@ -135,6 +135,8 @@ Patch201: kdelibs-4.6.5-CVE-2011-3365-kio.patch
 Patch202: kdelibs-4.6.5-CVE-2011-3365-kssl.patch
 
 ## Fedora specific patches
+# make forcefully hal-free build
+Patch300: kdelibs-4.6.5-halectomy.patch
 
 # force upgrade of apps using the discontinued KatePart Smart* interfaces to
 # versions using the new Moving* interfaces instead
@@ -323,6 +325,7 @@ sed -i -e "s|@@VERSION_RELEASE@@|%{version}-%{release}|" kio/kio/kprotocolmanage
 %patch202 -p1 -b .CVE-2011-3365-kssl
 
 # Fedora patches
+%patch300 -p1 -b .halectomy
 
 
 %build
@@ -570,6 +573,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Wed Nov 16 2011 Rex Dieter <rdieter at fedoraproject.org> 4.6.5-9
+- restore halectomy patch (sans fstab-removing pieces)
+
 * Mon Nov 14 2011 Rex Dieter <rdieter at fedoraproject.org> 4.6.5-8
 - solid hardware does not detect NFS drives, related to halectomy (#751879)
 - Fix fd leak in KLockFile (#753709)