[packages/gnutls] - merged DEVEL branch, finished update to 3.6.5 (current stable now)

[qboosh]

commit 800f463c48600b83451c1b6531eea51c936834f2
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Tue Jan 15 19:13:18 2019 +0100

    - merged DEVEL branch, finished update to 3.6.5 (current stable now)

 gnutls-info.patch | 16 ++++++++--------
 gnutls.spec       |  6 ++----
 2 files changed, 10 insertions(+), 12 deletions(-)
---
diff --git a/gnutls.spec b/gnutls.spec
index c26a05f..37a68a2 100644
--- a/gnutls.spec
+++ b/gnutls.spec
@@ -24,7 +24,7 @@ BuildRequires:	autogen-devel
 BuildRequires:	automake >= 1:1.12.2
 BuildRequires:	gettext-tools >= 0.19
 BuildRequires:	gmp-devel
-%{?with_doc:BuildRequires:	gtk-doc >= 1.1}
+%{?with_doc:BuildRequires:	gtk-doc >= 1.14}
 BuildRequires:	guile-devel >= 5:2.0
 BuildRequires:	libidn2-devel
 BuildRequires:	libstdc++-devel
@@ -251,10 +251,8 @@ Wiązania Guile do GnuTLS.
 %{__rm} po/stamp-po
 
 %build
-%{__mv} build-aux/snippet{,.save}
 %{__libtoolize}
-%{__mv} build-aux/snippet{.save,}
-%{__aclocal} -I m4 -I gl/m4 -I src/libopts/m4 -I src/gl/m4 -I lib/unistring/m4
+%{__aclocal} -I m4 -I src/libopts/m4 -I src/gl/m4 -I lib/unistring/m4
 %{__autoconf}
 %{__autoheader}
 %{__automake}
diff --git a/gnutls-info.patch b/gnutls-info.patch
index c3edb95..3306d92 100644
--- a/gnutls-info.patch
+++ b/gnutls-info.patch
@@ -1,5 +1,5 @@
---- gnutls-2.10.0/doc/gnutls.texi.orig	2010-06-21 09:50:55.000000000 +0200
-+++ gnutls-2.10.0/doc/gnutls.texi	2010-06-30 22:40:46.073398443 +0200
+--- gnutls-3.6.5/doc/gnutls.texi.orig	2019-01-15 18:11:57.529996191 +0100
++++ gnutls-3.6.5/doc/gnutls.texi	2019-01-15 18:19:26.313324399 +0100
 @@ -29,19 +29,19 @@
  @end quotation
  @end copying
@@ -14,12 +14,12 @@
 - at dircategory System Administration
 + at dircategory Net utilities:
  @direntry
--* certtool: (gnutls)Invoking certtool.	Manipulate certificates and keys.
--* gnutls-serv: (gnutls)Invoking gnutls-serv.	GnuTLS test server.
--* gnutls-cli: (gnutls)Invoking gnutls-cli.	GnuTLS test client.
--* gnutls-cli-debug: (gnutls)Invoking gnutls-cli-debug.	GnuTLS debug client.
--* psktool: (gnutls)Invoking psktool.	Simple TLS-Pre-Shared-Keys manager.
--* srptool: (gnutls)Invoking srptool.	Simple SRP password tool.
+-* certtool: (gnutls)certtool Invocation.	Manipulate certificates and keys.
+-* gnutls-serv: (gnutls)gnutls-serv Invocation.	GnuTLS test server.
+-* gnutls-cli: (gnutls)gnutls-cli Invocation.	GnuTLS test client.
+-* gnutls-cli-debug: (gnutls)gnutls-cli-debug Invocation.	GnuTLS debug client.
+-* psktool: (gnutls)psktool Invocation.	Simple TLS-Pre-Shared-Keys manager.
+-* srptool: (gnutls)srptool Invocation.	Simple SRP password tool.
 +* certtool: (gnutls)certtool.		Manipulate certificates and keys
 +* gnutls-serv: (gnutls)gnutls-serv.	GnuTLS test server
 +* gnutls-cli: (gnutls)gnutls-cli.	GnuTLS test client
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/gnutls.git/commitdiff/800f463c48600b83451c1b6531eea51c936834f2