From 558e8eaf2f7a2b286d9d916c2a83bd1d48fa0001f45a102acb32840b88bd96c5 Mon Sep 17 00:00:00 2001
From: Marius Tomaschewski <mt@suse.com>
Date: Thu, 20 Aug 2015 09:00:14 +0000
Subject: [PATCH 1/2] - Removed obsolete --with-lzo-headers option, readded
 LFS_CFLAGS.

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

diff --git a/openvpn.changes b/openvpn.changes
index 7867549..124062c 100644
--- a/openvpn.changes
+++ b/openvpn.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Thu Aug 20 08:43:33 UTC 2015 - mt@suse.com
+
+- Removed obsolete --with-lzo-headers option, readded LFS_CFLAGS.
+
 -------------------------------------------------------------------
 Thu Aug 13 08:29:35 UTC 2015 - idonmez@suse.com
 
diff --git a/openvpn.spec b/openvpn.spec
index 6e10b0c..1179b8b 100644
--- a/openvpn.spec
+++ b/openvpn.spec
@@ -153,8 +153,7 @@ export LDFLAGS
 	--enable-plugins		\
 	--enable-plugin-down-root	\
 	--enable-plugin-auth-pam	\
-	--with-lzo-headers=%_includedir/lzo	\
-	CFLAGS="$CFLAGS -fPIE $PLUGIN_DEFS"	\
+	CFLAGS="$CFLAGS $(getconf LFS_CFLAGS) -fPIE $PLUGIN_DEFS"	\
 	LDFLAGS="$LDFLAGS -pie -lpam -rdynamic -Wl,-rpath,%{_libdir}/%{name}/plugins"
 make
 

From e18eab1a9466bb70eb003ae31a1bbdc1901b0a7e04bfe0cb919f6b3e3a0ffea5 Mon Sep 17 00:00:00 2001
From: Marius Tomaschewski <mt@suse.com>
Date: Thu, 20 Aug 2015 09:46:01 +0000
Subject: [PATCH 2/2] - Moved openvpn-plugin.h into a devel package, removed
 .gitignore

OBS-URL: https://build.opensuse.org/package/show/network:vpn/openvpn?expand=0&rev=99
---
 openvpn.changes |  1 +
 openvpn.spec    | 14 +++++++++++++-
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/openvpn.changes b/openvpn.changes
index 124062c..d80ae0a 100644
--- a/openvpn.changes
+++ b/openvpn.changes
@@ -2,6 +2,7 @@
 Thu Aug 20 08:43:33 UTC 2015 - mt@suse.com
 
 - Removed obsolete --with-lzo-headers option, readded LFS_CFLAGS.
+- Moved openvpn-plugin.h into a devel package, removed .gitignore
 
 -------------------------------------------------------------------
 Thu Aug 13 08:29:35 UTC 2015 - idonmez@suse.com
diff --git a/openvpn.spec b/openvpn.spec
index 1179b8b..f88c61b 100644
--- a/openvpn.spec
+++ b/openvpn.spec
@@ -124,6 +124,14 @@ This plugin uses a split privilege execution model which will function
 even if you drop openvpn daemon privileges using the user, group, or
 chroot directives.
 
+%package devel
+Summary:        OpenVPN plugin header
+Group:          Development/Libraries/C and C++
+Requires:       %{name} = %{version}
+
+%description devel
+This package provides the header file to build external plugins.
+
 %prep
 %gpg_verify %{S:1}
 %setup -q -n %{name}-%{version}
@@ -184,6 +192,7 @@ install -m 755 $RPM_SOURCE_DIR/client-netconfig.down sample/sample-scripts/clien
 
 # we install docs via spec into _defaultdocdir/name/management-notes.txt
 rm -rf $RPM_BUILD_ROOT%{_datadir}/doc/{OpenVPN,%name}
+find sample -name .gitignore | xargs rm -f
 
 %post
 %__mkdir_p -m750 %{_rundir}/openvpn
@@ -264,7 +273,6 @@ rm -f /etc/sysconfig/openvpn || :
 %{_sbindir}/rcopenvpn
 %{_sbindir}/openvpn
 %attr(0750,root,root) %dir %ghost %{_rundir}/openvpn
-%{_includedir}/%{name}-plugin.h
 
 %files down-root-plugin
 %defattr(-,root,root)
@@ -278,4 +286,8 @@ rm -f /etc/sysconfig/openvpn || :
 %dir %{_libdir}/%{name}/plugins
 %{_libdir}/%{name}/plugins/%{name}-plugin-auth-pam.so
 
+%files devel
+%defattr(-,root,root)
+%{_includedir}/%{name}-plugin.h
+
 %changelog