rpms/vpnc/EL-5 vpnc.spec,1.23,1.24

[Huzaifa Sidhpurwala]

Author: huzaifas

Update of /cvs/pkgs/rpms/vpnc/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30375

Modified Files:
	vpnc.spec 
Log Message:
fix upstart dep issue and other cleanups


Index: vpnc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/vpnc/EL-5/vpnc.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -p -r1.23 -r1.24
--- vpnc.spec	5 Jan 2010 10:58:08 -0000	1.23
+++ vpnc.spec	11 Feb 2010 04:16:19 -0000	1.24
@@ -1,6 +1,6 @@
 Name:           vpnc
 Version:        0.5.3
-Release:        6%{?dist}
+Release:        7%{?dist}
 
 Summary:        IPSec VPN client compatible with Cisco equipment
 
@@ -13,14 +13,13 @@ Source2:	vpnc.consolehelper
 Source3:	vpnc-disconnect.consolehelper
 Source4:	vpnc.pam
 Source5:	vpnc-helper
-Source6:	vpnc-cleanup
-Patch2:		vpnc-0.5.3-cloexec.patch
-Patch3:		vpnc-0.5.1-dpd.patch
+Patch0:		vpnc-0.5.3-cloexec.patch
+Patch1:		vpnc-0.5.1-dpd.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  libgcrypt-devel > 1.1.90
-Requires:       upstart iproute
+Requires:       iproute
 
 %description
 A VPN client compatible with Cisco's EasyVPN equipment.
@@ -40,8 +39,8 @@ switching to the root account.
 
 %prep
 %setup -q
-%patch2 -p1 -b .cloexec
-%patch3 -p1 -b .dpd
+%patch0 -p1 -b .cloexec
+%patch1 -p1 -b .dpd
 
 %build
 CFLAGS="$RPM_OPT_FLAGS -fPIE" LDFLAGS="$RPM_OPT_FLAGS -pie" make PREFIX=/usr 
@@ -71,8 +70,6 @@ install -m 0755 %{SOURCE5} \
 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
 rm -f $RPM_BUILD_ROOT%{_datadir}/doc/vpnc/COPYING
 
 %clean
@@ -85,7 +82,6 @@ rm -rf $RPM_BUILD_ROOT
 %dir %{_sysconfdir}/vpnc
 %config(noreplace) %{_sysconfdir}/vpnc/vpnc-script
 %config(noreplace) %{_sysconfdir}/vpnc/default.conf
-%config(noreplace) %{_sysconfdir}/event.d/vpnc-cleanup
 %{_sbindir}/vpnc
 %{_bindir}/cisco-decrypt
 %{_sbindir}/vpnc-disconnect
@@ -104,6 +100,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_sbindir}/vpnc-helper
 
 %changelog
+* Thu Feb 11 2010 Huzaifa Sidhpurwala <huzaifas at redhat.com> - 0.5.3-7
+- Remove deps from upstart and other cleanups
+
 * Tue Jan 05 2010 Huzaifa Sidhpurwala <huzaifas at redhat.com> - 0.5.3-6
 - Include vpnc-cleanup