From 871d8db2b66c3f8c1ea38a819b7875029f1ba77be6a4fe6cacd1e18ee50fadc7 Mon Sep 17 00:00:00 2001 From: Marius Tomaschewski Date: Thu, 29 Mar 2012 09:17:09 +0000 Subject: [PATCH 1/2] - Added Group tags to plugin sub-packages OBS-URL: https://build.opensuse.org/package/show/network:vpn/openvpn?expand=0&rev=38 --- openvpn.changes | 5 +++++ openvpn.spec | 3 ++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/openvpn.changes b/openvpn.changes index ea0e86a..b958c29 100644 --- a/openvpn.changes +++ b/openvpn.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Thu Mar 29 09:15:20 UTC 2012 - mt@suse.com + +- Added Group tags to plugin sub-packages + ------------------------------------------------------------------- Wed Feb 15 15:21:32 UTC 2012 - mt@suse.com diff --git a/openvpn.spec b/openvpn.spec index 38d2b4a..d79385e 100644 --- a/openvpn.spec +++ b/openvpn.spec @@ -16,7 +16,6 @@ # - Name: openvpn Url: http://openvpn.net/ %if 0%{?suse_version} @@ -80,6 +79,7 @@ Authors: %package down-root-plugin Summary: OpenVPN down-root plugin +Group: Productivity/Networking/Security Requires: %{name} = %{version} %description down-root-plugin @@ -102,6 +102,7 @@ Authors: %package auth-pam-plugin Summary: OpenVPN auth-pam plugin +Group: Productivity/Networking/Security Requires: %{name} = %{version} %description auth-pam-plugin From 2ca2ba7e01c5ed5a64fa7fff66747d273bb162d5f6be535e7dfd0d6ea64607d7 Mon Sep 17 00:00:00 2001 From: Marius Tomaschewski Date: Thu, 29 Mar 2012 09:48:53 +0000 Subject: [PATCH 2/2] - Fixed SLES build readding Group tags to sub-packages in spec, not require libselinux-devel on SLE-10 and datadir/doc cleanup. OBS-URL: https://build.opensuse.org/package/show/network:vpn/openvpn?expand=0&rev=39 --- openvpn.changes | 5 +++-- openvpn.spec | 7 ++++--- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/openvpn.changes b/openvpn.changes index b958c29..0726360 100644 --- a/openvpn.changes +++ b/openvpn.changes @@ -1,7 +1,8 @@ ------------------------------------------------------------------- -Thu Mar 29 09:15:20 UTC 2012 - mt@suse.com +Thu Mar 29 09:45:56 UTC 2012 - mt@suse.com -- Added Group tags to plugin sub-packages +- Fixed SLES build readding Group tags to sub-packages in spec, + not require libselinux-devel on SLE-10 and datadir/doc cleanup. ------------------------------------------------------------------- Wed Feb 15 15:21:32 UTC 2012 - mt@suse.com diff --git a/openvpn.spec b/openvpn.spec index d79385e..7c6a623 100644 --- a/openvpn.spec +++ b/openvpn.spec @@ -41,10 +41,12 @@ Patch5: openvpn-2.2.1-man-dot.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: automake BuildRequires: iproute2 -BuildRequires: libselinux-devel BuildRequires: lzo-devel BuildRequires: openssl-devel BuildRequires: pam-devel +%if 0%{?suse_version} > 1010 +BuildRequires: libselinux-devel +%endif %if 0%{?suse_version} > 1030 BuildRequires: pkcs11-helper-devel Requires: pkcs11-helper @@ -191,8 +193,7 @@ for pi in auth-pam down-root; do $RPM_BUILD_ROOT%{plugin_libdir}/ done # we install docs via spec into _defaultdocdir/name/management-notes.txt -rm $RPM_BUILD_ROOT%{_datadir}/doc/%name/management-notes.txt -rmdir $RPM_BUILD_ROOT%{_datadir}/doc/%name +rm -rf $RPM_BUILD_ROOT%{_datadir}/doc/{OpenVPN,%name} %clean if ! test -f /.buildenv; then rm -rf $RPM_BUILD_ROOT; fi