rpms/gkrellm/EL-5 gkrellm-2.3.0-sensorscheck.patch, NONE, 1.1 gkrellm.spec, 1.7, 1.8

[Ville Skytta (scop)]

Author: scop

Update of /cvs/pkgs/rpms/gkrellm/EL-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8967

Modified Files:
	gkrellm.spec 
Added Files:
	gkrellm-2.3.0-sensorscheck.patch 
Log Message:
* Wed Sep  5 2007 Ville Skyttä <ville.skytta at iki.fi> - 2.3.0-4.1
- Adapt to lm_sensors availability/setup in EL.


gkrellm-2.3.0-sensorscheck.patch:

--- NEW FILE gkrellm-2.3.0-sensorscheck.patch ---
diff -up gkrellm-2.3.0/src/configure~ gkrellm-2.3.0/src/configure
--- gkrellm-2.3.0/src/configure~	2007-05-07 02:45:55.000000000 +0300
+++ gkrellm-2.3.0/src/configure	2007-09-03 23:47:50.000000000 +0300
@@ -129,6 +129,7 @@ cat << EOF > test.c
 
 int main()
 	{
+	/*
 	FILE	*f;
 
 	f = fopen("/etc/sensors.conf", "r");
@@ -137,6 +138,7 @@ int main()
 	if (sensors_init(f) != 0)
 		return 1;
 	fclose(f);
+	*/
 	return 0;
 	}
 EOF


Index: gkrellm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gkrellm/EL-5/gkrellm.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- gkrellm.spec	5 Sep 2007 15:33:56 -0000	1.7
+++ gkrellm.spec	5 Sep 2007 15:56:44 -0000	1.8
@@ -1,6 +1,6 @@
 Name:           gkrellm
 Version:        2.3.0
-Release:        4%{?dist}
+Release:        4%{?dist}.1
 Summary:        Multiple stacked system monitors in one process
 Group:          Applications/System
 License:        GPLv3+
@@ -14,8 +14,11 @@
 Patch2:         gkrellm-2.2.4-sansfont.patch
 Patch3:         gkrellm-2.2.7-width.patch
 Patch4:         gkrellm-2.2.9-libdir.patch
+Patch5:         gkrellm-2.3.0-sensorscheck.patch
 BuildRequires:  gtk2-devel gnutls-devel libSM-devel desktop-file-utils gettext
+%ifarch %{ix86} x86_64 alpha
 BuildRequires:  lm_sensors-devel
+%endif
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %description
@@ -63,6 +66,7 @@
 %patch2 -p1 -z .sansfont
 %patch3 -p1 -z .width
 %patch4 -p1 -z .libdir2
+%patch5 -p1 -z .sensorscheck
 
 for i in gkrellmd.1 gkrellm.1 README Changelog Changelog-plugins.html; do
    sed -i -e "s@/usr/lib/gkrellm2/plugins@%{_libdir}/gkrellm2/plugins@" $i
@@ -169,6 +173,9 @@
 
 
 %changelog
+* Wed Sep  5 2007 Ville Skyttä <ville.skytta at iki.fi> - 2.3.0-4.1
+- Adapt to lm_sensors availability/setup in EL.
+
 * Wed Sep  5 2007 Ville Skyttä <ville.skytta at iki.fi> - 2.3.0-4
 - Rewrite gkrellmd init script: better LSB compliance, hddtemp
   interoperability, avoidance of X error messages, general cleanup.