commit f72ee18ce511af0aef8374472d5d7bf31df079b3
Author: Jakub Bogusz <[email protected]>
Date: Sun Apr 19 20:09:13 2015 +0200
- updated to 3.4.0 (needs nettle 3.1 and devel p11-kit)
- added install patch (fixes duplicate man entries)
gnutls-install.patch | 14 ++++++++++++++
gnutls.spec | 37 ++++++++++++++++++++++---------------
2 files changed, 36 insertions(+), 15 deletions(-)
---
diff --git a/gnutls.spec b/gnutls.spec
index d71f3ce..3d54cbf 100644
--- a/gnutls.spec
+++ b/gnutls.spec
@@ -11,14 +11,15 @@
Summary: The GNU Transport Layer Security Library
Summary(pl.UTF-8): Biblioteka GNU TLS (Transport Layer Security)
Name: gnutls
-Version: 3.3.27
+Version: 3.4.0
Release: 1
License: LGPL v2.1+ (libgnutls), LGPL v3+ (libdane), GPL v3+ (openssl
library and tools)
Group: Libraries
-Source0:
ftp://ftp.gnutls.org/gcrypt/gnutls/v3.3/%{name}-%{version}.tar.xz
-# Source0-md5: 8ee8cebd7f7575b11f232766a21c31d3
+Source0:
ftp://ftp.gnutls.org/gcrypt/gnutls/v3.4/%{name}-%{version}.tar.lz
+# Source0-md5: 604362fb57bae7e6deba63c4e4a07a69
Patch0: %{name}-info.patch
Patch1: %{name}-link.patch
+Patch2: %{name}-install.patch
URL: http://www.gnutls.org/
BuildRequires: autoconf >= 2.61
BuildRequires: autogen
@@ -29,15 +30,16 @@ BuildRequires: gmp-devel
%{?with_doc:BuildRequires: gtk-doc >= 1.1}
BuildRequires: guile-devel >= 5:2.0
BuildRequires: libcfg+-devel
-BuildRequires: libidn-devel
+BuildRequires: libidn-devel >= 0.5.6
BuildRequires: libstdc++-devel
-BuildRequires: libtasn1-devel >= 3.9
+BuildRequires: libtasn1-devel >= 4.3
BuildRequires: libtool >= 2:2
-BuildRequires: nettle-devel >= 2.7.1
+BuildRequires: lzip
+BuildRequires: nettle-devel >= 3.1
# miniopencdk is included in sources and currently maintained
# as part of gnutls, not external package
#BuildRequires: opencdk-devel >= 0.6.6
-BuildRequires: p11-kit-devel >= 0.20.7
+BuildRequires: p11-kit-devel >= 0.23.1
BuildRequires: pkgconfig
BuildRequires: readline-devel
BuildRequires: rpmbuild(macros) >= 1.383
@@ -68,10 +70,11 @@ grupę roboczą IETF TLS.
Summary: GnuTLS shared libraries
Summary(pl.UTF-8): Biblioteki współdzielone GnuTLS
Group: Libraries
-Requires: libtasn1 >= 3.9
-Requires: nettle >= 2.7.1
+Requires: libidn >= 0.5.6
+Requires: libtasn1 >= 4.3
+Requires: nettle >= 3.1
#Requires: opencdk >= 0.6.6
-Requires: p11-kit >= 0.20.7
+Requires: p11-kit >= 0.23.1
%{?with_tpm:Requires: trousers-libs >= 0.3.11}
Conflicts: gnutls < 3.2.0
@@ -87,10 +90,11 @@ Summary(pl.UTF-8): Pliki nagłówkowe i inne do gnutls
License: LGPL v2.1+ (libgnutls), GPL v3+ (openssl library)
Group: Development/Libraries
Requires: %{name}-libs = %{version}-%{release}
-Requires: libtasn1-devel >= 3.9
-Requires: nettle-devel >= 2.7.1
+Requires: libidn-devel >= 0.5.6
+Requires: libtasn1-devel >= 4.3
+Requires: nettle-devel >= 3.1
#Requires: opencdk-devel >= 0.6.6
-Requires: p11-kit-devel >= 0.20.7
+Requires: p11-kit-devel >= 0.23.1
%{?with_tpm:Requires: trousers-devel >= 0.3.11}
Requires: zlib-devel
@@ -247,6 +251,7 @@ Wiązania Guile do GnuTLS.
%setup -q
%patch0 -p1
%patch1 -p1
+%patch2 -p1
%{__rm} po/stamp-po
@@ -259,7 +264,7 @@ Wiązania Guile do GnuTLS.
%{__autoheader}
%{__automake}
%configure \
- %{!?with_openssl:--disable-openssl-compatibility} \
+ --enable-openssl-compatibility \
--disable-silent-rules \
%{?with_static_libs:--enable-static} \
--with-default-trust-store-file=/etc/certs/ca-certificates.crt \
@@ -340,7 +345,9 @@ rm -rf $RPM_BUILD_ROOT
%files libs
%defattr(644,root,root,755)
%attr(755,root,root) %{_libdir}/libgnutls.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libgnutls.so.28
+%attr(755,root,root) %ghost %{_libdir}/libgnutls.so.30
+%attr(755,root,root) %{_libdir}/libgnutls-openssl.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libgnutls-openssl.so.27
%files devel
%defattr(644,root,root,755)
diff --git a/gnutls-install.patch b/gnutls-install.patch
new file mode 100644
index 0000000..e4f8992
--- /dev/null
+++ b/gnutls-install.patch
@@ -0,0 +1,14 @@
+--- gnutls-3.4.0/doc/manpages/Makefile.am.orig 2015-04-06 10:48:30.000000000
+0200
++++ gnutls-3.4.0/doc/manpages/Makefile.am 2015-04-19 17:23:52.212283722
+0200
+@@ -134,11 +134,8 @@
+ APIMANS += gnutls_certificate_get_peers_subkey_id.3
+ APIMANS += gnutls_certificate_get_trust_list.3
+ APIMANS += gnutls_certificate_get_verify_flags.3
+-APIMANS += gnutls_certificate_get_verify_flags.3
+-APIMANS += gnutls_certificate_get_x509_crt.3
+ APIMANS += gnutls_certificate_get_x509_crt.3
+ APIMANS += gnutls_certificate_get_x509_key.3
+-APIMANS += gnutls_certificate_get_x509_key.3
+ APIMANS += gnutls_certificate_send_x509_rdn_sequence.3
+ APIMANS += gnutls_certificate_server_set_request.3
+ APIMANS += gnutls_certificate_set_dh_params.3
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/gnutls.git/commitdiff/3504caa7336a2ed7f7e4dfa9081d84fa94d7b83e
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
