packages: smartmontools/smartmontools.spec - rel 3 - systemd support moved ...

[baggins]

Author: baggins                      Date: Tue Feb 14 17:08:01 2012 GMT
Module: packages                      Tag: HEAD
---- Log message:
- rel 3
- systemd support moved to main package

---- Files affected:
packages/smartmontools:
   smartmontools.spec (1.45 -> 1.46) 

---- Diffs:

================================================================
Index: packages/smartmontools/smartmontools.spec
diff -u packages/smartmontools/smartmontools.spec:1.45 packages/smartmontools/smartmontools.spec:1.46
--- packages/smartmontools/smartmontools.spec:1.45	Fri Dec  2 20:55:19 2011
+++ packages/smartmontools/smartmontools.spec	Tue Feb 14 18:07:56 2012
@@ -9,7 +9,7 @@
 Summary(pt.UTF-8):	smartmontools - para monitorar discos e dispositivos S.M.A.R.T.
 Name:		smartmontools
 Version:	5.42
-Release:	2
+Release:	3
 License:	GPL v2+
 Group:		Applications/System
 Source0:	http://downloads.sourceforge.net/smartmontools/%{name}-%{version}.tar.gz
@@ -22,10 +22,12 @@
 BuildRequires:	automake
 BuildRequires:	libcap-ng-devel
 BuildRequires:	libstdc++-devel
-BuildRequires:	rpmbuild(macros) >= 1.268
+BuildRequires:	rpmbuild(macros) >= 1.626
 Requires(post,preun):	/sbin/chkconfig
 Requires:	rc-scripts >= 0.4.3.0
+Requires:	systemd-units >= 37-0.10
 Obsoletes:	smartctl
+Obsoletes:	smartmontools-systemd
 Obsoletes:	smartsuite
 Obsoletes:	ucsc-smartsuite
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -143,14 +145,6 @@
 possível de informações "específicas do fabricante" e "reservadas"
 sobre unidades de disco.
 
-%package systemd
-Summary:	systemd units for smartd
-Group:		Base
-Requires:	%{name} = %{version}-%{release}
-
-%description systemd
-systemd units for smartd.
-
 %prep
 %setup -q
 
@@ -183,12 +177,20 @@
 %post
 /sbin/chkconfig --add smartd
 %service smartd restart
+%systemd_post smartd.service
 
 %preun
 if [ "$1" = "0" ]; then
 	%service smartd stop
 	/sbin/chkconfig --del smartd
 fi
+%systemd_preun smartd.service
+
+%postun
+%systemd_reload
+
+%triggerpostun -- %{name} < 5.42-3
+%systemd_trigger crond.service
 
 %files
 %defattr(644,root,root,755)
@@ -199,21 +201,22 @@
 %attr(754,root,root) /etc/rc.d/init.d/smartd
 %config(noreplace) %verify(not md5 mtime size) /etc/init/smartd.conf
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/smartd.conf
+/lib/systemd/system/smartd.service
 %{_datadir}/smartmontools
 %{_mandir}/man5/smartd.conf.5*
 %{_mandir}/man8/smartctl.8*
 %{_mandir}/man8/smartd.8*
 
-%files systemd
-%defattr(644,root,root,755)
-/lib/systemd/system/smartd.service
-
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
 * %{date} PLD Team <feedback at pld-linux.org>
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.46  2012/02/14 17:07:56  baggins
+- rel 3
+- systemd support moved to main package
+
 Revision 1.45  2011/12/02 19:55:19  cactus
 - rel 2; systemd support
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/smartmontools/smartmontools.spec?r1=1.45&r2=1.46&f=u