X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=lm_sensors.spec;h=df662a8366e2f37386cada1de827605c8fd4c9b3;hb=97ccafbd8c5f7896bd5535da82359ed5a9606d05;hp=2e20efe7cd8d03342654b3c29f30e0c6fafed285;hpb=25108117cedb02359e213e0296e43a79a601de37;p=packages%2Flm_sensors.git diff --git a/lm_sensors.spec b/lm_sensors.spec index 2e20efe..df662a8 100644 --- a/lm_sensors.spec +++ b/lm_sensors.spec @@ -1,11 +1,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 @@ -13,19 +8,20 @@ Summary(pt_BR.UTF-8): Ferramentas para monitoração do hardware Summary(ru.UTF-8): Утилиты для мониторинга аппаратуры Summary(uk.UTF-8): Утиліти для моніторингу апаратури Name: lm_sensors -Version: 3.0.3 -Release: 2 +Version: 3.3.2 +Release: 4 License: GPL v2+ Group: Applications/System Source0: http://dl.lm-sensors.org/lm-sensors/releases/%{name}-%{version}.tar.bz2 -# Source0-md5: e88b236228ac2a50821217015b8fd0fa -Source1: sensors.init -Source2: sensors.sysconfig +# Source0-md5: f357ba00b080ab102a170f7bf8bb2578 +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 +Source8: sensord.service Patch0: %{name}-ppc.patch Patch1: %{name}-iconv-in-libc.patch Patch2: %{name}-sensors-detect-PATH.patch @@ -33,14 +29,17 @@ Patch3: %{name}-make.patch URL: http://www.lm-sensors.org/ BuildRequires: bison BuildRequires: flex >= 2.5.1 -BuildRequires: perl-modules >= 1:5.6 BuildRequires: rpm-perlprov >= 3.0.3-16 -BuildRequires: rpmbuild(macros) >= 1.268 +BuildRequires: rpmbuild(macros) >= 1.647 BuildRequires: rrdtool-devel >= 1.2.10 -Requires: %{name}-config +Requires(post,preun): /sbin/chkconfig +Requires(post,preun,postun): systemd-units >= 38 Requires: %{name}-libs = %{version}-%{release} Requires: dev >= 2.9.0-13 +Requires: rc-scripts +Requires: systemd-units >= 38 Requires: uname(release) >= 2.6.5 +Obsoletes: lm_sensors-config-default BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %description @@ -133,27 +132,15 @@ Bibliotecas estáticas para desenvolvimento com lm_sensors Пакет 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 - -%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(post,preun,postun): systemd-units >= 38 Requires: %{name} = %{version}-%{release} -Requires: %{name}-config Requires: rc-scripts +#Requires: systemd-units >= 38 %description sensord Sensord daemon. @@ -203,7 +190,7 @@ temperatury są ustawione poprawnie, by nie spalić wnętrza komputera! %install rm -rf $RPM_BUILD_ROOT -install -d $RPM_BUILD_ROOT{%{_sbindir},%{_mandir}/man8} \ +install -d $RPM_BUILD_ROOT{%{_sbindir},%{_mandir}/man8,%{systemdunitdir}} \ $RPM_BUILD_ROOT/etc/{rc.d/init.d,sysconfig} %{__make} user_install \ @@ -215,13 +202,17 @@ install -d $RPM_BUILD_ROOT{%{_sbindir},%{_mandir}/man8} \ 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 + +install -p prog/init/lm_sensors.service $RPM_BUILD_ROOT%{systemdunitdir} +install -p %{SOURCE8} $RPM_BUILD_ROOT%{systemdunitdir}/sensord.service %clean rm -rf $RPM_BUILD_ROOT @@ -229,71 +220,79 @@ rm -rf $RPM_BUILD_ROOT %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 +NORESTART=1 +%systemd_post lm_sensors.service -%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 +%systemd_preun lm_sensors.service -%post sensord -if [ -f "%{cmodule}" ]; then - /sbin/chkconfig --add sensors - %service sensors restart "sensors daemon" +%postun +%systemd_reload + +%triggerpostun -- %{name} < 3.3.2-2 +%systemd_trigger lm_sensors.service + +%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" +%systemd_post sensord.service + %preun sensord if [ "$1" = "0" ]; then - %service sensors stop - /sbin/chkconfig --del sensors + %service sensord stop + /sbin/chkconfig --del sensord fi +%systemd_preun sensord.service + +%postun sensord +%systemd_reload + +%triggerpostun sensord -- %{name}-sensord < 3.3.2-2 +%systemd_trigger sensord.service %post fancontrol if [ "$1" = 1 ]; then @@ -310,9 +309,9 @@ fi %files %defattr(644,root,root,755) -%doc CHANGES README doc/chips +%doc CHANGES CONTRIBUTORS README doc/chips %doc doc/{donations,fan-divisors,progs,temperature-sensors,vid} -%doc prog/{daemon,maxilife} +%doc prog/daemon %attr(755,root,root) %{_bindir}/sensors-conf-convert %attr(755,root,root) %{_bindir}/sensors %attr(755,root,root) %{_bindir}/sensors.sh @@ -325,12 +324,13 @@ fi %endif %{_mandir}/man1/sensors.1* %{_mandir}/man5/sensors.conf.5* -%attr(754,root,root) /etc/rc.d/init.d/sensors_modules - -%files config-default -%defattr(644,root,root,755) +%{_mandir}/man5/sensors3.conf.5* +%{_mandir}/man8/sensors-detect.8* +%attr(754,root,root) /etc/rc.d/init.d/lm_sensors %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/sensors3.conf -%config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/sensors_modules +%dir %{_sysconfdir}/sensors.d +%config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/lm_sensors +%{systemdunitdir}/lm_sensors.service %files libs %defattr(644,root,root,755) @@ -351,10 +351,10 @@ fi %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 -%{_mandir}/man8/sensors-detect.8* +%attr(754,root,root) /etc/rc.d/init.d/sensord +%config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/sensord %{_mandir}/man8/sensord.8* +%{systemdunitdir}/sensord.service %files fancontrol %defattr(644,root,root,755)