[kdebase-workspace] rebase no_HAL2 patch

[Rex Dieter]

commit 5f505b984de5b8e508c121ec5b4c1b0ec216f985
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Wed Dec 22 13:37:53 2010 -0600

    rebase no_HAL2 patch

 kdebase-workspace-4.5.85-no_HAL.patch  |   31 -------------------------------
 kdebase-workspace-4.5.90-no_HAL2.patch |   29 +++++++++++++++++++++++++++++
 kdebase-workspace.spec                 |    5 ++---
 3 files changed, 31 insertions(+), 34 deletions(-)
---
diff --git a/kdebase-workspace-4.5.90-no_HAL2.patch b/kdebase-workspace-4.5.90-no_HAL2.patch
new file mode 100644
index 0000000..d5af03c
--- /dev/null
+++ b/kdebase-workspace-4.5.90-no_HAL2.patch
@@ -0,0 +1,29 @@
+diff -up kdebase-workspace-4.5.90/powerdevil/daemon/powerdevilbackendloader.cpp.no_HAL2 kdebase-workspace-4.5.90/powerdevil/daemon/powerdevilbackendloader.cpp
+--- kdebase-workspace-4.5.90/powerdevil/daemon/powerdevilbackendloader.cpp.no_HAL2	2010-12-10 09:18:05.000000000 -0600
++++ kdebase-workspace-4.5.90/powerdevil/daemon/powerdevilbackendloader.cpp	2010-12-22 13:36:36.476705060 -0600
+@@ -21,7 +21,7 @@
+ #include "powerdevilbackendloader.h"
+ 
+ #include "backends/upower/powerdevilupowerbackend.h"
+-#include "backends/hal/powerdevilhalbackend.h"
++// #include "backends/hal/powerdevilhalbackend.h"
+ 
+ #include <KDebug>
+ 
+@@ -39,6 +39,7 @@ BackendInterface* loadBackend(QObject *p
+ 
+     kDebug() << "Failed!";
+ 
++#if 0
+     // If we are here, try HAL
+     kDebug() << "Loading HAL backend...";
+     if (PowerDevilHALBackend::isAvailable()) {
+@@ -48,6 +49,8 @@ BackendInterface* loadBackend(QObject *p
+ 
+     // Fail...
+     kDebug() << "Failed!";
++#endif
++
+     return 0;
+ }
+ 
diff --git a/kdebase-workspace.spec b/kdebase-workspace.spec
index b5d9602..1309143 100644
--- a/kdebase-workspace.spec
+++ b/kdebase-workspace.spec
@@ -70,7 +70,7 @@ Patch50: kdebase-workspace-4.3.3-kde#171685.patch
 ## Fedora specific patches
 # HALsectomy
 Patch200: kdebase-workspace-4.5.85-no_HAL.patch
-Patch210: kdebase-workspace-4.5.85-no_HAL2.patch
+Patch210: kdebase-workspace-4.5.90-no_HAL2.patch
 
 ## trunk patches
 
@@ -301,8 +301,7 @@ Requires: akonadi
 # Fedora patches
 %if 0%{?fedora} && 0%{?fedora} > 14
 %patch200 -p0 -b .no_HAL
-## doesn't apply as is, but ^^ should be good enough -- Rex
-#patch210 -p0 -b .no_HAL2
+%patch210 -p1 -b .no_HAL2
 %endif