[packages/smartmontools] - drop upstart support - rel 2

[baggins]

commit 071992cd32886bebdd56d288a6a1d9496f7de966
Author: Jan Rękorajski <baggins at pld-linux.org>
Date:   Tue Aug 18 23:14:30 2015 +0900

    - drop upstart support
    - rel 2

 smartd.upstart     | 9 ---------
 smartmontools.init | 2 --
 smartmontools.spec | 7 ++-----
 3 files changed, 2 insertions(+), 16 deletions(-)
---
diff --git a/smartmontools.spec b/smartmontools.spec
index cabd142..1c8f4b6 100644
--- a/smartmontools.spec
+++ b/smartmontools.spec
@@ -17,13 +17,12 @@ Summary(pl.UTF-8):	Monitorowanie i kontrola dysków za pomocą S.M.A.R.T
 Summary(pt.UTF-8):	smartmontools - para monitorar discos e dispositivos S.M.A.R.T.
 Name:		smartmontools
 Version:	6.4
-Release:	1
+Release:	2
 License:	GPL v2+
 Group:		Applications/System
 Source0:	http://downloads.sourceforge.net/smartmontools/%{name}-%{version}.tar.gz
 # Source0-md5:	56812c8312fd123ed40ef65afde1049e
 Source1:	%{name}.init
-Source2:	smartd.upstart
 Source3:	10mail
 Source4:	10powersave-notify
 Source5:	smartd-runner
@@ -195,9 +194,8 @@ rm -rf $RPM_BUILD_ROOT
 	examplesdir=%{_examplesdir}/%{name}-%{version} \
 	DESTDIR=$RPM_BUILD_ROOT
 
-install -d $RPM_BUILD_ROOT{/etc/{rc.d/init.d,init,smartmontools/{run,smartd_warning}.d,sysconfig},%{systemdunitdir},%{_datadir}/%{name}}
+install -d $RPM_BUILD_ROOT{/etc/{rc.d/init.d,smartmontools/{run,smartd_warning}.d,sysconfig},%{systemdunitdir},%{_datadir}/%{name}}
 install -p %{SOURCE1} $RPM_BUILD_ROOT/etc/rc.d/init.d/smartd
-cp -p %{SOURCE2} $RPM_BUILD_ROOT/etc/init/smartd.conf
 cp -p %{SOURCE3} $RPM_BUILD_ROOT/etc/smartmontools/run.d/10mail
 cp -p %{SOURCE4} $RPM_BUILD_ROOT/etc/smartmontools/run.d/10powersave-notify
 cp -p %{SOURCE5} $RPM_BUILD_ROOT%{_datadir}/%{name}/smartd-runner
@@ -229,7 +227,6 @@ fi
 %defattr(644,root,root,755)
 %doc AUTHORS ChangeLog NEWS README TODO
 %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
 %dir %{_sysconfdir}/%{name}
 %dir %{_sysconfdir}/%{name}/run.d
diff --git a/smartd.upstart b/smartd.upstart
deleted file mode 100644
index 525a99f..0000000
--- a/smartd.upstart
+++ /dev/null
@@ -1,9 +0,0 @@
-description "S.M.A.R.T. Daemon"
-
-# as soon as /usr is mounted
-start on local-filesystems
-stop on pld.shutdown-started
-
-respawn
-
-exec /usr/sbin/smartd -n
diff --git a/smartmontools.init b/smartmontools.init
index 4384c34..1d26045 100755
--- a/smartmontools.init
+++ b/smartmontools.init
@@ -11,8 +11,6 @@
 # Source function library
 . /etc/rc.d/init.d/functions
 
-upstart_controlled
-
 # Get service config - may override defaults
 [ -f /etc/sysconfig/smartd ] && . /etc/sysconfig/smartd
 
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/smartmontools.git/commitdiff/071992cd32886bebdd56d288a6a1d9496f7de966