Merged update from upstream sources

This is an automated DistroBaker update from upstream sources.
If you do not know what this is about or would like to opt out,
contact the OSCI team.

Source: https://src.fedoraproject.org/rpms/gnupg2.git#8db22f3bba155e7ff8085345be61e398dee54476
This commit is contained in:
DistroBaker 2021-01-04 12:32:18 +00:00
parent e4e68b19fb
commit 439a676d85
4 changed files with 15 additions and 10 deletions

2
.gitignore vendored
View File

@ -98,3 +98,5 @@ gnupg-2.0.16.tar.bz2.sig
/gnupg-2.2.24.tar.bz2.sig
/gnupg-2.2.25.tar.bz2
/gnupg-2.2.25.tar.bz2.sig
/gnupg-2.2.26.tar.bz2
/gnupg-2.2.26.tar.bz2.sig

View File

@ -11,7 +11,7 @@ diff -up gnupg-2.2.23/tools/Makefile.am.insttools gnupg-2.2.23/tools/Makefile.am
+#noinst_SCRIPTS = gpg-zip
endif
if BUILD_SYMCRYPTRUN
if BUILD_WKS_TOOLS
diff -up gnupg-2.2.23/tools/Makefile.in.insttools gnupg-2.2.23/tools/Makefile.in
--- gnupg-2.2.23/tools/Makefile.in.insttools 2020-09-03 17:16:55.000000000 +0200
+++ gnupg-2.2.23/tools/Makefile.in 2020-09-04 13:49:34.183246428 +0200
@ -23,6 +23,6 @@ diff -up gnupg-2.2.23/tools/Makefile.in.insttools gnupg-2.2.23/tools/Makefile.in
-@HAVE_USTAR_TRUE@noinst_SCRIPTS = gpg-zip
+@HAVE_USTAR_TRUE@bin_PROGRAMS += gpg-zip
+#@HAVE_USTAR_TRUE@noinst_SCRIPTS = gpg-zip
@BUILD_SYMCRYPTRUN_FALSE@symcryptrun =
@BUILD_SYMCRYPTRUN_TRUE@symcryptrun = symcryptrun
@BUILD_WKS_TOOLS_FALSE@gpg_wks_server =
@BUILD_WKS_TOOLS_TRUE@gpg_wks_server = gpg-wks-server
common_libs = $(libcommon)

View File

@ -6,8 +6,8 @@
Summary: Utility for secure communication and data storage
Name: gnupg2
Version: 2.2.25
Release: 2%{?dist}
Version: 2.2.26
Release: 1%{?dist}
License: GPLv3+
Source0: ftp://ftp.gnupg.org/gcrypt/%{?pre:alpha/}gnupg/gnupg-%{version}%{?pre}.tar.bz2
@ -31,7 +31,7 @@ Patch22: gnupg-2.2.18-gpg-accept-subkeys-with-a-good-revocation-but-no-self-sig.
Patch30: gnupg-2.2.21-coverity.patch
URL: http://www.gnupg.org/
URL: https://www.gnupg.org/
#BuildRequires: automake libtool texinfo transfig
BuildRequires: gcc
@ -52,6 +52,7 @@ BuildRequires: zlib-devel
BuildRequires: gnutls-devel
BuildRequires: sqlite-devel
BuildRequires: fuse
BuildRequires: make
Requires: libgcrypt >= 1.7.0
Requires: libgpg-error >= 1.31
@ -75,7 +76,7 @@ Obsoletes: dirmngr < 1.2.0-1
%package smime
Summary: CMS encryption and signing tool and smart card support for GnuPG
Requires: gnupg2 = %{version}-%{release}
Requires: gnupg2%{?_isa} = %{version}-%{release}
%description
@ -183,7 +184,6 @@ make -k check
%files -f %{name}.lang
%{!?_licensedir:%global license %%doc}
%license COPYING
#doc AUTHORS NEWS README THANKS TODO
%{_pkgdocdir}
@ -223,6 +223,9 @@ make -k check
%changelog
* Mon Jan 04 2021 Jakub Jelen <jjelen@redhat.com> - 2.2.26-1
- New upstream release (#1909825)
* Tue Nov 24 2020 Jakub Jelen <jjelen@redhat.com> - 2.2.25-2
- Enable gpgtar (#1901103)

View File

@ -1,2 +1,2 @@
SHA512 (gnupg-2.2.25.tar.bz2) = ab1d7cc9d8be3e7189bc4bea431b9d5db313cbd1739823950f32fbb611b2f4374889f444efbf43ce1fbf498b9865d7e6e953cd4c86d58fd688f63923c434ea2c
SHA512 (gnupg-2.2.25.tar.bz2.sig) = 632748a34f6daf59408ee96c0dc94eb2079156b49b43da91848d6b6529fbf868a18ae52849b2a2331eeb30da3eef9394d1431374cb52c44a571722cbb39adf65
SHA512 (gnupg-2.2.26.tar.bz2) = 5e9482e126c32c836064b125a18b109f0d3c96892474d3fb47dd791350cccefc56f9a5dfbd54504716487a93d9f71de2493bdfef92e29964b5bfe28b0053c265
SHA512 (gnupg-2.2.26.tar.bz2.sig) = e529a51c53d3e49d966a7bfb007f6db25961fac492275c786c508c3afca6e7d4f1e8e72b44ea7b5ef6987f56817fb08f82d519a295d0531c524d1e76d39f6adb