From d0c58fe344b1807c8c9ef5f060e383db1a6381f77a143a0fe40e4251f350bbe4 Mon Sep 17 00:00:00 2001
From: OBS User buildservice-autocommit <null@suse.de>
Date: Fri, 18 Feb 2011 12:27:57 +0000
Subject: [PATCH 1/2] Updating link to change in openSUSE:Factory/openvpn
 revision 26.0

OBS-URL: https://build.opensuse.org/package/show/network:vpn/openvpn?expand=0&rev=b72dbe4e0c30663622920d334e6f3ad0
---
 openvpn.spec | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/openvpn.spec b/openvpn.spec
index 244f3e3..da6a0fe 100644
--- a/openvpn.spec
+++ b/openvpn.spec
@@ -1,7 +1,7 @@
 #
-# spec file for package openvpn (Version 2.1.4)
+# spec file for package openvpn
 #
-# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -28,7 +28,7 @@ AutoReqProv:    on
 PreReq:         %insserv_prereq %fillup_prereq
 %endif
 Version:        2.1.4
-Release:        1
+Release:        13
 Summary:        Full-featured SSL VPN solution using a TUN/TAP Interface
 Source:         http://openvpn.net/release/openvpn-%{upstream_version}.tar.gz
 Source1:        http://openvpn.net/signatures/openvpn-%{upstream_version}.tar.gz.asc

From 665063baac3630acf0af24d3d99032c4f8f036261843edb6721783bf8a8f9e51 Mon Sep 17 00:00:00 2001
From: Marius Tomaschewski <mt@suse.com>
Date: Mon, 21 Mar 2011 14:27:43 +0000
Subject: [PATCH 2/2] - 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