[packages/daemontools] - drop upstart support - rel 13
baggins
baggins at pld-linux.org
Tue Aug 18 15:42:25 CEST 2015
commit beffaa8a5293a5ddbeac5e00159acfd2341ff853
Author: Jan Rękorajski <baggins at pld-linux.org>
Date: Tue Aug 18 22:41:54 2015 +0900
- drop upstart support
- rel 13
daemontools.spec | 7 ++-----
svscan.upstart | 27 ---------------------------
2 files changed, 2 insertions(+), 32 deletions(-)
---
diff --git a/daemontools.spec b/daemontools.spec
index 987922a..695fdbd 100644
--- a/daemontools.spec
+++ b/daemontools.spec
@@ -2,7 +2,7 @@ Summary: D. J. Bernstein daemontools
Summary(pl.UTF-8): daemontools D. J. Bernsteina
Name: daemontools
Version: 0.76
-Release: 12
+Release: 13
License: Public Domain
Group: Networking/Admin
Source0: http://cr.yp.to/daemontools/%{name}-%{version}.tar.gz
@@ -11,7 +11,6 @@ Source1: http://smarden.org/pape/djb/manpages/%{name}-%{version}-man.tar.gz
# Source1-md5: 2d3858a48f293c87202f76cd883438ee
Source2: %{name}.sysconfig
Source3: %{name}.init
-Source4: svscan.upstart
Patch0: %{name}-glibc.patch
URL: http://cr.yp.to/daemontools.html
BuildRequires: rpmbuild(macros) >= 1.268
@@ -64,7 +63,7 @@ echo "%{__cc} %{rpmldflags}" > src/conf-ld
%install
rm -rf $RPM_BUILD_ROOT
install -d $RPM_BUILD_ROOT{%{_sbindir},%{_mandir}/man8} \
- $RPM_BUILD_ROOT/etc/{rc.d/init.d,sysconfig,init} \
+ $RPM_BUILD_ROOT/etc/{rc.d/init.d,sysconfig} \
$RPM_BUILD_ROOT%{_sysconfdir}/supervise \
$RPM_BUILD_ROOT{/var/lib/service,%{servicedir}}
@@ -81,7 +80,6 @@ install -p envdir envuidgid fghack multilog pgrphack \
# install rc & sysconfig files
cp -p %{SOURCE2} $RPM_BUILD_ROOT/etc/sysconfig/svscan
install -p %{SOURCE3} $RPM_BUILD_ROOT/etc/rc.d/init.d/svscan
-cp -p %{SOURCE4} $RPM_BUILD_ROOT/etc/init/svscan.conf
%clean
rm -rf $RPM_BUILD_ROOT
@@ -120,7 +118,6 @@ fi
%dir %{_sysconfdir}/supervise
%attr(700,root,root) /var/lib/service
%attr(754,root,root) /etc/rc.d/init.d/svscan
-%config(noreplace) %verify(not md5 mtime size) /etc/init/svscan.conf
%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/svscan
%{_mandir}/man8/envdir.8*
%{_mandir}/man8/envuidgid.8*
diff --git a/svscan.upstart b/svscan.upstart
deleted file mode 100644
index 93f7557..0000000
--- a/svscan.upstart
+++ /dev/null
@@ -1,27 +0,0 @@
-description "svscan (scan and run services)"
-
-start on local-filesystems
-stop on pld.shutdown-started
-
-respawn
-console output
-
-env SVSCAN_DIR="/service"
-
-pre-start script
- test -w "$SVSCAN_DIR"
-end script
-
-exec /usr/sbin/svscan $SVSCAN_DIR
-
-post-stop script
- # bring everything down, svscan maybe forgot some
- for s in $SVSCAN_DIR/*{,/log}/run; do
- if [ -x "$s" ]; then
- svc="$svc ${s%/run}"
- fi
- done
- if [ "$svc" ]; then
- svc -d -x $svc
- fi
-end script
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/daemontools.git/commitdiff/beffaa8a5293a5ddbeac5e00159acfd2341ff853
More information about the pld-cvs-commit
mailing list