Merge ../master into el5

Conflicts:
	openconnect.spec

.gitignore

@@ -19,3 +19,4 @@ openconnect-2.25.tar.gz
 /openconnect-3.99-33-g2d08bf0.tar.gz
 /openconnect-3.99-36-gb0f2edb.tar.gz
 /openconnect-4.00.tar.gz
+/openconnect-4.01.tar.gz

0001-Don-t-require-zlib-in-pkgconfig-if-it-was-found-with.patch

@@ -1,45 +0,0 @@
-From 644b8aa5f6235ee57a8a91a1db5a02174f57445c Mon Sep 17 00:00:00 2001
-From: David Woodhouse <David.Woodhouse@intel.com>
-Date: Thu, 21 Jun 2012 17:04:23 +0100
-Subject: [PATCH] Don't require zlib in pkgconfig if it was found without it
-
-Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
----
- configure.ac      |    2 +-
- openconnect.pc.in |    2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 8216fe0..2ff8a54 100644
---- a/openconnect.pc.in
-+++ b/openconnect.pc.in
-@@ -7,7 +7,7 @@ includedir=@includedir@
- Name: openconnect
- Description: OpenConnect VPN client
- Version: @VERSION@
--Requires.private: @LIBPROXY_PC@ zlib @SSL_LIBRARY@ @P11KIT_PC@ libxml-2.0
-+Requires.private: @LIBPROXY_PC@ @ZLIB_PC@ @SSL_LIBRARY@ @P11KIT_PC@ libxml-2.0
- Libs: -L${libdir} -lopenconnect
- Libs.private: @LIBINTL@
- Cflags: -I${includedir}
--- 
-1.7.10.2
-
---- ./configure.400	2012-06-21 17:05:58.065101753 +0100
-+++ ./configure	2012-06-21 17:06:06.903976972 +0100
-@@ -623,6 +623,7 @@ PYTHON
- LIBPROXY_PC
- LIBPROXY_LIBS
- LIBPROXY_CFLAGS
-+ZLIB_PC
- ZLIB_LIBS
- ZLIB_CFLAGS
- LIBXML2_LIBS
-@@ -12702,6 +12703,7 @@ else
- 	ZLIB_LIBS=$pkg_cv_ZLIB_LIBS
-         { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
- $as_echo "yes" >&6; }
-+	ZLIB_PC=zlib
- 
- fi
- 

openconnect.spec

@@ -14,8 +14,8 @@
 %endif
 
 Name:		openconnect
-Version:	4.00
+Version:	4.01
-Release:	3%{?dist}
+Release:	1%{?dist}
 Summary:	Open client for Cisco AnyConnect VPN
 
 Group:		Applications/Internet
@@ -24,7 +24,6 @@ URL:		http://www.infradead.org/openconnect.html
 Source0:	ftp://ftp.infradead.org/pub/openconnect/openconnect-%{version}.tar.gz
 Source1:	library15.c
 Source2:	libopenconnect15.map
-Patch1:		0001-Don-t-require-zlib-in-pkgconfig-if-it-was-found-with.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	openssl-devel libxml2-devel gtk2-devel GConf2-devel dbus-devel
@@ -74,7 +73,6 @@ of the library.
 
 %prep
 %setup -q
-%patch1 -p1
 %if %{build_compat_lib}
 cp %{SOURCE1} .
 cp %{SOURCE2} libopenconnect15.map.in
@@ -150,6 +148,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/pkgconfig/openconnect.pc
 
 %changelog
+* Thu Jun 27 2012 David Woodhouse <David.Woodhouse@intel.com> - 4.01-1
+- Update to 4.01 release
+
 * Thu Jun 21 2012 David Woodhouse <David.Woodhouse@intel.com> - 4.00-3
 - Remove zlib from openconnect.pc dependencies
 

sources

@@ -1 +1 @@
-86120e286033c40bfca5b902f40b181d  openconnect-4.00.tar.gz
+b618de1753aac927dc704dd79d05bf6c  openconnect-4.01.tar.gz