- up to 2.1.0; dirmngr in dirmngr.spec

diff --git a/gnupg2-am.patch b/gnupg2-am.patch
index 1b347c6ae974b01b90f0bc4d4bbf152d24a70e47..7a7f7d710bf7d3f9f57879217a7fb537020b83c5 100644 (file)
--- a/gnupg2-am.patch
+++ b/gnupg2-am.patch
@@ -1,11 +1,11 @@
---- gnupg-2.0.20/configure.ac.orig     2013-05-12 17:32:39.674996433 +0200
-+++ gnupg-2.0.20/configure.ac  2013-05-12 17:33:18.451661475 +0200
-@@ -62,7 +62,7 @@
+--- gnupg-2.1.0/configure.ac~  2014-11-04 16:09:28.000000000 +0100
++++ gnupg-2.1.0/configure.ac   2014-11-21 21:07:10.929592352 +0100
+@@ -77,7 +77,7 @@ VERSION=$PACKAGE_VERSION
  
- AC_CONFIG_AUX_DIR(scripts)
- AC_CONFIG_SRCDIR(sm/gpgsm.c)
--AM_CONFIG_HEADER(config.h)
-+AC_CONFIG_HEADERS(config.h)
- AM_INIT_AUTOMAKE($PACKAGE, $VERSION)
- AC_CANONICAL_HOST
- AB_INIT
+ AC_CONFIG_AUX_DIR([build-aux])
+ AC_CONFIG_SRCDIR([sm/gpgsm.c])
+-AC_CONFIG_HEADER([config.h])
++AC_CONFIG_HEADERS([config.h])
+ # Note: For automake 1.13 add the option
+ #          serial-tests
+ AM_INIT_AUTOMAKE([dist-bzip2 no-dist-gzip])

diff --git a/gnupg2-pth.patch b/gnupg2-pth.patch
deleted file mode 100644 (file)
index c2b02af..0000000
--- a/gnupg2-pth.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- gnupg-1.9.16/scd/command.c.orig    2005-04-20 12:23:46.000000000 +0200
-+++ gnupg-1.9.16/scd/command.c 2005-04-23 18:40:53.481725240 +0200
-@@ -26,6 +26,11 @@
- #include <ctype.h>
- #include <unistd.h>
- #include <signal.h>
-+#ifdef HAVE_OPENSC
-+# ifdef USE_GNU_PTH
-+#  undef USE_GNU_PTH
-+# endif
-+#endif
- #ifdef USE_GNU_PTH
- # include <pth.h>
- #endif

diff --git a/gnupg2.spec b/gnupg2.spec
index 63d4ca3c0a0c608bf6ed448c0fb7eac921017d4b..26460c96cf6d58d3b33b149e79098e26e733f618 100644 (file)
--- a/gnupg2.spec
+++ b/gnupg2.spec
@@ -1,20 +1,18 @@
-#
 # Conditional build:
-%bcond_without pth     # without pth-based based version of gnupg
 %bcond_without tests   # testsuite on build
 #
 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
-Version:       2.0.26
+Version:       2.1.0
 Release:       1
 License:       GPL v3+
 Group:         Applications/File
 Source0:       ftp://ftp.gnupg.org/gcrypt/gnupg/gnupg-%{version}.tar.bz2
-# Source0-md5: fa7e704aad33eb114d1840164455aec1
+# Source0-md5: 43a809789a1d897f4386680be0b09d02
 Source1:       gnupg-agent.sh
 Patch0:                %{name}-info.patch
-Patch1:                %{name}-pth.patch
+
 Patch2:                %{name}-disable_tests.patch
 Patch3:                %{name}-pl.po-update.patch
 Patch4:                %{name}-am.patch
@@ -30,14 +28,19 @@ BuildRequires:      libgcrypt-devel >= 1.4.0
 BuildRequires: libgpg-error-devel >= 1.7
 BuildRequires: libksba-devel >= 1.0.7
 BuildRequires: libusb-compat-devel
+BuildRequires: npth-devel >= 1.1
 BuildRequires: openldap-devel
-BuildRequires: pcsc-lite-devel
-%{?with_pth:BuildRequires:     pth-devel >= 2.0.0}
+BuildRequires: readline-devel
 BuildRequires: rpmbuild(macros) >= 1.177
 BuildRequires: texinfo
 BuildRequires: zlib-devel
 Requires:      gnupg2-common = %{version}-%{release}
 Suggests:      gnupg-agent
+Obsoletes:     gnupg2-plugin-keys_curl
+Obsoletes:     gnupg2-plugin-keys_finger
+Obsoletes:     gnupg2-plugin-keys_hkp
+Obsoletes:     gnupg2-plugin-keys_kdns
+Obsoletes:     gnupg2-plugin-keys_ldap
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define                _libexecdir     %{_libdir}/gnupg2
@@ -75,68 +78,6 @@ Common files used by tools from GnuPG project.
 %description common -l pl.UTF-8
 Pliki wspólne używane przez różne narzędzia z projektu GnuPG.
 
-%package plugin-keys_curl
-Summary:       GnuPG 2 plugin for allow talk to a HTTP/FTP keyserver
-Summary(pl.UTF-8):     Wtyczka GnuPG 2 pozwalająca komunikować się z serwerem kluczy HTTP/FTP
-Group:         Applications/File
-Requires:      %{name}-common = %{version}-%{release}
-Requires:      curl-libs >= 7.10
-
-%description plugin-keys_curl
-GnuPG 2 plugin for allow talk to a HTTP(S)/FTP(S) keyserver.
-
-%description plugin-keys_curl -l pl.UTF-8
-Wtyczka GnuPG 2 pozwalająca komunikować się z serwerem kluczy
-HTTP(S)/FTP(S).
-
-%package plugin-keys_finger
-Summary:       GnuPG 2 plugin for allow talk to a FINGER keyserver
-Summary(pl.UTF-8):     Wtyczka GnuPG 2 pozwalająca komunikować się z serwerem kluczy FINGER
-Group:         Applications/File
-Requires:      %{name}-common = %{version}-%{release}
-
-%description plugin-keys_finger
-GnuPG 2 plugin for allow talk to a FINGER keyserver.
-
-%description plugin-keys_finger -l pl.UTF-8
-Wtyczka 2 GnuPG pozwalająca komunikować się z serwerem kluczy FINGER.
-
-%package plugin-keys_hkp
-Summary:       GnuPG 2 plugin for allow talk to a HKP keyserver
-Summary(pl.UTF-8):     Wtyczka GnuPG 2 pozwalająca komunikować się z serwerem kluczy HKP
-Group:         Applications/File
-Requires:      %{name}-common = %{version}-%{release}
-
-%description plugin-keys_hkp
-GnuPG 2 plugin for allow talk to a HKP keyserver.
-
-%description plugin-keys_hkp -l pl.UTF-8
-Wtyczka GnuPG 2 pozwalająca komunikować się z serwerem kluczy HKP.
-
-%package plugin-keys_kdns
-Summary:       GnuPG 2 plugin for allow talk to a KDNS keyserver
-Summary(pl.UTF-8):     Wtyczka GnuPG 2 pozwalająca komunikować się z serwerem kluczy KDNS
-Group:         Applications/File
-Requires:      %{name}-common = %{version}-%{release}
-
-%description plugin-keys_kdns
-GnuPG 2 plugin for allow talk to a KDNS keyserver.
-
-%description plugin-keys_kdns -l pl.UTF-8
-Wtyczka GnuPG 2 pozwalająca komunikować się z serwerem kluczy KDNS.
-
-%package plugin-keys_ldap
-Summary:       GnuPG 2 plugin for allow talk to a LDAP keyserver
-Summary(pl.UTF-8):     Wtyczka GnuPG 2 pozwalająca komunikować się z serwerem kluczy LDAP
-Group:         Applications/File
-Requires:      %{name}-common = %{version}-%{release}
-
-%description plugin-keys_ldap
-GnuPG 2 plugin for allow talk to a LDAP keyserver.
-
-%description plugin-keys_ldap -l pl.UTF-8
-Wtyczka GnuPG 2 pozwalająca komunikować się z serwerem kluczy LDAP.
-
 %package -n gnupg-agent
 Summary:       GnuPG extension - agent
 Summary(pl.UTF-8):     Rozszerzenie GnuPG - agent
@@ -192,9 +133,9 @@ Rozszerzenie GnuPG - obsługa S/MIME.
 %prep
 %setup -q -n gnupg-%{version}
 %patch0 -p1
-%patch1 -p1
+
 %{!?with_tests:%patch2 -p1}
-%patch3 -p1
+#%patch3 -p1
 %patch4 -p1
 
 %{__rm} po/stamp-po
@@ -206,7 +147,7 @@ Rozszerzenie GnuPG - obsługa S/MIME.
 %{__autoheader}
 %{__automake}
 %configure \
-       %{!?with_pth:--disable-threads} \
+       --disable-dirmngr \
        --enable-gpg \
        --enable-symcryptrun \
        --with-capabilities \
@@ -254,44 +195,28 @@ EOF
 %files common -f gnupg2.lang
 %defattr(644,root,root,755)
 %doc AUTHORS ChangeLog ChangeLog-2011 NEWS README THANKS TODO
+%attr(755,root,root) %{_bindir}/g13
 %attr(755,root,root) %{_bindir}/gpg-connect-agent
 %attr(755,root,root) %{_bindir}/gpgconf
 %attr(755,root,root) %{_bindir}/gpgkey2ssh
 %attr(755,root,root) %{_bindir}/gpgparsemail
+%attr(755,root,root) %{_bindir}/gpgtar
 %attr(755,root,root) %{_bindir}/kbxutil
 %attr(755,root,root) %{_bindir}/watchgnupg
 %attr(755,root,root) %{_sbindir}/addgnupghome
 %attr(755,root,root) %{_sbindir}/applygnupgdefaults
 %dir %{_libexecdir}
+
 %{_datadir}/gnupg
 %{_mandir}/man1/gpg-connect-agent.1*
 %{_mandir}/man1/gpgconf.1*
 %{_mandir}/man1/gpgparsemail.1*
 %{_mandir}/man1/watchgnupg.1*
+%{_mandir}/man7/gnupg.7*
 %{_mandir}/man8/addgnupghome.8*
 %{_mandir}/man8/applygnupgdefaults.8*
 %{_infodir}/gnupg.info*
 
-%files plugin-keys_curl
-%defattr(644,root,root,755)
-%attr(755,root,root) %{_libexecdir}/gpg2keys_curl
-
-%files plugin-keys_finger
-%defattr(644,root,root,755)
-%attr(755,root,root) %{_libexecdir}/gpg2keys_finger
-
-%files plugin-keys_hkp
-%defattr(644,root,root,755)
-%attr(755,root,root) %{_libexecdir}/gpg2keys_hkp
-
-%files plugin-keys_kdns
-%defattr(644,root,root,755)
-%attr(755,root,root) %{_libexecdir}/gpg2keys_kdns
-
-%files plugin-keys_ldap
-%defattr(644,root,root,755)
-%attr(755,root,root) %{_libexecdir}/gpg2keys_ldap
-
 %files -n gnupg-smime
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/gpgsm
@@ -303,7 +228,6 @@ EOF
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/gpg-agent
 %attr(755,root,root) %{_bindir}/symcryptrun
-%attr(755,root,root) %{_libexecdir}/gnupg-pcsc-wrapper
 %attr(755,root,root) %{_libexecdir}/gpg-check-pattern
 %attr(755,root,root) %{_libexecdir}/gpg-protect-tool
 %attr(755,root,root) %{_libexecdir}/gpg-preset-passphrase