[csync2/f17] Fix gnutls ac_define from HAVE_GNUTLS to HAVE_LIBGNUTLS

[Angus Salkeld]

commit 9a74fae6fcba697e815ae4f4de93715deb126878
Author: Angus Salkeld <asalkeld at redhat.com>
Date:   Fri Aug 24 12:07:23 2012 +1000

    Fix gnutls ac_define from HAVE_GNUTLS to HAVE_LIBGNUTLS
    
    bz 849795
    
    Signed-off-by: Angus Salkeld <asalkeld at redhat.com>

 0001-Fix-gnutls-configure.ac-section.patch |    2 +-
 csync2.spec                                |    5 ++++-
 2 files changed, 5 insertions(+), 2 deletions(-)
---
diff --git a/0001-Fix-gnutls-configure.ac-section.patch b/0001-Fix-gnutls-configure.ac-section.patch
index 77b9870..bf569a7 100644
--- a/0001-Fix-gnutls-configure.ac-section.patch
+++ b/0001-Fix-gnutls-configure.ac-section.patch
@@ -20,7 +20,7 @@ index 92b38c7..4d86e6f 100644
 +	##AM_PATH_LIBGNUTLS(1.0.0, , [ AC_MSG_ERROR([[gnutls not found; install gnutls, gnutls-openssl and libtasn1 packages for your system or run configure with --disable-gnutls]]) ])
 +   PKG_PROG_PKG_CONFIG
 +   PKG_CHECK_MODULES([LIBGNUTLS], [gnutls >= 1.0.0], [
-+      AC_DEFINE([HAVE_GNUTLS], 1, [Define to 1 when using GNU TLS library])
++      AC_DEFINE([HAVE_LIBGNUTLS], 1, [Define to 1 when using GNU TLS library])
 +      gnutls_version_code=`$PKG_CONFIG --modversion gnutls | $AWK -F. '{ printf "0x%02X%02X%02X\n",$1,$2,$3 }'`
 +      AC_DEFINE_UNQUOTED([LFTP_LIBGNUTLS_VERSION_CODE], $gnutls_version_code, [Define to libgnutls version, e.g. 0x010203 for 1.2.3])
 +   ])
diff --git a/csync2.spec b/csync2.spec
index 09dda6b..5d9e866 100644
--- a/csync2.spec
+++ b/csync2.spec
@@ -1,7 +1,7 @@
 Summary:        Cluster synchronization tool
 Name:           csync2
 Version:        1.34
-Release:        9%{?dist}
+Release:        10%{?dist}
 License:        GPLv2+
 Group:          Applications/System
 URL:            http://oss.linbit.com/csync2/
@@ -116,6 +116,9 @@ fi
 
 
 %changelog
+* Fri Aug 24 2012 Angus Salkeld <asalkeld at redhat.com> - 1.34-10
+- Fix the gnutls ac_define (bz 849795)
+
 * Mon Aug 20 2012  Simon Piette <piette.simon at gmail.com> - 1.34-9
 - Fix the application of gnutls (bz 849795)
 - Actually compiles gnutls in