diff --git a/0001-Fix-gnutls-Makefile.am-section.patch b/0001-Fix-gnutls-Makefile.am-section.patch new file mode 100644 index 0000000..fa3b30e --- /dev/null +++ b/0001-Fix-gnutls-Makefile.am-section.patch @@ -0,0 +1,13 @@ +diff -up csync2-1.34/Makefile.am.orig csync2-1.34/Makefile.am +--- csync2-1.34/Makefile.am.orig 2012-08-20 17:11:54.190559365 -0400 ++++ csync2-1.34/Makefile.am 2012-08-20 17:12:09.781559215 -0400 +@@ -48,6 +48,9 @@ if PRIVATE_LIBSQLITE + LIBS += -lprivatesqlite + endif + ++AM_CFLAGS += @LIBGNUTLS_CFLAGS@ ++AM_LDFLAGS += @LIBGNUTLS_LIBS@ ++ + AM_CPPFLAGS = -D'DBDIR="$(localstatedir)/lib/csync2"' + AM_CPPFLAGS += -D'ETCDIR="$(sysconfdir)"' + diff --git a/0001-Fix-gnutls-configure.ac-section.patch b/0001-Fix-gnutls-configure.ac-section.patch index c043c67..77b9870 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([USE_GNUTLS], 1, [Define to 1 when using GNU TLS library]) ++ AC_DEFINE([HAVE_GNUTLS], 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 43a0b90..09dda6b 100644 --- a/csync2.spec +++ b/csync2.spec @@ -1,7 +1,7 @@ Summary: Cluster synchronization tool Name: csync2 Version: 1.34 -Release: 8%{?dist} +Release: 9%{?dist} License: GPLv2+ Group: Applications/System URL: http://oss.linbit.com/csync2/ @@ -13,6 +13,7 @@ Patch1: csync2-1.34-cfg.patch Patch2: 0001-use-native-gnutls-drop-openssl-wrappers.patch Patch3: 0001-don-t-hardcode-autofoo-version.patch Patch4: 0001-Fix-gnutls-configure.ac-section.patch +Patch5: 0001-Fix-gnutls-Makefile.am-section.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root @@ -45,6 +46,7 @@ It is expedient for HA-clusters, HPC-clusters, COWs and server farms. %patch2 -p1 %patch3 -p1 %patch4 -p1 +%patch5 -p1 install -p -m 0644 %{SOURCE1} README.quickstart @@ -114,6 +116,10 @@ fi %changelog +* Mon Aug 20 2012 Simon Piette - 1.34-9 +- Fix the application of gnutls (bz 849795) +- Actually compiles gnutls in + * Wed Jul 18 2012 Fedora Release Engineering - 1.34-8 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild