Accepting request 260826 from home:vitezslav_cizek:branches:Base:System

- upgrade to 2.1.0 (modern)
  - The file "secring.gpg" is not anymore used to store the secret
    keys.  Merging of secret keys is now supported.
  - All support for PGP-2 keys has been removed for security reasons.
  - The standard key generation interface is now much leaner.  This
    will help a new user to quickly generate a suitable key.
  - Support for Elliptic Curve Cryptography (ECC) is now available.
  - Commands to create and sign keys from the command line without any
    extra prompts are now available.
  - The Pinentry may now show the new passphrase entry and the
    passphrase confirmation entry in one dialog.
  - There is no more need to manually start the gpg-agent.  It is now
    started by any part of GnuPG as needed.
  - Problems with importing keys with the same long key id have been
    addressed.
  - The Dirmngr is now part of GnuPG proper and also takes care of
    accessing keyserver.
  - Keyserver pools are now handled in a smarter way.
  - A new format for locally storing the public keys is now used.
    This considerable speeds up operations on large keyrings.
  - Revocation certificates are now created by default.
  - Card support has been updated, new readers and token types are
    supported.
  - The format of the key listing has been changed to better identify
    the properties of a key.
  - The gpg-agent may now be used on Windows as a Pageant replacement
    for Putty in the same way it is used for years on Unix as
    ssh-agent replacement.
  - Creation of X.509 certificates has been improved.  It is now also
    possible to export them directly in PKCS#8 and PEM format for use

OBS-URL: https://build.opensuse.org/request/show/260826
OBS-URL: https://build.opensuse.org/package/show/Base:System/gpg2?expand=0&rev=79

gpg2.spec

@@ -17,7 +17,7 @@
 
 
 Name:           gpg2
-Version:        2.0.26
+Version:        2.1.0
 Release:        0
 BuildRequires:  automake >= 1.10
 BuildRequires:  expect
@@ -36,11 +36,14 @@ BuildRequires:  makeinfo
 BuildRequires:  openldap2-devel
 BuildRequires:  readline-devel
 BuildRequires:  zlib-devel
-%if 0%{?suse_version} >= 1120
-BuildRequires:  libpth-devel >= 1.3.7
-%else
-BuildRequires:  pth >= 1.3.7
-%endif
+#% if 0%{?suse_version} >= 1120
+#BuildRequires:  libpth-devel >= 1.3.7
+#% else
+#BuildRequires:  pth >= 1.3.7
+#% endif
+BuildRequires:  gnutls-devel
+BuildRequires:  npth-devel
+BuildRequires:  pkg-config
 Url:            http://www.gnupg.org/aegypten2/
 PreReq:         %install_info_prereq
 Requires:       dirmngr
@@ -59,7 +62,7 @@ Source:         ftp://ftp.gnupg.org/gcrypt/gnupg/gnupg-%{version}.tar.bz2
 Source2:        ftp://ftp.gnupg.org/gcrypt/gnupg/gnupg-%{version}.tar.bz2.sig
 # https://www.gnupg.org/signature_key.html
 Source3:        %{name}.keyring
-Patch1:         gnupg-2.0.18-tmpdir.diff
+#Patch1:         gnupg-2.0.18-tmpdir.diff
 Patch2:         gnupg-2.0.4-install_tools.diff
 Patch4:         gnupg-2.0.9-langinfo.patch
 Patch5:         gnupg-2.0.18-files-are-digests.patch
@@ -67,7 +70,7 @@ Patch6:         gnupg-dont-fail-with-seahorse-agent.patch
 Patch8:         gnupg-set_umask_before_open_outfile.patch
 Patch9:         gnupg-detect_FIPS_mode.patch
 # PATCH-FIX-OPENSUSE coolo@suse.de -- automake 1.13 already includes $SHELL
-Patch10:        gnupg-2.0.20-automake113.diff
+#Patch10:        gnupg-2.0.20-automake113.diff
 Patch11:        gnupg-add_legacy_FIPS_mode_option.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
@@ -79,14 +82,14 @@ gpg-agent, and a keybox library.
 %lang_package
 %prep
 %setup  -q -n gnupg-%version
-%patch1 -p1
+#%patch1 -p1
 %patch2
 %patch4 -p1
 %patch5 -p1
 %patch6 -p1
 %patch8 -p1
 %patch9 -p1
-%patch10 -p1
+#%patch10 -p1
 %patch11 -p1
 
 %build
@@ -134,6 +137,7 @@ rm -rf $RPM_BUILD_ROOT/%_datadir/locale/en@{bold,}quot
 install -m 644 AUTHORS COPYING ChangeLog NEWS THANKS TODO doc/FAQ $RPM_BUILD_ROOT/%{_docdir}/%{name}
 # install scdaemon to %{_bindir} (bnc#863645)
 mv %{buildroot}%{_libdir}/scdaemon %{buildroot}%{_bindir}
+mv %{buildroot}%{_libdir}/dirmngr_ldap %{buildroot}%{_bindir}
 %find_lang gnupg2
 %if 0%{?suse_version} > 1020
 %fdupes %buildroot
@@ -142,8 +146,6 @@ mv %{buildroot}%{_libdir}/scdaemon %{buildroot}%{_bindir}
 %check
 %if ! 0%{?qemu_user_space_build}
 make check
-$RPM_BUILD_ROOT/usr/bin/gpgsplit -v -p pubsplit-                    --uncompress <tests/openpgp/pubring.gpg  
-$RPM_BUILD_ROOT/usr/bin/gpgsplit -v -p secsplit- --secret-to-public --uncompress <tests/openpgp/secring.gpg  
 %endif
 
 %post