- updated to 7.00 (note: new soname)

diff --git a/openconnect.spec b/openconnect.spec
index a39033fe95f8e8fcd474ee9af7d4d491afe2a062..8ab7cf51eae5f8f3f8aa7f365adb55e045d71525 100644 (file)
--- a/openconnect.spec
+++ b/openconnect.spec
@@ -1,33 +1,42 @@
 #
 # Conditional build:
+%bcond_without java            # JNI bindings
+%bcond_without kerberos5       # GSSAPI support
 %bcond_with    openssl         # OpenSSL instead of GnuTLS (incompatible with some versions)
 %bcond_without oath            # OATH-based one-time password authentication
+%bcond_without pcsc            # Yutoken support via PCSC Lite
 %bcond_without stoken          # Software Token authentication
 %bcond_without static_libs     # static library
 #
 Summary:       Client for Cisco's AnyConnect SSL VPN
 Summary(pl.UTF-8):     Klient Cisco AnyConnect SSL VPN
 Name:          openconnect
-Version:       6.00
+Version:       7.00
 Release:       1
 License:       LGPL v2.1
 Group:         Applications/Networking
 Source0:       ftp://ftp.infradead.org/pub/openconnect/%{name}-%{version}.tar.gz
-# Source0-md5: 7e28e23c6e281be31446e6c365f5d273
+# Source0-md5: 208b03fb66cd8e26633a19b9e12f35af
 Patch0:                %{name}-am.patch
 URL:           http://www.infradead.org/openconnect.html
 BuildRequires: autoconf >= 2.63
 BuildRequires: automake >= 1:1.10
 %{!?with_openssl:BuildRequires:        gnutls-devel >= 2.12.16}
+BuildRequires: groff
+%{?with_kerberos5:BuildRequires:       heimdal-devel}
+%{?with_java:BuildRequires:    jdk}
 BuildRequires: libproxy-devel
 BuildRequires: libxml2-devel >= 2.0
-%{?with_oath:BuildRequires:    oath-toolkit-devel}
+%{?with_oath:BuildRequires:    oath-toolkit-devel >= 2.2.0}
 %{?with_openssl:BuildRequires: openssl-devel}
 %{!?with_openssl:BuildRequires:        p11-kit-devel}
+%{?with_pcsc:BuildRequires:    pcsc-lite-devel}
 BuildRequires: pkgconfig >= 1:0.27
+BuildRequires: python >= 2
 %{?with_stoken:BuildRequires:  stoken-devel}
 %{!?with_openssl:BuildRequires:        trousers-devel}
 BuildRequires: zlib-devel
+%{?with_oath:Requires: oath-toolkit >= 2.2.0}
 Suggests:      vpnc-script
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -45,7 +54,7 @@ Requires:     %{name} = %{version}-%{release}
 %{?with_openssl:Requires:      gnutls-devel >= 2.12.16}
 Requires:      libproxy-devel
 Requires:      libxml2-devel >= 2.0
-%{?with_oath:Requires: oath-toolkit-devel}
+%{?with_oath:Requires: oath-toolkit-devel >= 2.2.0}
 %{?with_openssl:Requires:      openssl-devel}
 %{!?with_openssl:Requires:     p11-kit-devel}
 %{?with_stoken:Requires:       stoken-devel}
@@ -69,6 +78,18 @@ Static OpenConnect library.
 %description static -l pl.UTF-8
 Statyczna biblioteka OpenConnect.
 
+%package -n java-openconnect
+Summary:       JNI wrapper for OpenConnect library
+Summary(pl.UTF-8):     Interfejs JNI do biblioteki OpenConnect
+Group:         Libraries/Java
+Requires:      %{name} = %{version}-%{release}
+
+%description -n java-openconnect
+JNI wrapper for OpenConnect library.
+
+%description -n java-openconnect -l pl.UTF-8
+Interfejs JNI do biblioteki OpenConnect.
+
 %prep
 %setup -q
 %patch0 -p1
@@ -81,7 +102,10 @@ Statyczna biblioteka OpenConnect.
 %configure \
        --disable-silent-rules \
        %{?with_static_libs:--enable-static} \
+       %{!?with_kerberos5:--without-gssapi} \
+       %{?with_java:--with-java} \
        %{!?with_oath:--without-liboath} \
+       %{!?with_pcsc:--without-libpcsclite} \
        %{!?with_stoken:--without-stoken} \
        --with-system-cafile=/etc/certs/ca-certificates.crt \
        --with-vpnc-script=/usr/bin/vpnc-script \
@@ -96,6 +120,8 @@ rm -rf $RPM_BUILD_ROOT
 
 # obsoleted by pkg-config
 %{__rm} $RPM_BUILD_ROOT%{_libdir}/libopenconnect.la
+# JNI module
+%{__rm} $RPM_BUILD_ROOT%{_libdir}/libopenconnect-wrapper.{la,a}
 
 %find_lang %{name}
 
@@ -105,12 +131,15 @@ rm -rf $RPM_BUILD_ROOT
 %post  -p /sbin/ldconfig
 %postun        -p /sbin/ldconfig
 
+%post  -n java-openconnect -p /sbin/ldconfig
+%postun        -n java-openconnect -p /sbin/ldconfig
+
 %files -f %{name}.lang
 %defattr(644,root,root,755)
 %doc AUTHORS TODO
 %attr(755,root,root) %{_sbindir}/openconnect
 %attr(755,root,root) %{_libdir}/libopenconnect.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libopenconnect.so.3
+%attr(755,root,root) %ghost %{_libdir}/libopenconnect.so.5
 %{_mandir}/man8/openconnect.8*
 
 %files devel
@@ -125,3 +154,9 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(644,root,root,755)
 %{_libdir}/libopenconnect.a
 %endif
+
+%files -n java-openconnect
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/libopenconnect-wrapper.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libopenconnect-wrapper.so.0
+%attr(755,root,root) %{_libdir}/libopenconnect-wrapper.so