[kdebase-workspace: 1/2] fix the temperature plasmoids and ksysguard temperature sensors regression

Jaroslav Reznik jreznik at fedoraproject.org
Fri Apr 8 15:18:04 UTC 2011


commit fbc5cf9a57f4343c525f6cb9ac27007d2108d973
Author: Jaroslav Reznik <jreznik at redhat.com>
Date:   Fri Apr 8 17:11:31 2011 +0200

    fix the temperature plasmoids and ksysguard temperature sensors regression

 ...kspace-4.6.1-ksysguard-add-missing-module.patch |   11 +++++++++++
 kdebase-workspace.spec                             |    9 ++++++++-
 2 files changed, 19 insertions(+), 1 deletions(-)
---
diff --git a/kdebase-workspace-4.6.1-ksysguard-add-missing-module.patch b/kdebase-workspace-4.6.1-ksysguard-add-missing-module.patch
new file mode 100644
index 0000000..4118407
--- /dev/null
+++ b/kdebase-workspace-4.6.1-ksysguard-add-missing-module.patch
@@ -0,0 +1,11 @@
+diff -up kdebase-workspace-4.6.2/ksysguard/ksysguardd/modules.h.ksysguard-add-missing-module kdebase-workspace-4.6.2/ksysguard/ksysguardd/modules.h
+--- kdebase-workspace-4.6.2/ksysguard/ksysguardd/modules.h.ksysguard-add-missing-module	2011-04-01 12:52:43.000000000 +0200
++++ kdebase-workspace-4.6.2/ksysguard/ksysguardd/modules.h	2011-04-08 17:02:27.553086372 +0200
+@@ -23,6 +23,7 @@
+ #ifndef KSG_MODULES_H
+ #define KSG_MODULES_H
+ 
++#include "config-ksysguardd.h"
+ #include "Command.h"
+ #include "conf.h"
+ #include "ksysguardd.h"
diff --git a/kdebase-workspace.spec b/kdebase-workspace.spec
index f6e774c..e1ef328 100644
--- a/kdebase-workspace.spec
+++ b/kdebase-workspace.spec
@@ -8,7 +8,7 @@ Version: 4.6.2
 # for .0 releases we have to use '00' as '0' is treated as null by cmake, dont' forget to update
 %define kde4workspace_version 4.6.2
 
-Release: 1%{?dist}
+Release: 2%{?dist}
 
 License: GPLv2
 Group:   User Interface/Desktops
@@ -66,6 +66,9 @@ Patch23: kdebase-workspace-4.5.2-startkde_zenity.patch
 Patch50: kdebase-workspace-4.3.3-kde#171685.patch
 
 ## 4.6 patches
+# (regression) missing include caused the temperature plasmoids and ksysguard
+# temperature sensors to no longer work, commit 0e151ea2ab1663f3649688139739712060ae3259
+Patch100: kdebase-workspace-4.6.1-ksysguard-add-missing-module.patch
 
 ## Fedora specific patches
 # HALsectomy
@@ -308,6 +311,7 @@ Requires: akonadi
 %patch50 -p1 -b .kde#171685
 
 # 4.6 patches
+%patch100 -p1 -b .ksysguard-add-missing-module
 
 # trunk patches
 
@@ -730,6 +734,9 @@ fi
 
 
 %changelog
+* Fri Apr 08 2011 Jaroslav Reznik <jreznik at redhat.com> - 4.6.2-2
+- fix the temperature plasmoids and ksysguard temperature sensors regression
+
 * Wed Apr 06 2011 Than Ngo <than at redhat.com> - 4.6.2-1
 - 4.6.2
 


More information about the scm-commits mailing list