[packages/gnupg2] - updated to 2.1.20; defaults to ntbtls instead of gnutls

[baggins]

commit 169b893393aa0c3f98f792532dd4cb1c00af82d6
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Sun Apr 9 21:18:27 2017 +0200

    - updated to 2.1.20; defaults to ntbtls instead of gnutls

 gnupg2.spec | 30 +++++++++++++++++++-----------
 1 file changed, 19 insertions(+), 11 deletions(-)
---
diff --git a/gnupg2.spec b/gnupg2.spec
index f5f6940..afc9ccb 100644
--- a/gnupg2.spec
+++ b/gnupg2.spec
@@ -2,17 +2,19 @@
 # Conditional build:
 %bcond_without	pth	# without pth-based based version of gnupg
 %bcond_without	tests	# testsuite on build
+%bcond_with	gnutls	# GnuTLS instead of NTBTLS
+%bcond_with	selinux	# "SELinux hacks"
 #
 Summary:	GNU Privacy Guard - tool for secure communication and data storage - enhanced version
 Summary(pl.UTF-8):	GnuPG - narzędzie do bezpiecznej komunikacji i bezpiecznego przechowywania danych - wersja rozszerzona
 Name:		gnupg2
 # 2.1.x is development version unfortunately (see gpg2 --version)
-Version:	2.1.18
+Version:	2.1.20
 Release:	0.1
 License:	GPL v3+
 Group:		Applications/File
 Source0:	ftp://ftp.gnupg.org/gcrypt/gnupg/gnupg-%{version}.tar.bz2
-# Source0-md5:	c67f908b0b35c7ebc62144f362757e1e
+# Source0-md5:	f6bc7e0b82893dfafe09109d86ff6e9b
 Source1:	gnupg-agent.sh
 Patch0:		%{name}-info.patch
 Patch1:		%{name}-pth.patch
@@ -25,15 +27,19 @@ BuildRequires:	autoconf >= 2.61
 BuildRequires:	automake >= 1:1.14
 BuildRequires:	bzip2-devel
 BuildRequires:	curl-devel >= 7.10
-BuildRequires:	gettext-devel >= 0.19.3
-BuildRequires:	libassuan-devel >= 1:2.0.0
-BuildRequires:	libgcrypt-devel >= 1.5.0
-BuildRequires:	libgpg-error-devel >= 1.11
-BuildRequires:	libksba-devel >= 1.0.7
-BuildRequires:	libusb-compat-devel
-BuildRequires:	openldap-devel
-BuildRequires:	pcsc-lite-devel
-%{?with_pth:BuildRequires:	pth-devel >= 2.0.0}
+BuildRequires:	gettext-tools >= 0.17
+%{?with_gnutls:BuildRequires:	gnutls-devel >= 3.0}
+BuildRequires:	libassuan-devel >= 1:2.4.3
+BuildRequires:	libgcrypt-devel >= 1.7.0
+BuildRequires:	libgpg-error-devel >= 1.24
+BuildRequires:	libksba-devel >= 1.3.4
+BuildRequires:	libusb-devel >= 1.0
+BuildRequires:	npth-devel >= 1.2
+%{!?with_gnutls:BuildRequires:	ntbtls-devel >= 0.1.0}
+# only for dirmngr, which is not built here
+#BuildRequires:	openldap-devel
+BuildRequires:	pkgconfig
+BuildRequires:	readline-devel
 BuildRequires:	rpmbuild(macros) >= 1.177
 BuildRequires:	texinfo
 BuildRequires:	zlib-devel
@@ -209,6 +215,8 @@ Rozszerzenie GnuPG - obsługa S/MIME.
 %configure \
 	%{!?with_pth:--disable-threads} \
 	--enable-gpg \
+	%{?with_gnutls:--disable-ntbtls} \
+	%{?with_selinux:--enable-selinux-support} \
 	--enable-symcryptrun \
 	--with-capabilities \
 	--with-pinentry-pgm=%{_bindir}/pinentry \
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/gnupg2.git/commitdiff/aab2acb57125a97d529782c515b7c72a5bf923d8