[kdebase-workspace] disable PowerDevil's HAL backend (aka project HALsectomy)

Lukas Tinkl ltinkl at fedoraproject.org
Mon Nov 22 19:43:32 UTC 2010


commit 7c03dad328ff2231c04cac26a223a2f42b1b8ebe
Author: Lukas Tinkl <lukas at kde.org>
Date:   Mon Nov 22 20:43:29 2010 +0100

    disable PowerDevil's HAL backend (aka project HALsectomy)

 kdebase-workspace-4.5.80-no_HAL.patch |   10 ++++++++++
 kdebase-workspace.spec                |   13 ++++++++++++-
 2 files changed, 22 insertions(+), 1 deletions(-)
---
diff --git a/kdebase-workspace-4.5.80-no_HAL.patch b/kdebase-workspace-4.5.80-no_HAL.patch
new file mode 100644
index 0000000..0ac741c
--- /dev/null
+++ b/kdebase-workspace-4.5.80-no_HAL.patch
@@ -0,0 +1,10 @@
+Index: workspace/powerdevil/daemon/backends/CMakeLists.txt
+===================================================================
+--- workspace/powerdevil/daemon/backends/CMakeLists.txt	(revision 1198779)
++++ workspace/powerdevil/daemon/backends/CMakeLists.txt	(working copy)
+@@ -1,4 +1,4 @@
+-add_subdirectory(hal)
++#add_subdirectory(hal)
+ add_subdirectory(upower)
+ 
+ install(FILES powerdevilbackend.desktop DESTINATION ${SERVICETYPES_INSTALL_DIR})
diff --git a/kdebase-workspace.spec b/kdebase-workspace.spec
index 4365cbe..1c28e23 100644
--- a/kdebase-workspace.spec
+++ b/kdebase-workspace.spec
@@ -10,7 +10,7 @@ Version: 4.5.80
 # for .0 releases we have to use '00' as '0' is treated as null by cmake, dont' forget to update
 %define kde4workspace_version %{version} 
 
-Release: 2%{?dist}
+Release: 3%{?dist}
 
 License: GPLv2
 Group:   User Interface/Desktops
@@ -78,6 +78,10 @@ Patch100: kdebase-workspace-4.5.80-reenable-python-scriptengine.patch
 # fix a syntax error in the Python script engine
 Patch101: kdebase-workspace-4.5.80-fix-python-scriptengine.patch
 
+## Fedora specific patches
+# HALsectomy
+Patch200: kdebase-workspace-4.5.80-no_HAL.patch
+
 ## trunk patches
 
 # python scriptengine temporarily(?) disabled
@@ -304,6 +308,10 @@ Requires: akonadi
 
 # trunk patches
 
+# Fedora patches
+%if 0%{?fedora} && 0%{?fedora} > 14
+%patch200 -p1 -b .no_HAL
+%endif
 
 %build
 
@@ -650,6 +658,9 @@ fi
 
 
 %changelog
+* Mon Nov 22 2010 Lukas Tinkl <ltinkl at redhat.com> - 4.5.80-3
+- disable PowerDevil's HAL backend (aka project HALsectomy)
+
 * Mon Nov 22 2010 Kevin Kofler <Kevin at tigcc.ticalc.org> - 4.5.80-2
 - backport upstream fixes to reenable and fix the Python script engine
 


More information about the scm-commits mailing list