rpms/gkrellm/devel gkrellm.spec,1.6,1.7

[Hans de Goede (jwrdegoede)]

Author: jwrdegoede

Update of /cvs/extras/rpms/gkrellm/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25300

Modified Files:
	gkrellm.spec 
Log Message:
* Fri Jul 20 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 2.2.10-3
- Rebuild, including libsensors support on ppc and ppc64 as lm_sensors is
  available there now.



Index: gkrellm.spec
===================================================================
RCS file: /cvs/extras/rpms/gkrellm/devel/gkrellm.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- gkrellm.spec	8 Nov 2006 18:35:24 -0000	1.6
+++ gkrellm.spec	20 Jul 2007 17:07:04 -0000	1.7
@@ -1,6 +1,6 @@
 Name:           gkrellm
 Version:        2.2.10
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Multiple stacked system monitors in one process
 Group:          Applications/System
 License:        GPL
@@ -17,9 +17,7 @@
 Patch5:         gkrellm-2.2.9-gkrellmd.conf.patch
 Patch6:         gkrellm-2.2.10-via686.patch
 BuildRequires:  gtk2-devel openssl-devel libSM-devel desktop-file-utils gettext
-%ifarch %{ix86} x86_64
 BuildRequires:  lm_sensors-devel
-%endif
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %description
@@ -81,15 +79,8 @@
 
 
 %build
-%ifarch %{ix86} x86_64
-CFLAGS="$RPM_OPT_FLAGS -DHAVE_LIBSENSORS"
-SYS_LIBS="-lsensors"
-%else
-CFLAGS="$RPM_OPT_FLAGS"
-SYS_LIBS=
-%endif
 make %{?_smp_mflags} INSTALLROOT=%{_prefix} PKGCONFIGDIR=%{_libdir}/pkgconfig \
-  INCLUDEDIR=%{_includedir} CFLAGS="$CFLAGS" SYS_LIBS="$SYS_LIBS"
+  INCLUDEDIR=%{_includedir} CFLAGS="$RPM_OPT_FLAGS"
 
 
 %install
@@ -182,6 +173,10 @@
 
 
 %changelog
+* Fri Jul 20 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 2.2.10-3
+- Rebuild, including libsensors support on ppc and ppc64 as lm_sensors is
+  available there now.
+
 * Wed Nov  8 2006 Hans de Goede <j.w.r.degoede at hhs.nl> 2.2.10-2
 - Add special case for via 686 volt sensors <sigh> (bug 213304)