SPECS: lm_sensors.spec - pl for -config-default - removed invalid ...

qboosh qboosh at pld-linux.org
Wed Nov 15 23:58:52 CET 2006


Author: qboosh                       Date: Wed Nov 15 22:58:52 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- pl for -config-default
- removed invalid usage of _sysconfdir
- include sensors_modules init script not only on x86*

---- Files affected:
SPECS:
   lm_sensors.spec (1.167 -> 1.168) 

---- Diffs:

================================================================
Index: SPECS/lm_sensors.spec
diff -u SPECS/lm_sensors.spec:1.167 SPECS/lm_sensors.spec:1.168
--- SPECS/lm_sensors.spec:1.167	Wed Nov 15 16:30:50 2006
+++ SPECS/lm_sensors.spec	Wed Nov 15 23:58:47 2006
@@ -4,10 +4,10 @@
 #   /usr/sbin/fancontrol.pl (isn't that the same as sh fancontrol script?)
 # - a big trigger warning how to use fancontrol and to init it first
 #
-%define		cmodule		%{_sysconfdir}/sysconfig/sensors_modules
-%define		cdaemon		%{_sysconfdir}/sysconfig/sensors
-%define		smodule		%{_sysconfdir}/rc.d/init.d/sensors_modules
-%define		sdaemon		%{_sysconfdir}/rc.d/init.d/sensors
+%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
@@ -138,8 +138,8 @@
 ĐĎÂŐÄĎ×É ĐŇĎÇŇÁÍ, ŃËŚ ×ÉËĎŇÉÓÔĎ×ŐŔÔŘ ÄÁÎŚ ÓĹÎÓĎŇŚ×.
 
 %package config-default
-Summary:	Sensors configuration files
-Summary(pl):	Pliki konfiguracyjne lm_sensors
+Summary:	Default sensors configuration files
+Summary(pl):	Domyślne pliki konfiguracyjne lm_sensors
 Group:		Applications/System
 Requires:	%{name} = %{version}-%{release}
 Provides:	%{name}-config
@@ -147,6 +147,9 @@
 %description config-default
 Default configuration files for lm_sensors.
 
+%description config-default -l pl
+Domyślne pliki konfiguracyjne lm_sensors.
+
 %package sensord
 Summary:	Sensord daemon
 Summary(pl):	Demon sensord
@@ -213,7 +216,7 @@
 rm -rf $RPM_BUILD_ROOT
 
 install -d $RPM_BUILD_ROOT{%{_sbindir},%{_mandir}/man8} \
-	$RPM_BUILD_ROOT%{_sysconfdir}/{rc.d/init.d,sysconfig}
+	$RPM_BUILD_ROOT/etc/{rc.d/init.d,sysconfig}
 
 %{__make} user_install \
 	DESTDIR=$RPM_BUILD_ROOT \
@@ -228,13 +231,13 @@
 
 install prog/eepromer/{eeprom,eepromer}	$RPM_BUILD_ROOT%{_sbindir}
 
-install %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/rc.d/init.d/sensors
-install %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/sensors
-install %{SOURCE3} $RPM_BUILD_ROOT%{_sysconfdir}/rc.d/init.d/fancontrol
-install %{SOURCE4} $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/fancontrol
+install %{SOURCE1} $RPM_BUILD_ROOT/etc/rc.d/init.d/sensors
+install %{SOURCE2} $RPM_BUILD_ROOT/etc/sysconfig/sensors
+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%{_sysconfdir}/rc.d/init.d/sensors_modules
-install %{SOURCE7} $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/sensors_modules
+install %{SOURCE6} $RPM_BUILD_ROOT/etc/rc.d/init.d/sensors_modules
+install %{SOURCE7} $RPM_BUILD_ROOT/etc/sysconfig/sensors_modules
 
 # i2c API for userspace - included in glibc-kernel-headers
 rm -f $RPM_BUILD_ROOT%{_includedir}/linux/i2c-dev.h
@@ -339,18 +342,18 @@
 %ifarch %{ix86} %{x8664}
 %attr(755,root,root) %{_sbindir}/isadump
 %attr(755,root,root) %{_sbindir}/isaset
-%attr(754,root,root) %{_sysconfdir}/rc.d/init.d/sensors_modules
 %{_mandir}/man8/isadump.8*
 %{_mandir}/man8/isaset.8*
 %endif
 %{_mandir}/man1/sensors.1*
 %{_mandir}/man5/sensors.conf.5*
 %{_mandir}/man8/i2c*.8*
+%attr(754,root,root) /etc/rc.d/init.d/sensors_modules
 
 %files config-default
 %defattr(644,root,root,755)
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/sensors.conf
-%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/sysconfig/sensors_modules
+%config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/sensors_modules
 
 %files libs
 %defattr(644,root,root,755)
@@ -371,8 +374,8 @@
 %files sensord
 %defattr(644,root,root,755)
 %attr(754,root,root) %{_sbindir}/sensord
-%attr(754,root,root) %{_sysconfdir}/rc.d/init.d/sensors
-%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/sysconfig/sensors
+%attr(754,root,root) /etc/rc.d/init.d/sensors
+%config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/sensors
 %{_mandir}/man8/sensors-detect.8*
 %{_mandir}/man8/sensord.8*
 
@@ -380,8 +383,8 @@
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_sbindir}/fancontrol
 %attr(755,root,root) %{_sbindir}/pwmconfig
-%attr(754,root,root) %{_sysconfdir}/rc.d/init.d/fancontrol
-%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/sysconfig/fancontrol
+%attr(754,root,root) /etc/rc.d/init.d/fancontrol
+%config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/fancontrol
 %{_mandir}/man8/fancontrol.8*
 %{_mandir}/man8/pwmconfig.8*
 
@@ -391,6 +394,11 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.168  2006/11/15 22:58:47  qboosh
+- pl for -config-default
+- removed invalid usage of _sysconfdir
+- include sensors_modules init script not only on x86*
+
 Revision 1.167  2006/11/15 15:30:50  pascalek
 - Release 2
 - loading modules and daemon init separation
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/lm_sensors.spec?r1=1.167&r2=1.168&f=u



More information about the pld-cvs-commit mailing list