From 665063baac3630acf0af24d3d99032c4f8f036261843edb6721783bf8a8f9e51 Mon Sep 17 00:00:00 2001 From: Marius Tomaschewski Date: Mon, 21 Mar 2011 14:27:43 +0000 Subject: [PATCH] - Applied sr#64215, added comment explaining what it does - KVPNC is unable to parse openvpn version [bnc#679153] OBS-URL: https://build.opensuse.org/package/show/network:vpn/openvpn?expand=0&rev=23 --- openvpn-no-build-date.patch | 12 ------------ openvpn.changes | 5 +++++ openvpn.spec | 5 +++-- 3 files changed, 8 insertions(+), 14 deletions(-) delete mode 100644 openvpn-no-build-date.patch diff --git a/openvpn-no-build-date.patch b/openvpn-no-build-date.patch deleted file mode 100644 index cdb71da..0000000 --- a/openvpn-no-build-date.patch +++ /dev/null @@ -1,12 +0,0 @@ -Index: options.c -=================================================================== ---- options.c.orig -+++ options.c -@@ -73,7 +73,6 @@ const char title_string[] = - #ifdef ENABLE_PKCS11 - " [PKCS11]" - #endif -- " built on " __DATE__ - ; - - #ifndef ENABLE_SMALL diff --git a/openvpn.changes b/openvpn.changes index 39228b0..560304b 100644 --- a/openvpn.changes +++ b/openvpn.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Mar 15 21:05:23 UTC 2011 - crrodriguez@opensuse.org + +- KVPNC is unable to parse openvpn version [bnc#679153] + ------------------------------------------------------------------- Thu Feb 17 10:59:23 UTC 2011 - mt@suse.de diff --git a/openvpn.spec b/openvpn.spec index da6a0fe..e1b37a6 100644 --- a/openvpn.spec +++ b/openvpn.spec @@ -38,7 +38,6 @@ Source4: client-netconfig.up Source5: client-netconfig.down Patch1: %{name}-2.1-plugin-man.dif Patch2: %{name}-2.1-plugin-build.dif -Patch3: openvpn-no-build-date.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: lzo-devel openssl-devel BuildRequires: iproute2 pam-devel @@ -130,11 +129,13 @@ Authors: %setup -q -n %{name}-%{upstream_version} %patch1 -p0 %patch2 -p0 -%patch3 sed -e "s|@PLUGIN_DIR@|%{plugin_dir}|g" \ -e "s|@PLUGIN_LIBDIR@|%{plugin_libdir}|g" \ -e "s|@PLUGIN_DOCDIR@|%{_defaultdocdir}/%{name}|g" \ -i openvpn.8 +# the build __DATE__ causes obs rebuild/republish of binaries; +# use the date of version.m4 file in the tar archive instead +sed -e "s|\" __DATE__|$(date '+%b %e %Y' -r version.m4)\"|g" -i options.c %build autoreconf -fi