[packages/openconnect] - updated to 6.00 (note: new soname) - removed outdated link patch (tss is now really used for TPM s

[qboosh]

commit aa47a45dfd122c55bb53f707f8baa8d07c52775f
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Wed Jul 9 10:29:06 2014 +0200

    - updated to 6.00 (note: new soname)
    - removed outdated link patch (tss is now really used for TPM storage)

 openconnect-link.patch | 21 ---------------------
 openconnect.spec       | 11 ++++++-----
 2 files changed, 6 insertions(+), 26 deletions(-)
---
diff --git a/openconnect.spec b/openconnect.spec
index a75ffcb..a39033f 100644
--- a/openconnect.spec
+++ b/openconnect.spec
@@ -8,14 +8,13 @@
 Summary:	Client for Cisco's AnyConnect SSL VPN
 Summary(pl.UTF-8):	Klient Cisco AnyConnect SSL VPN
 Name:		openconnect
-Version:	5.03
+Version:	6.00
 Release:	1
 License:	LGPL v2.1
 Group:		Applications/Networking
 Source0:	ftp://ftp.infradead.org/pub/openconnect/%{name}-%{version}.tar.gz
-# Source0-md5:	ff43ed1dbaccd2537fd7c5bfb04295a6
+# Source0-md5:	7e28e23c6e281be31446e6c365f5d273
 Patch0:		%{name}-am.patch
-Patch1:		%{name}-link.patch
 URL:		http://www.infradead.org/openconnect.html
 BuildRequires:	autoconf >= 2.63
 BuildRequires:	automake >= 1:1.10
@@ -27,6 +26,7 @@ BuildRequires:	libxml2-devel >= 2.0
 %{!?with_openssl:BuildRequires:	p11-kit-devel}
 BuildRequires:	pkgconfig >= 1:0.27
 %{?with_stoken:BuildRequires:	stoken-devel}
+%{!?with_openssl:BuildRequires:	trousers-devel}
 BuildRequires:	zlib-devel
 Suggests:	vpnc-script
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -45,8 +45,10 @@ 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_openssl:Requires:	openssl-devel}
 %{!?with_openssl:Requires:	p11-kit-devel}
+%{?with_stoken:Requires:	stoken-devel}
 Requires:	zlib-devel
 
 %description devel
@@ -70,7 +72,6 @@ Statyczna biblioteka OpenConnect.
 %prep
 %setup -q
 %patch0 -p1
-%patch1 -p1
 
 %build
 %{__libtoolize}
@@ -109,7 +110,7 @@ rm -rf $RPM_BUILD_ROOT
 %doc AUTHORS TODO
 %attr(755,root,root) %{_sbindir}/openconnect
 %attr(755,root,root) %{_libdir}/libopenconnect.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libopenconnect.so.2
+%attr(755,root,root) %ghost %{_libdir}/libopenconnect.so.3
 %{_mandir}/man8/openconnect.8*
 
 %files devel
diff --git a/openconnect-link.patch b/openconnect-link.patch
deleted file mode 100644
index f475a90..0000000
--- a/openconnect-link.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- openconnect-5.00/configure.ac.orig	2013-05-15 22:14:32.000000000 +0200
-+++ openconnect-5.00/configure.ac	2013-05-25 20:20:27.607437685 +0200
-@@ -326,18 +326,6 @@
-     AC_CHECK_FUNC(gnutls_pkcs11_add_provider,
- 		 [PKG_CHECK_MODULES(P11KIT, p11-kit-1, [AC_DEFINE(HAVE_P11KIT)
-     			      		  AC_SUBST(P11KIT_PC, p11-kit-1)], [:])], [])
--    LIBS="$oldlibs -ltspi"
--    AC_MSG_CHECKING([for tss library])
--    AC_LINK_IFELSE([AC_LANG_PROGRAM([
--		   #include <trousers/tss.h>
--		   #include <trousers/trousers.h>],[
--		   int err = Tspi_Context_Create((void *)0);
--		   Trspi_Error_String(err);])],
--		  [AC_MSG_RESULT(yes)
--		   AC_SUBST([TSS_LIBS], [-ltspi])
--		   AC_SUBST([TSS_CFLAGS], [])
--		   AC_DEFINE(HAVE_TROUSERS, 1)],
--		  [AC_MSG_RESULT(no)])
-     LIBS="$oldlibs"
-     CFLAGS="$oldcflags"
- fi
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/openconnect.git/commitdiff/aa47a45dfd122c55bb53f707f8baa8d07c52775f