rpms/kdebase/F-7 kdebase-3.5.9-lmsensors.patch, NONE, 1.1 kdebase.spec, 1.270, 1.271

[Than Ngo (than)]

Author: than

Update of /cvs/extras/rpms/kdebase/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24993

Modified Files:
	kdebase.spec 
Added Files:
	kdebase-3.5.9-lmsensors.patch 
Log Message:
- 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: kdebase.spec
===================================================================
RCS file: /cvs/extras/rpms/kdebase/F-7/kdebase.spec,v
retrieving revision 1.270
retrieving revision 1.271
diff -u -r1.270 -r1.271
--- kdebase.spec	16 Feb 2008 02:59:51 -0000	1.270
+++ kdebase.spec	28 Feb 2008 16:36:47 -0000	1.271
@@ -15,7 +15,7 @@
 %define _with_samba --with-samba
 
 Version: 3.5.9
-Release: 1%{?dist}
+Release: 2%{?dist}
 
 %if 0%{?fedora} > 8
 Name: kdebase3
@@ -89,6 +89,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
 
@@ -300,6 +301,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
@@ -795,6 +797,9 @@
 
 
 %changelog
+* Thu Feb 28 2008 Than Ngo <than at redhat.com> 3.5.9-2
+- apply upstream patch to unbreak lmsensors support again
+
 * Thu Feb 14 2008 Rex Dieter <rdieter at fedoraproject.org> - 3.5.9-1
 - kde-3.5.9
 - fixup startkde patch, omitting broken bits, for now (#426871)