[gnutls/f20] bumped to -2 to avoid linking with trousers

[Nikos Mavrogiannopoulos]

commit a6f727a862c62763bf17d9f60bb9c96ca689dfb5
Author: Nikos Mavrogiannopoulos <nmav at redhat.com>
Date:   Tue Nov 26 16:06:09 2013 +0100

    bumped to -2 to avoid linking with trousers

 gnutls.spec |   10 +++++++---
 1 files changed, 7 insertions(+), 3 deletions(-)
---
diff --git a/gnutls.spec b/gnutls.spec
index 1b52316..db3b76a 100644
--- a/gnutls.spec
+++ b/gnutls.spec
@@ -3,7 +3,7 @@
 Summary: A TLS protocol implementation
 Name: gnutls
 Version: 3.1.17
-Release: 1%{?dist}
+Release: 2%{?dist}
 # The libraries are LGPLv2.1+, utilities are GPLv3+, however
 # the bundled gnulib is LGPLv3+
 License: GPLv3+ and LGPLv2+ and LGPLv3+
@@ -13,7 +13,7 @@ BuildRequires: zlib-devel, readline-devel, libtasn1-devel >= 3.1
 BuildRequires: libtool, automake, autoconf, texinfo
 BuildRequires: nettle-devel >= 2.5
 BuildRequires: autogen-libopts-devel >= 5.18 autogen
-BuildRequires: trousers-devel >= 0.3.11.2
+#BuildRequires: trousers-devel >= 0.3.11.2
 %if %{with dane}
 BuildRequires: unbound-devel
 %endif
@@ -155,6 +155,7 @@ export LDFLAGS="-Wl,--no-add-needed"
            --with-included-libcfg \
            --disable-static \
            --disable-openssl-compatibility \
+	   --without-tpm \
            --disable-srp-authentication \
 %if %{with guile}
            --enable-guile \
@@ -248,7 +249,7 @@ fi
 %{_bindir}/certtool
 %{_bindir}/ocsptool
 %{_bindir}/psktool
-%{_bindir}/tpmtool
+#%{_bindir}/tpmtool
 %{_bindir}/p11tool
 %if %{with dane}
 %{_bindir}/danetool
@@ -272,6 +273,9 @@ fi
 %endif
 
 %changelog
+* Tue Nov 26 2013 Nikos Mavrogiannopoulos <nmav at redhat.com> 3.1.17-2
+- Avoid linking with trousers to prevent introducing new features in f20
+
 * Tue Nov 26 2013 Nikos Mavrogiannopoulos <nmav at redhat.com> 3.1.17-1
 - new upstream release
 - links against the system libopts