Accepting request 48291 from network

checked in (request 48291)

OBS-URL: https://build.opensuse.org/request/show/48291
OBS-URL: https://build.opensuse.org/package/show/network/vpnc?expand=0&rev=51

bugfix.diff

@@ -1,8 +1,8 @@
-Index: vpnc-script.in
+Index: vpnc-0.5.2r394/vpnc-script.in
 ===================================================================
---- vpnc-script.in.orig
-+++ vpnc-script.in
-@@ -445,8 +445,8 @@ do_connect() {
+--- vpnc-0.5.2r394.orig/vpnc-script.in
++++ vpnc-0.5.2r394/vpnc-script.in
+@@ -445,8 +445,8 @@
  		echo
  	fi
  

vpnc-no-build-dates.patch

@@ -1,14 +0,0 @@
-Index: makeman.pl
-===================================================================
---- makeman.pl.orig
-+++ makeman.pl
-@@ -92,7 +92,8 @@ close $LONGHELP;
- # Hopefully the code speaks for itself from now on...
- 
- setlocale( LC_ALL, 'C' );
--my $date = strftime( '%B %Y', localtime );
-+my $write_secs = (stat("./vpnc.8.template"))[9];
-+my $date = strftime( '%B %Y', localtime($write_secs) );
- 
- open my $VERSION, '<', './VERSION';
- my $vpnc_version = <$VERSION>;

vpnc.changes

@@ -1,10 +1,3 @@
--------------------------------------------------------------------
-Thu Sep  9 20:42:08 UTC 2010 - cristian.rodriguez@opensuse.org
-
-- makeman.pl internal scripts adds local build time, change
-  it to the source man template filemtime instead, so we avoid
-  republishing this package every month. 
-
 -------------------------------------------------------------------
 Mon Jan  4 15:18:13 CET 2010 - crrodriguez@opensuse.org
 

vpnc.spec

@@ -30,7 +30,6 @@ Summary:        A Client for Cisco VPN concentrator
 Requires:       /usr/bin/sed /sbin/ip
 Source:         %{name}-%{version}.tar.bz2
 Patch0:         bugfix.diff
-Patch1:			vpnc-no-build-dates.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
 %description
@@ -55,8 +54,8 @@ Authors:
 
 %prep
 %setup -n %{name}
-%patch0 -p0
-%patch1
+%patch0 -p1
+
 %build
 export CFLAGS="%optflags -fno-strict-aliasing"
 make PREFIX=/usr
@@ -72,7 +71,7 @@ touch ${RPM_BUILD_ROOT}/%{_localstatedir}/run/vpnc/{defaultroute,gateway,pid,res
 rm -rfv ${RPM_BUILD_ROOT}/usr/share/doc/vpnc
 
 %clean
-rm -rf %{buildroot}
+
 %files
 %defattr(-,root,root)
 %attr(0600,root,root) %config(noreplace) %ghost %{_sysconfdir}/vpnc/default.conf