rpms/kdebase/F-8 kdebase-3.5.9-lmsensors.patch, NONE, 1.1 kdebase.spec, 1.287, 1.288
Than Ngo (than)
fedora-extras-commits at redhat.com
Thu Feb 28 16:40:01 UTC 2008
Author: than
Update of /cvs/extras/rpms/kdebase/F-8
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25134
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-8/kdebase.spec,v
retrieving revision 1.287
retrieving revision 1.288
diff -u -r1.287 -r1.288
--- kdebase.spec 16 Feb 2008 02:46:32 -0000 1.287
+++ kdebase.spec 28 Feb 2008 16:39:25 -0000 1.288
@@ -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)
More information about the fedora-extras-commits
mailing list