rpms/kdebase3/devel kdebase-3.5.9-lmsensors.patch, NONE, 1.1 kdebase3.spec, 1.43, 1.44

[Kevin Kofler (kkofler)]

Author: kkofler

Update of /cvs/pkgs/rpms/kdebase3/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10825/devel

Modified Files:
	kdebase3.spec 
Added Files:
	kdebase-3.5.9-lmsensors.patch 
Log Message:
Sync from F8:

* Thu Feb 28 2008 Than Ngo <than at redhat.com> 3.5.9-3
- apply upstream patch to unbreak lmsensors support again

kdebase-3.5.9-lmsensors.patch:

--- NEW FILE kdebase-3.5.9-lmsensors.patch ---
Index: ksysguard/ksysguardd/Linux/lmsensors.c
===================================================================
--- ksysguard/ksysguardd/Linux/lmsensors.c	(Revision 779545)
+++ ksysguard/ksysguardd/Linux/lmsensors.c	(Revision 779546)
@@ -29,7 +29,7 @@
 
 #include "lmsensors.h"
 
-#ifdef HAVE_LMSENSORS
+#ifdef HAVE_SENSORS_SENSORS_H
 #include <sensors/sensors.h>
 
 #ifndef SENSORS_API_VERSION
@@ -293,7 +293,7 @@
 #endif
 }
 
-#else /* HAVE_LMSENSORS */
+#else /* HAVE_SENSORS_SENSORS_H */
 
 /* dummy version for systems that have no lmsensors support */
 


Index: kdebase3.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase3/devel/kdebase3.spec,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- kdebase3.spec	27 Feb 2008 15:15:04 -0000	1.43
+++ kdebase3.spec	28 Feb 2008 18:24:20 -0000	1.44
@@ -12,7 +12,7 @@
 %define _with_samba --with-samba
 
 Version: 3.5.9
-Release: 2%{?dist}
+Release: 3%{?dist}
 
 %if 0%{?fedora} > 8
 Name: kdebase3
@@ -84,6 +84,7 @@
 # upstream patches
 # alternative to patch29, requires qt-copy 0078-argb-visual-hack.patch
 Patch200: kdebase-3.5.7-kde#83974.patch
+Patch201: kdebase-3.5.9-lmsensors.patch
 
 # security fixes
 
@@ -295,6 +296,7 @@
 
 ## alternative to patch29, requires qt-copy 0078-argb-visual-hack.patch
 #patch200 -p4 -b .kde#83974
+%patch201 -p0 -b .sensor
 
 %if "%{name}" != "kdebase"
 # hacks to omit stuff that doesn't support DO_NOT_COMPILE
@@ -791,6 +793,9 @@
 
 
 %changelog
+* Thu Feb 28 2008 Than Ngo <than at redhat.com> 3.5.9-3
+- apply upstream patch to unbreak lmsensors support again
+
 * Wed Feb 27 2008 Rex Dieter <rdieter at fedoraproject.org> - 3.5.9-2
 - f9+: don't omit all of khelpcenter, some is needed for kde3 apps' help