From 941ff9802df04b0d29aefc64f6e36a7e342f48dc62da1a4e35e9aaeac8149957 Mon Sep 17 00:00:00 2001 From: Raymond Wooninck Date: Thu, 4 Aug 2011 10:26:40 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/network/vpnc?expand=0&rev=52 --- bugfix.diff | 8 ++++---- vpnc-no-build-dates.patch | 14 ++++++++++++++ vpnc.changes | 12 ++++++++++++ vpnc.spec | 20 +++++++++++++++++--- 4 files changed, 47 insertions(+), 7 deletions(-) create mode 100644 vpnc-no-build-dates.patch diff --git a/bugfix.diff b/bugfix.diff index fafa5b9..78c19d6 100644 --- a/bugfix.diff +++ b/bugfix.diff @@ -1,8 +1,8 @@ -Index: vpnc-0.5.2r394/vpnc-script.in +Index: vpnc-script.in =================================================================== ---- vpnc-0.5.2r394.orig/vpnc-script.in -+++ vpnc-0.5.2r394/vpnc-script.in -@@ -445,8 +445,8 @@ +--- vpnc-script.in.orig ++++ vpnc-script.in +@@ -445,8 +445,8 @@ do_connect() { echo fi diff --git a/vpnc-no-build-dates.patch b/vpnc-no-build-dates.patch new file mode 100644 index 0000000..487f15f --- /dev/null +++ b/vpnc-no-build-dates.patch @@ -0,0 +1,14 @@ +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>; diff --git a/vpnc.changes b/vpnc.changes index 8e553e7..3ec1bc0 100644 --- a/vpnc.changes +++ b/vpnc.changes @@ -1,3 +1,15 @@ +------------------------------------------------------------------- +Thu Aug 4 10:25:45 UTC 2011 - tittiatcoke@gmail.com + +- Resolved rpmlint warning non-ghost-in-var-run. + +------------------------------------------------------------------- +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 diff --git a/vpnc.spec b/vpnc.spec index 89ff1cc..fe9b1c6 100644 --- a/vpnc.spec +++ b/vpnc.spec @@ -23,13 +23,14 @@ Group: Productivity/Networking/Security BuildRequires: libgcrypt-devel BuildRequires: gnutls libgnutls-devel pkg-config Version: 0.5.3r449 -Release: 3 +Release: 8 License: BSD3c(or similar) ; GPLv2+ AutoReqProv: on 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 @@ -54,7 +55,8 @@ Authors: %prep %setup -n %{name} -%patch0 -p1 +%patch0 -p0 +%patch1 %build export CFLAGS="%optflags -fno-strict-aliasing" @@ -71,6 +73,18 @@ touch ${RPM_BUILD_ROOT}/%{_localstatedir}/run/vpnc/{defaultroute,gateway,pid,res rm -rfv ${RPM_BUILD_ROOT}/usr/share/doc/vpnc %clean +rm -rf %{buildroot} + +%post +if [ "$1" -eq 1 ] ; then +mkdir %{_localstatedir}/run/vpnc +touch %{_localstatedir}/run/vpnc/{defaultroute,gateway,pid,resolv.conf-backup} +fi + +%postun +if [ "$1" -eq 0 ] ; then +rm -rf %{_localstatedir}/run/vpnc +fi %files %defattr(-,root,root) @@ -84,7 +98,7 @@ rm -rfv ${RPM_BUILD_ROOT}/usr/share/doc/vpnc %{_mandir}/man1/cisco-decrypt.1.* %{_mandir}/man1/pcf2vpnc.1.* %{_mandir}/man8/vpnc.8.* -%dir %{_localstatedir}/run/vpnc +%ghost %dir %{_localstatedir}/run/vpnc %ghost %{_localstatedir}/run/vpnc/defaultroute %ghost %{_localstatedir}/run/vpnc/gateway %ghost %{_localstatedir}/run/vpnc/pid