OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/openvpn?expand=0&rev=12

openvpn.spec

@@ -1,5 +1,5 @@
 #
-# spec file for package openvpn (Version 2.0.9)
+# spec file for package openvpn (Version 2.1.0.18)
 #
 # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
@@ -17,27 +17,32 @@
 
 # norootforbuild
 
+%define         upstream_version 2.1_rc18
 
 Name:           openvpn
 Url:            http://openvpn.net/
-License:        GPL v2 or later; LGPL v2.1 or later
+License:        GPL v2 only
 Group:          Productivity/Networking/Security
 AutoReqProv:    on
 %if 0%{?suse_version}
 PreReq:         %insserv_prereq %fillup_prereq
 %endif
-Version:        2.0.9
-Release:        144
+Version:        2.1.0.18
+Release:        1
 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
+Source:         http://openvpn.net/release/openvpn-%{upstream_version}.tar.gz
+Source1:        http://openvpn.net/signatures/openvpn-%{upstream_version}.tar.gz.asc
 Source2:        openvpn.init
 Source3:        openvpn.README.SUSE
-Patch1:         %{name}-%{version}-plugin-man.dif
-Patch2:         %{name}-%{version}-plugin-build.dif
+Patch1:         %{name}-2.1-plugin-man.dif
+Patch2:         %{name}-2.1-plugin-build.dif
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 BuildRequires:  lzo-devel openssl-devel
 BuildRequires:  iproute2 pam-devel
+%if 0%{?suse_version} > 1030
+BuildRequires:  pkcs11-helper-devel
+Requires:       pkcs11-helper
+%endif
 %define         plugin_dir        %{_libdir}/%{name}/plugin
 %define         plugin_libdir     %{plugin_dir}/lib
 
@@ -119,7 +124,7 @@ Authors:
     James Yonan <jim@yonan.net>
 
 %prep
-%setup -q
+%setup -q -n %{name}-%{upstream_version}
 %patch1 -p0
 %patch2 -p0
 sed -e "s|@PLUGIN_DIR@|%{plugin_dir}|g" \
@@ -159,14 +164,10 @@ install -D -m 755 $RPM_SOURCE_DIR/openvpn.init $RPM_BUILD_ROOT/%{_sysconfdir}/in
 ln -sv %{_sysconfdir}/init.d/openvpn $RPM_BUILD_ROOT/%{_sbindir}/rcopenvpn
 cp -p $RPM_SOURCE_DIR/openvpn.README.SUSE README.SUSE
 find sample-* suse contrib -type f -exec chmod -x \{\} \;
-rm -f easy-rsa/build-key-server.orig easy-rsa/.externals
-chmod -x easy-rsa/2.0/vars
-chmod -x easy-rsa/2.0/openssl*.cnf
-chmod -x easy-rsa/Windows/init-config.bat
-chmod +x easy-rsa/revoke-crt
-chmod +x easy-rsa/make-crl
-chmod +x easy-rsa/list-crl
-cp -a easy-rsa $RPM_BUILD_ROOT/%{_datadir}/openvpn/
+chmod -x easy-rsa/2.0/{vars,openssl*.cnf}
+chmod +x easy-rsa/1.0/{revoke-crt,make-crl,list-crl}
+cp -rd easy-rsa $RPM_BUILD_ROOT%{_datadir}/openvpn/
+rm -rf $RPM_BUILD_ROOT%{_datadir}/openvpn/easy-rsa/Windows
 #
 # Install the plugins
 #
@@ -195,7 +196,6 @@ if ! test -f /.buildenv; then rm -rf $RPM_BUILD_ROOT; fi
 %doc AUTHORS COPYING COPYRIGHT.GPL ChangeLog INSTALL NEWS PORTS README
 %doc README.*
 %doc contrib
-%doc management
 %doc sample-config-files
 %doc sample-keys
 %doc sample-scripts
@@ -221,6 +221,11 @@ if ! test -f /.buildenv; then rm -rf $RPM_BUILD_ROOT; fi
 %{plugin_libdir}/openvpn-auth-pam.so
 
 %changelog
+* Wed Jun 10 2009 mt@suse.de
+- Updated to openvpn 2.1 [2.1_rc18] series (fate#305289).
+- Enabled pkcs11-helper for openSUSE > 10.3 (bnc#487558).
+- Adopted spec file and patches, improved init script.
+- Disabled installation of easy-rsa for Windows.
 * Tue Feb 17 2009 mt@suse.de
 - Improved init script to show config name in action messages
   and allow to specify a config name in the second argument.