From 141f63561a226c43d4022b720907b55796c2c2f7 Mon Sep 17 00:00:00 2001
From: Hans de Goede <jwrdegoede@fedoraproject.org>
Date: Sat, 10 Nov 2007 19:17:50 +0000
Subject: [PATCH] - New upstream release 3.0.0-rc3 - Remove eeprommer
 sub-package as eeprommer (and the other i2c-tools) have     moved to the new
 i2c-tools package

---
 .cvsignore      |  2 +-
 lm_sensors.spec | 64 +++++++++++++++++++++++++++----------------------
 sources         |  2 +-
 3 files changed, 38 insertions(+), 30 deletions(-)

diff --git a/.cvsignore b/.cvsignore
index cd4d76d..1658d21 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-lm_sensors-2.10.4.tar.gz
+lm_sensors-3.0.0-rc3.tar.bz2
diff --git a/lm_sensors.spec b/lm_sensors.spec
index 4b2ef47..3148825 100644
--- a/lm_sensors.spec
+++ b/lm_sensors.spec
@@ -1,8 +1,10 @@
+%define prever rc3
+
 Name: lm_sensors
-Version: 2.10.4
-Release: 2%{?dist}
+Version: 3.0.0
+Release: 0.1.%{prever}%{?dist}
 URL: http://www.lm-sensors.org/
-Source: http://dl.lm-sensors.org/lm-sensors/releases/%{name}-%{version}.tar.gz
+Source: http://dl.lm-sensors.org/lm-sensors/releases/%{name}-%{version}-%{prever}.tar.bz2
 Source1: lm_sensors.sysconfig
 # these 2 were taken from PLD-linux, Thanks!
 Source2: sensord.sysconfig
@@ -47,19 +49,8 @@ Daemon that periodically logs sensor readings to syslog or a round-robin
 database, and warns of sensor alarms.
 
 
-%package eepromer
-Summary: Programs for reading / writing i2c / smbus eeproms
-Group: Applications/System
-
-%description eepromer
-Programs for reading / writing i2c / smbus eeproms. Notice that writing the
-eeproms in your system is very dangerous and is likely to render your system
-unusable. Do not install, let alone use this, unless you really, _really_ know
-what you are doing.
-
-
 %prep
-%setup -q 
+%setup -q -n %{name}-%{version}-%{prever}
 %patch0 -p1
 mv prog/init/README prog/init/README.initscripts
 chmod -x prog/init/fancontrol.init
@@ -69,17 +60,12 @@ chmod -x prog/init/fancontrol.init
 export CFLAGS="%{optflags}"
 make PREFIX=%{_prefix} LIBDIR=%{_libdir} MANDIR=%{_mandir} EXLDFLAGS= \
   PROG_EXTRA=sensord user
-pushd prog/eepromer
-make
-popd
 
 
 %install
 rm -fr $RPM_BUILD_ROOT
 make PREFIX=%{_prefix} LIBDIR=%{_libdir} MANDIR=%{_mandir} PROG_EXTRA=sensord \
   DESTDIR=$RPM_BUILD_ROOT user_install
-install -m 755 prog/eepromer/{eepromer,eeprom,eeprog} \
-  $RPM_BUILD_ROOT%{_sbindir}
 rm $RPM_BUILD_ROOT%{_libdir}/libsensors.a
 
 # Remove userland kernel headers, belong in glibc-kernheaders.
@@ -98,6 +84,28 @@ install -p -m 755 %{SOURCE3} $RPM_BUILD_ROOT%{_initrddir}/sensord
 rm -fr $RPM_BUILD_ROOT
 
 
+# For conversion of sensors.conf on upgrades from 2.10.x to 3.x.x
+# First mv any /etc/sensors.conf.rpmsave from previous updates out of the way
+# Then after uninstall check if /etc/sensors.conf.rpmsave is created, if it
+# is the user was using a non pristine /etc/sensors.conf, so convert it
+
+%triggerun -- lm_sensors <= 2.10.999
+if [ -f /etc/sensors.conf.rpmsave ]; then
+  mv /etc/sensors.conf.rpmsave /etc/sensors.conf.rpmsave.old
+fi
+
+%triggerpostun -- lm_sensors <= 2.10.999
+if [ -f /etc/sensors.conf.rpmsave ]; then
+  mv /etc/sensors3.conf /etc/sensors3.conf.rpmnew
+  %{_bindir}/sensors-conf-convert < /etc/sensors.conf.rpmsave > \
+    /etc/sensors3.conf
+  rm /etc/sensors.conf.rpmsave
+fi
+if [ -f /etc/sensors.conf.rpmsave.old ]; then
+  mv /etc/sensors.conf.rpmsave.old /etc/sensors.conf.rpmsave
+fi
+
+
 %pre
 if [ -f /var/lock/subsys/sensors ]; then
     mv -f /var/lock/subsys/sensors /var/lock/subsys/lm_sensors
@@ -124,11 +132,12 @@ if [ $1 = 0 ]; then
 fi
 
 
+
 %files
 %defattr(-,root,root)
-%doc BACKGROUND BUGS CHANGES CONTRIBUTORS COPYING doc README* TODO
+%doc CHANGES CONTRIBUTORS COPYING doc README*
 %doc prog/init/fancontrol.init prog/init/README.initscripts
-%config(noreplace) %{_sysconfdir}/sensors.conf
+%config(noreplace) %{_sysconfdir}/sensors3.conf
 %{_bindir}/*
 %{_libdir}/*.so.*
 %{_mandir}/man1/*
@@ -138,7 +147,6 @@ fi
 %{_initrddir}/lm_sensors
 %config(noreplace) %{_sysconfdir}/sysconfig/lm_sensors
 %exclude %{_sbindir}/sensord
-%exclude %{_sbindir}/eepro*
 %exclude %{_mandir}/man8/sensord.8.gz
 
 %files devel
@@ -155,13 +163,13 @@ fi
 %{_initrddir}/sensord
 %config(noreplace) %{_sysconfdir}/sysconfig/sensord
 
-%files eepromer
-%defattr(-,root,root,-)
-%doc prog/eepromer/README*
-%{_sbindir}/eepro*
-
 
 %changelog
+* Sat Nov 10 2007 Hans de Goede <j.w.r.degoede@hhs.nl> - 3.0.0-0.1.rc3
+- New upstream release 3.0.0-rc3
+- Remove eeprommer sub-package as eeprommer (and the other i2c-tools)
+  have moved to the new i2c-tools package
+
 * Wed Aug 22 2007 Hans de Goede <j.w.r.degoede@hhs.nl> - 2.10.4-2
 - Update License tag for new Licensing Guidelines compliance
 - Disable service by default (no use without any sensors being configured),
diff --git a/sources b/sources
index 3ebe81e..80bbdec 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-96eb9ca1a1f1cb308757a7b8f0af93d6  lm_sensors-2.10.4.tar.gz
+f5164249493760f03517d84c13259456  lm_sensors-3.0.0-rc3.tar.bz2