Author: blues Date: Mon Jun 28 14:42:09 2010 GMT
Module: packages Tag: HEAD
---- Log message:
- rel.2 - upstart support
---- Files affected:
packages/radsecproxy:
radsecproxy.init (1.3 -> 1.4) , radsecproxy.spec (1.9 -> 1.10)
---- Diffs:
================================================================
Index: packages/radsecproxy/radsecproxy.init
diff -u packages/radsecproxy/radsecproxy.init:1.3
packages/radsecproxy/radsecproxy.init:1.4
--- packages/radsecproxy/radsecproxy.init:1.3 Mon Jun 28 15:23:11 2010
+++ packages/radsecproxy/radsecproxy.init Mon Jun 28 16:42:04 2010
@@ -20,6 +20,8 @@
# Get service config
[ -f /etc/sysconfig/radsecproxy ] && . /etc/sysconfig/radsecproxy
+upstart_controlled
+
# Check that networking is up.
if is_yes "${NETWORKING}"; then
if [ ! -f /var/lock/subsys/network -a "$1" != stop -a "$1" != status ];
then
================================================================
Index: packages/radsecproxy/radsecproxy.spec
diff -u packages/radsecproxy/radsecproxy.spec:1.9
packages/radsecproxy/radsecproxy.spec:1.10
--- packages/radsecproxy/radsecproxy.spec:1.9 Wed Jun 16 16:51:07 2010
+++ packages/radsecproxy/radsecproxy.spec Mon Jun 28 16:42:04 2010
@@ -5,13 +5,14 @@
Summary: RADIUS proxy that in addition to to usual RADIUS UDP transport,
also supports TLS (RadSec)
Name: radsecproxy
Version: 1.4
-Release: 1
+Release: 2
License: GPLv2+ or BSD-like
Group: Networking/Daemons/Radius
Source0: http://software.uninett.no/radsecproxy/%{name}-%{version}.tar.gz
# Source0-md5: 7b5248b2a7a133561cf685730824c893
Source1: %{name}.init
Source2: %{name}.logrotate
+Source3: %{name}.upstart
URL: http://software.uninett.no/radsecproxy/
#For manual creation:
#BuildRequires: docbook2x-to-man
@@ -26,6 +27,19 @@
executable on Linux is only about 48 Kb, and it uses about 64 Kb
(depending on the number of peers) while running.
+%package upstart
+Summary: Upstart job description for %{name}
+Summary(pl.UTF-8): Opis zadania Upstart dla %{name}
+Group: Daemons
+Requires: %{name} = %{version}-%{release}
+Requires: upstart >= 0.6
+
+%description upstart
+Upstart job description for %{name}.
+
+%description upstart -l pl.UTF-8
+Opis zadania Upstart dla %{name}.
+
%prep
%setup -q
@@ -36,7 +50,7 @@
%install
rm -rf $RPM_BUILD_ROOT
install -d $RPM_BUILD_ROOT%{_sysconfdir}/radsecproxy.conf.d \
- $RPM_BUILD_ROOT/etc/{rc.d/init.d,sysconfig,logrotate.d}
+ $RPM_BUILD_ROOT/etc/{rc.d/init.d,sysconfig,logrotate.d,init}
%{__make} install \
DESTDIR=$RPM_BUILD_ROOT
@@ -45,6 +59,7 @@
install %{SOURCE1} $RPM_BUILD_ROOT/etc/rc.d/init.d/%{name}
install %{SOURCE2} $RPM_BUILD_ROOT/etc/logrotate.d/%{name}
+install %{SOURCE3} $RPM_BUILD_ROOT/etc/init/%{name}.conf
%clean
rm -rf $RPM_BUILD_ROOT
@@ -59,6 +74,12 @@
/sbin/chkconfig --del %{name}
fi
+%post upstart
+%upstart_post %{name}
+
+%postun upstart
+%upstart_postun %{name}
+
%files
%defattr(644,root,root,755)
%doc AUTHORS ChangeLog README
@@ -72,12 +93,19 @@
# With manual created:
#%{_mandir}/man5/*
+%files upstart
+%defattr(644,root,root,755)
+%config(noreplace) %verify(not md5 mtime size) /etc/init/%{name}.conf
+
%define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`)
%changelog
* %{date} PLD Team <[email protected]>
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.10 2010/06/28 14:42:04 blues
+- rel.2 - upstart support
+
Revision 1.9 2010/06/16 14:51:07 blues
- rel.1
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/radsecproxy/radsecproxy.init?r1=1.3&r2=1.4&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/radsecproxy/radsecproxy.spec?r1=1.9&r2=1.10&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
