rpms/vpnc/devel vpnc-0.3.3-sbin-path.patch, NONE, 1.1 vpnc.spec, 1.6, 1.7

[Tomas Mraz (tmraz)]

Author: tmraz

Update of /cvs/extras/rpms/vpnc/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14678

Modified Files:
	vpnc.spec 
Added Files:
	vpnc-0.3.3-sbin-path.patch 
Log Message:
* Mon May 30 2005 Tomas Mraz <tmraz at redhat.com> 0.3.3-2
- package /var/run/vpnc and ghost files it can contain (#159015)
- add /sbin /usr/sbin to the path in vpnc-script (#159099)


vpnc-0.3.3-sbin-path.patch:

--- NEW FILE vpnc-0.3.3-sbin-path.patch ---
--- vpnc-0.3.3/vpnc-script.path	2005-05-05 19:05:18.000000000 +0200
+++ vpnc-0.3.3/vpnc-script	2005-05-30 10:14:03.000000000 +0200
@@ -18,6 +18,7 @@
 
 #set -x
 
+PATH=/sbin:/usr/sbin:$PATH
 OS="`uname -s`"
 DEFAULT_ROUTE_FILE=/var/run/vpnc/defaultroute
 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.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- vpnc.spec	16 May 2005 09:48:46 -0000	1.6
+++ vpnc.spec	30 May 2005 08:24:08 -0000	1.7
@@ -1,6 +1,6 @@
 Name:           vpnc
 Version:        0.3.3
-Release:        1
+Release:        2
 
 Summary:        IPSec VPN client compatible with Cisco equipment
 
@@ -10,6 +10,7 @@
 Source0:        vpnc-0.3.3.tar.gz
 Source1:        generic-vpnc.conf
 Patch0:         vpnc-0.3.2-pie.patch
+Patch1:		vpnc-0.3.3-sbin-path.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  libgcrypt-devel > 1.1.90
@@ -24,6 +25,7 @@
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
 
 %build
 make PREFIX=/usr
@@ -33,7 +35,10 @@
 make install DESTDIR="$RPM_BUILD_ROOT" PREFIX=/usr
 install -m 0600 %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/vpnc/default.conf
 rm $RPM_BUILD_ROOT%{_sysconfdir}/vpnc/vpnc.conf
-
+mkdir -p $RPM_BUILD_ROOT%{_var}/run/vpnc
+touch $RPM_BUILD_ROOT%{_var}/run/vpnc/pid \
+      $RPM_BUILD_ROOT%{_var}/run/vpnc/defaultroute \
+      $RPM_BUILD_ROOT%{_var}/run/vpnc/resolv.conf-backup
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -46,8 +51,16 @@
 %{_sbindir}/*
 %{_sysconfdir}/vpnc
 %{_mandir}/man8/*
+%dir %{_var}/run/vpnc
+%ghost %verify(not md5 size mtime) %{_var}/run/vpnc/pid
+%ghost %verify(not md5 size mtime) %{_var}/run/vpnc/defaultroute
+%ghost %verify(not md5 size mtime) %{_var}/run/vpnc/resolv.conf-backup
 
 %changelog
+* Mon May 30 2005 Tomas Mraz <tmraz at redhat.com> 0.3.3-2
+- package /var/run/vpnc and ghost files it can contain (#159015)
+- add /sbin /usr/sbin to the path in vpnc-script (#159099)
+
 * Mon May 16 2005 Tomas Mraz <tmraz at redhat.com> 0.3.3-1
 - new upstream version