packages: lm_sensors/lm_sensors.spec - cleaned up the package from our crap...
baggins
baggins at pld-linux.org
Wed Apr 18 13:46:58 CEST 2012
Author: baggins Date: Wed Apr 18 11:46:58 2012 GMT
Module: packages Tag: HEAD
---- Log message:
- cleaned up the package from our crappy invetions
- kill config-default package
- rename sensors to sensord scripts which it really is
- use lm_sensors and sensors detect instead of sensors_modules
---- Files affected:
packages/lm_sensors:
lm_sensors.spec (1.203 -> 1.204)
---- Diffs:
================================================================
Index: packages/lm_sensors/lm_sensors.spec
diff -u packages/lm_sensors/lm_sensors.spec:1.203 packages/lm_sensors/lm_sensors.spec:1.204
--- packages/lm_sensors/lm_sensors.spec:1.203 Sun Mar 18 19:09:38 2012
+++ packages/lm_sensors/lm_sensors.spec Wed Apr 18 13:46:53 2012
@@ -2,11 +2,6 @@
# TODO
# - a big trigger warning how to use fancontrol and to init it first
#
-%define cmodule /etc/sysconfig/sensors_modules
-%define cdaemon /etc/sysconfig/sensors
-%define smodule /etc/rc.d/init.d/sensors_modules
-%define sdaemon /etc/rc.d/init.d/sensors
-
%include /usr/lib/rpm/macros.perl
Summary: Hardware health monitoring
Summary(pl.UTF-8): Monitor stanu sprzętu
@@ -15,18 +10,18 @@
Summary(uk.UTF-8): Утиліти для моніторингу апаратури
Name: lm_sensors
Version: 3.3.2
-Release: 1
+Release: 1.1
License: GPL v2+
Group: Applications/System
Source0: http://dl.lm-sensors.org/lm-sensors/releases/%{name}-%{version}.tar.bz2
# Source0-md5: f357ba00b080ab102a170f7bf8bb2578
-Source1: sensors.init
-Source2: sensors.sysconfig
+Source1: sensord.init
+Source2: sensord.sysconfig
Source3: fancontrol.init
Source4: fancontrol.sysconfig
Source5: sensors.sh
-Source6: sensors_modules.init
-Source7: sensors_modules.sysconfig
+Source6: lm_sensors.init
+Source7: lm_sensors.sysconfig
Patch0: %{name}-ppc.patch
Patch1: %{name}-iconv-in-libc.patch
Patch2: %{name}-sensors-detect-PATH.patch
@@ -37,10 +32,10 @@
BuildRequires: rpm-perlprov >= 3.0.3-16
BuildRequires: rpmbuild(macros) >= 1.268
BuildRequires: rrdtool-devel >= 1.2.10
-Requires: %{name}-config >= 3
Requires: %{name}-libs = %{version}-%{release}
Requires: dev >= 2.9.0-13
Requires: uname(release) >= 2.6.5
+Obsoletes: lm_sensors-config-default
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
%description
@@ -133,26 +128,12 @@
Пакет lm_sensors-static містить статичні бібліотеки, необхідні для
побудови програм, які використовують дані сенсорів.
-%package config-default
-Summary: Default sensors configuration files
-Summary(pl.UTF-8): Domyślne pliki konfiguracyjne lm_sensors
-Group: Applications/System
-Requires: %{name} = %{version}-%{release}
-Provides: %{name}-config = %{version}
-
-%description config-default
-Default configuration files for lm_sensors.
-
-%description config-default -l pl.UTF-8
-Domyślne pliki konfiguracyjne lm_sensors.
-
%package sensord
Summary: Sensord daemon
Summary(pl.UTF-8): Demon sensord
Group: Daemons
Requires(post,preun): /sbin/chkconfig
Requires: %{name} = %{version}-%{release}
-Requires: %{name}-config
Requires: rc-scripts
%description sensord
@@ -215,13 +196,13 @@
PROG_EXTRA:="sensord" \
SYSFS_SUPPORT:=1
-install %{SOURCE1} $RPM_BUILD_ROOT/etc/rc.d/init.d/sensors
-install %{SOURCE2} $RPM_BUILD_ROOT/etc/sysconfig/sensors
+install %{SOURCE1} $RPM_BUILD_ROOT/etc/rc.d/init.d/sensord
+install %{SOURCE2} $RPM_BUILD_ROOT/etc/sysconfig/sensord
install %{SOURCE3} $RPM_BUILD_ROOT/etc/rc.d/init.d/fancontrol
install %{SOURCE4} $RPM_BUILD_ROOT/etc/sysconfig/fancontrol
install %{SOURCE5} $RPM_BUILD_ROOT%{_bindir}
-install %{SOURCE6} $RPM_BUILD_ROOT/etc/rc.d/init.d/sensors_modules
-install %{SOURCE7} $RPM_BUILD_ROOT/etc/sysconfig/sensors_modules
+install %{SOURCE6} $RPM_BUILD_ROOT/etc/rc.d/init.d/lm_sensors
+install %{SOURCE7} $RPM_BUILD_ROOT/etc/sysconfig/lm_sensors
install -d $RPM_BUILD_ROOT/%{_sysconfdir}/sensors.d
%clean
@@ -230,70 +211,61 @@
%post libs -p /sbin/ldconfig
%postun libs -p /sbin/ldconfig
-%post
-if [ -f "%{cmodule}" ]; then
- /sbin/chkconfig --add sensors_modules
- %service sensors_modules restart "sensors modules"
- if [ -f "%{sdaemon}" ]; then
- /sbin/chkconfig --add sensors
- %service sensors restart "sensors deamon"
- fi
-fi
-
-%preun
-if [ "$1" = "0" ]; then
- if [ -f "%{sdaemon}" ]; then
- %service sensors stop
- /sbin/chkconfig --del sensors
- fi
- %service sensors_modules stop
+%pre
+if [ -f /var/lock/subsys/sensors_modules ]; then
+ mv -f /var/lock/subsys/sensors_modules /var/lock/subsys/lm_sensors
/sbin/chkconfig --del sensors_modules
fi
+if [ -f /etc/sysconfig/sensors_modules ]; then
+ . /etc/sysconfig/sensors_modules
+ [ -z "$BUS" ] || echo BUS_MODULES=\""$BUS"\" >>/etc/sysconfig/lm_sensors
+ [ -z "$CHIP" ] || echo HWMON_MODULES=\""$CHIP"\" >>/etc/sysconfig/lm_sensors
+fi
+
+%if 0
+#"
+%endif
-%post config-default
+%post
if [ "$1" = 1 ]; then
cat << EOF
*********************************************************************
* *
* NOTE: *
* You have to configure sensors to match your motherboard sensors *
- * in /etc/sensors.conf and /etc/sysconfig/sensors_modules. Use *
- * sensors-detect script which can help you find proper modules. *
+ * in /etc/sensors3.conf and /etc/sysconfig/lm_sensors. *
+ * Use sensors-detect script to find proper modules. *
* *
*********************************************************************
EOF
fi
-if [ -f "%{smodule}" ]; then
- /sbin/chkconfig --add sensors_modules
- %service sensors_modules restart "sensors modules"
-fi
-if [ -f "%{sdaemon}" ]; then
- /sbin/chkconfig --add sensors
- %service sensors restart "sensors daemon"
-fi
+/sbin/chkconfig --add lm_sensors
-%preun config-default
+%preun
if [ "$1" = "0" ]; then
- if [ -f "%{sdaemon}" ]; then
- %service sensors stop
- /sbin/chkconfig --del sensors
- fi
- if [ -f "%{smodule}" ]; then
- %service sensors_modules stop
- /sbin/chkconfig --del sensors_modules
- fi
+ %service lm_sensors stop
+ /sbin/chkconfig --del lm_sensors
fi
-%post sensord
-if [ -f "%{cmodule}" ]; then
- /sbin/chkconfig --add sensors
- %service sensors restart "sensors daemon"
+%pre sensord
+if [ -f /var/lock/subsys/sensors ]; then
+ mv -f /var/lock/subsys/sensors /var/lock/subsys/sensord
+fi
+if [ -f /etc/rc.d/init.d/sensors ]; then
+ /sbin/chkconfig --del sensors
fi
+if [ -f /etc/sysconfig/sensors ]; then
+ cp -a /etc/sysconfig/sensors /etc/sysconfig/sensord
+fi
+
+%post sensord
+/sbin/chkconfig --add sensord
+%service sensord restart "sensors daemon"
%preun sensord
if [ "$1" = "0" ]; then
- %service sensors stop
- /sbin/chkconfig --del sensors
+ %service sensord stop
+ /sbin/chkconfig --del sensord
fi
%post fancontrol
@@ -328,13 +300,10 @@
%{_mandir}/man5/sensors.conf.5*
%{_mandir}/man5/sensors3.conf.5*
%{_mandir}/man8/sensors-detect.8*
-%attr(754,root,root) /etc/rc.d/init.d/sensors_modules
-
-%files config-default
-%defattr(644,root,root,755)
+%attr(754,root,root) /etc/rc.d/init.d/lm_sensors
%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/sensors3.conf
%dir %{_sysconfdir}/sensors.d
-%config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/sensors_modules
+%config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/lm_sensors
%files libs
%defattr(644,root,root,755)
@@ -355,8 +324,8 @@
%files sensord
%defattr(644,root,root,755)
%attr(754,root,root) %{_sbindir}/sensord
-%attr(754,root,root) /etc/rc.d/init.d/sensors
-%config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/sensors
+%attr(754,root,root) /etc/rc.d/init.d/sensord
+%config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/sensord
%{_mandir}/man8/sensord.8*
%files fancontrol
@@ -374,6 +343,12 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.204 2012/04/18 11:46:53 baggins
+- cleaned up the package from our crappy invetions
+- kill config-default package
+- rename sensors to sensord scripts which it really is
+- use lm_sensors and sensors detect instead of sensors_modules
+
Revision 1.203 2012/03/18 18:09:38 qboosh
- updated to 3.3.2
================================================================
---- CVS-web:
http://cvs.pld-linux.org/packages/lm_sensors/lm_sensors.spec?r1=1.203&r2=1.204
More information about the pld-cvs-commit
mailing list