From bdc110c4d5c4c753758fa7593a105b90a781df30ab2fabe0e785456eb760f74f Mon Sep 17 00:00:00 2001
From: OBS User unknown <null@suse.de>
Date: Tue, 19 Feb 2008 13:14:21 +0000
Subject: [PATCH] OBS-URL:
 https://build.opensuse.org/package/show/openSUSE:Factory/openvpn?expand=0&rev=4

---
 openvpn.changes |  5 +++++
 openvpn.spec    | 18 +++++++++---------
 2 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/openvpn.changes b/openvpn.changes
index 77e0db2..dd43b35 100644
--- a/openvpn.changes
+++ b/openvpn.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Tue Feb 19 11:32:55 CET 2008 - mt@suse.de
+
+- Fixed spec file to not set pie flags when building plugins
+
 -------------------------------------------------------------------
 Thu Jan 17 19:44:41 CET 2008 - mt@suse.de
 
diff --git a/openvpn.spec b/openvpn.spec
index 549ecc5..65467c2 100644
--- a/openvpn.spec
+++ b/openvpn.spec
@@ -10,6 +10,7 @@
 
 # norootforbuild
 
+
 Name:           openvpn
 Url:            http://openvpn.net/
 License:        GPL v2 or later; LGPL v2.1 or later
@@ -19,7 +20,7 @@ AutoReqProv:    on
 PreReq:         %insserv_prereq %fillup_prereq
 %endif
 Version:        2.0.9
-Release:        61
+Release:        70
 Summary:        Full-featured SSL VPN solution using a TUN/TAP Interface
 Source:         http://openvpn.net/release/openvpn-%{version}.tar.gz
 Source1:        http://openvpn.net/signatures/openvpn-%{version}.tar.gz.asc
@@ -121,17 +122,14 @@ sed -e "s|@PLUGIN_DIR@|%{plugin_dir}|g" \
 
 %build
 autoreconf -fi
-export CFLAGS="$RPM_OPT_FLAGS -Wall"
+export CFLAGS="$RPM_OPT_FLAGS -W -Wall"
 export LDFLAGS=""
-# build with fPIE/pie on SUSE 10.0 or newer, or on any other platform
-%if %{?suse_version}%{?!suse_version:99999} > 930
-CFLAGS="$CFLAGS -fPIE"
-LDFLAGS="$LDFLAGS -pie"
-%endif
-CFLAGS="$CFLAGS -DPLUGIN_LIBDIR='\"%{_libdir}/%{name}/plugin/lib\"' -DENABLE_PLUGIN_SEARCH" \
+PLUGIN_DEFS="-DPLUGIN_LIBDIR='\"%{_libdir}/%{name}/plugin/lib\"'"
+PLUGIN_DEFS="$PLUGIN_FLAGS -DENABLE_PLUGIN_SEARCH"
 %configure \
 	--enable-pthread --enable-iproute2 \
-	--with-lzo-headers=%_includedir/lzo
+	--with-lzo-headers=%_includedir/lzo \
+	CFLAGS="$CFLAGS -fPIE $PLUGIN_DEFS" LDFLAGS="$LDFLAGS -pie"
 make
 #
 # Build down-root plugin
@@ -218,6 +216,8 @@ if ! test -f /.buildenv; then rm -rf $RPM_BUILD_ROOT; fi
 %{plugin_libdir}/openvpn-auth-pam.so
 
 %changelog
+* Tue Feb 19 2008 mt@suse.de
+- Fixed spec file to not set pie flags when building plugins
 * Thu Jan 17 2008 mt@suse.de
 - Bug #334773: Enabled build of down-root and auth-pam plugins,
   sub-packaged as openvpn-auth-pam-plugin/down-root-plugin.