- updated to 3.2.7

[packages/gnutls.git] / gnutls.spec

diff --git a/gnutls.spec b/gnutls.spec
index f0d20745760dffc87427e087ac0f56c670d428ea..4366182e996552460b2bca2bc5ba0dc71cca6082 100644 (file)
--- a/gnutls.spec
+++ b/gnutls.spec
@@ -2,23 +2,22 @@
 # Conditional build:
 %bcond_with    gcrypt  # use gcrypt crypto backend instead of nettle (withdrawn?)
 %bcond_without dane    # libdane (DANE with DNSSEC certificate verification)
-%bcond_with    tpm     # TPM support in gnutls (cannot be used with GPL programs)
+%bcond_without tpm     # TPM support in gnutls
 #
 Summary:       The GNU Transport Layer Security Library
 Summary(pl.UTF-8):     Biblioteka GNU TLS (Transport Layer Security)
 Name:          gnutls
-Version:       3.2.1
+Version:       3.2.7
 Release:       1
-License:       LGPL v3+ (libgnutls), GPL v3+ (openssl library and tools)
+License:       LGPL v2.1+ (libgnutls), LGPL v3+ (libdane), GPL v3+ (openssl library and tools)
 Group:         Libraries
 Source0:       ftp://ftp.gnutls.org/gcrypt/gnutls/v3.2/%{name}-%{version}.tar.lz
-# Source0-md5: 157386119a90f458fecf8303584f9417
+# Source0-md5: f4907fd84ca016b0f8974b068ace9055
 Patch0:                %{name}-info.patch
 Patch1:                %{name}-link.patch
-Patch2:                %{name}-pl.po-update.patch
 URL:           http://www.gnutls.org/
 BuildRequires: autoconf >= 2.61
-BuildRequires: automake >= 1:1.11.3
+BuildRequires: automake >= 1:1.12.2
 BuildRequires: gettext-devel >= 0.18
 BuildRequires: gtk-doc >= 1.1
 BuildRequires: guile-devel >= 5:2.0
@@ -40,7 +39,7 @@ BuildRequires:        rpmbuild(macros) >= 1.383
 BuildRequires: sed >= 4.0
 BuildRequires: tar >= 1:1.22
 BuildRequires: texinfo >= 4.8
-%{?with_tpm:BuildRequires:     trousers-devel}
+%{?with_tpm:BuildRequires:     trousers-devel >= 0.3.11}
 %{?with_dane:BuildRequires:    unbound-devel}
 BuildRequires: zlib-devel
 Requires:      %{name}-libs = %{version}-%{release}
@@ -68,6 +67,7 @@ Requires:     libtasn1 >= 2.14
 %{!?with_gcrypt:Requires:      nettle >= 2.7}
 #Requires:     opencdk >= 0.6.6
 Requires:      p11-kit >= 0.11
+%{?with_tpm:Requires:  trousers-libs >= 0.3.11}
 Conflicts:     gnutls < 3.2.0
 
 %description libs
@@ -87,7 +87,7 @@ Requires:     libtasn1-devel >= 2.14
 %{!?with_gcrypt:Requires:      nettle-devel >= 2.7}
 #Requires:     opencdk-devel >= 0.6.6
 Requires:      p11-kit-devel >= 0.11
-%{?with_tpm:Requires:  trousers-devel}
+%{?with_tpm:Requires:  trousers-devel >= 0.3.11}
 Requires:      zlib-devel
 
 %description devel
@@ -206,14 +206,9 @@ Wiązania Guile do GnuTLS.
 %setup -q
 %patch0 -p1
 %patch1 -p1
-%patch2 -p1
 
 %{__rm} po/stamp-po
 
-# remove it when "linking libtool libraries using a non-POSIX archiver ..." warning is gone
-# (after gnutls or libtool change)
-%{__sed} -i -e '/AM_INIT_AUTOMAKE/s/-Werror//' configure.ac
-
 %build
 %{__libtoolize}
 %{__aclocal} -I m4 -I gl/m4 -I src/libopts/m4
@@ -225,7 +220,7 @@ Wiązania Guile do GnuTLS.
        --enable-heartbeat-support \
        --with-default-trust-store-file=/etc/certs/ca-certificates.crt \
        %{?with_gcrypt:--with-libgcrypt} \
-       %{?with_tpm:--with-tpm}
+       %{!?with_tpm:--without-tpm}
 
 # docs build is broken with -jN
 %{__make} -j1
@@ -308,6 +303,7 @@ rm -rf $RPM_BUILD_ROOT
 %exclude %{_includedir}/gnutls/gnutlsxx.h
 %{_pkgconfigdir}/gnutls.pc
 %{_mandir}/man3/gnutls_*.3*
+%{_mandir}/man3/xssl_*.3*
 
 %files static
 %defattr(644,root,root,755)