rpms/vpnc/devel vpnc-cleanup,1.2,1.3 vpnc.spec,1.37,1.38

[Bill Nottingham]

Author: notting

Update of /cvs/extras/rpms/vpnc/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11182

Modified Files:
	vpnc-cleanup vpnc.spec 
Log Message:
Adjust for upstart 0.6.

Job files go in /etc/init, and end in .conf.

Since 'service' is the default job type, mark this as 'task' (i.e.,
do not respawn.)



Index: vpnc-cleanup
===================================================================
RCS file: /cvs/extras/rpms/vpnc/devel/vpnc-cleanup,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- vpnc-cleanup	20 Nov 2008 09:56:12 -0000	1.2
+++ vpnc-cleanup	9 Dec 2009 21:49:07 -0000	1.3
@@ -3,6 +3,7 @@
 
 start on stopped rcS
 
+task
 script
 	rm -f /var/run/vpnc/pid
 	RESOLV_CONF_BACKUP=/var/run/vpnc/resolv.conf-backup


Index: vpnc.spec
===================================================================
RCS file: /cvs/extras/rpms/vpnc/devel/vpnc.spec,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -p -r1.37 -r1.38
--- vpnc.spec	17 Nov 2009 17:17:21 -0000	1.37
+++ vpnc.spec	9 Dec 2009 21:49:07 -0000	1.38
@@ -1,6 +1,6 @@
 Name:           vpnc
 Version:        0.5.3
-Release:        6%{?dist}
+Release:        7%{?dist}
 
 Summary:        IPSec VPN client compatible with Cisco equipment
 
@@ -21,7 +21,7 @@ Patch3:		vpnc-0.5.1-dpd.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  libgcrypt-devel > 1.1.90
-Requires:       upstart iproute vpnc-script
+Requires:       upstart >= 0.6.0, iproute vpnc-script
 
 %description
 A VPN client compatible with Cisco's EasyVPN equipment.
@@ -85,7 +85,7 @@ mkdir -p $RPM_BUILD_ROOT%{_bindir}
 ln -sf consolehelper $RPM_BUILD_ROOT%{_bindir}/vpnc
 ln -sf consolehelper $RPM_BUILD_ROOT%{_bindir}/vpnc-disconnect
 install -Dp -m 0644 %{SOURCE6} \
-    $RPM_BUILD_ROOT%{_sysconfdir}/event.d/vpnc-cleanup
+    $RPM_BUILD_ROOT%{_sysconfdir}/init/vpnc-cleanup.conf
 rm -f $RPM_BUILD_ROOT%{_datadir}/doc/vpnc/COPYING
 
 %clean
@@ -97,7 +97,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %dir %{_sysconfdir}/vpnc
 %config(noreplace) %{_sysconfdir}/vpnc/default.conf
-%config(noreplace) %{_sysconfdir}/event.d/vpnc-cleanup
+%config(noreplace) %{_sysconfdir}/init/vpnc-cleanup
 %{_sbindir}/vpnc
 %{_bindir}/cisco-decrypt
 %{_sbindir}/vpnc-disconnect
@@ -119,6 +119,9 @@ rm -rf $RPM_BUILD_ROOT
 %config(noreplace) %{_sysconfdir}/vpnc/vpnc-script
 
 %changelog
+* Wed Dec  9 2009 Bill Nottingham <notting at redhat.com> - 0.5.3-7
+- Adjust for upstart 0.6
+
 * Tue Nov 17 2009 David Woodhouse <David.Woodhouse at intel.com> - 0.5.3-6
 - Update vpnc-script to support IPv6 properly