r19780 - gnucash/trunk/packaging/win32 - Increase gnutls version to 2.8.6 (might fix bug#632158)

[Christian Stimming]

Author: cstim
Date: 2010-11-08 14:40:23 -0500 (Mon, 08 Nov 2010)
New Revision: 19780
Trac: http://svn.gnucash.org/trac/changeset/19780

Modified:
   gnucash/trunk/packaging/win32/defaults.sh
   gnucash/trunk/packaging/win32/install-impl.sh
Log:
Increase gnutls version to 2.8.6 (might fix bug#632158)

Modified: gnucash/trunk/packaging/win32/defaults.sh
===================================================================
--- gnucash/trunk/packaging/win32/defaults.sh	2010-11-08 08:49:34 UTC (rev 19779)
+++ gnucash/trunk/packaging/win32/defaults.sh	2010-11-08 19:40:23 UTC (rev 19780)
@@ -185,7 +185,8 @@
 set_default OPENSSL_URL "http://www.openssl.org/source/openssl-0.9.8j.tar.gz"
 set_default OPENSSL_DIR $GLOBAL_DIR\\openssl
 
-set_default GNUTLS_URL "http://josefsson.org/gnutls4win/gnutls-2.8.1.zip"
+GNUTLS_VERSION="2.8.6"
+set_default GNUTLS_URL "http://josefsson.org/gnutls4win/gnutls-${GNUTLS_VERSION}.zip"
 set_default GNUTLS_DIR $GLOBAL_DIR\\gnutls
 
 set_default MINGW_UTILS_URL "$SF_MIRROR/mingw/mingw-utils-0.3.tar.gz"

Modified: gnucash/trunk/packaging/win32/install-impl.sh
===================================================================
--- gnucash/trunk/packaging/win32/install-impl.sh	2010-11-08 08:49:34 UTC (rev 19779)
+++ gnucash/trunk/packaging/win32/install-impl.sh	2010-11-08 19:40:23 UTC (rev 19780)
@@ -953,7 +953,7 @@
     add_to_env ${_GNUTLS_UDIR}/lib/pkgconfig PKG_CONFIG_PATH
     add_to_env "-I${_GNUTLS_UDIR}/include" GNUTLS_CPPFLAGS
     add_to_env "-L${_GNUTLS_UDIR}/lib" GNUTLS_LDFLAGS
-    if quiet ${PKG_CONFIG} --exists gnutls
+    if quiet ${PKG_CONFIG} --exact-version=${GNUTLS_VERSION} gnutls
     then
         echo "GNUTLS already installed. skipping."
     else