From dd7be33781d27b59bc19343c89e277f691cdcce4 Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Tue, 9 Nov 2021 05:07:53 -0500 Subject: [PATCH] import gpgme-1.13.1-9.el8 --- .gitignore | 2 +- .gpgme.metadata | 2 +- SPECS/gpgme.spec | 24 ++++++++++++++++++++---- 3 files changed, 22 insertions(+), 6 deletions(-) diff --git a/.gitignore b/.gitignore index fe18078..524fb3c 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/gpgme-1.13.1.tar.bz2 +SOURCES/gpgme-1.13.1.licenses.tar.bz2 diff --git a/.gpgme.metadata b/.gpgme.metadata index 6b6749d..200e3f2 100644 --- a/.gpgme.metadata +++ b/.gpgme.metadata @@ -1 +1 @@ -f87f34e695e8d74ccc7c8f42864d50630afebb0e SOURCES/gpgme-1.13.1.tar.bz2 +a33a6121d761d499716eec342fc99bcc57f6a693 SOURCES/gpgme-1.13.1.licenses.tar.bz2 diff --git a/SPECS/gpgme.spec b/SPECS/gpgme.spec index 8319642..754d087 100644 --- a/SPECS/gpgme.spec +++ b/SPECS/gpgme.spec @@ -17,11 +17,17 @@ Name: gpgme Summary: GnuPG Made Easy - high level crypto API Version: 1.13.1 -Release: 7%{?dist} +Release: 9%{?dist} -License: LGPLv2+ and MIT +# /usr/bin/gpgme-tool is licensed under GPLv3+ +# the rest is licensed under LGPLv2+ +# Note: /usr/bin/gpgme-json contains bits of MIT licensed code, but its +# effective license remains LGPLv2+ +# (see https://fedoraproject.org/wiki/Licensing:FAQ) +License: LGPLv2+ and GPLv3+ URL: https://gnupg.org/related_software/gpgme/ -Source0: https://gnupg.org/ftp/gcrypt/gpgme/gpgme-%{version}.tar.bz2 +#Source0: https://gnupg.org/ftp/gcrypt/gpgme/gpgme-%%{version}.tar.bz2 +Source0: gpgme-%{version}.licenses.tar.bz2 Source2: gpgme-multilib.h ## downstream patches @@ -197,7 +203,7 @@ make check %ldconfig_scriptlets %files -%license COPYING* +%license COPYING* LICENSES %doc AUTHORS ChangeLog NEWS README* THANKS TODO VERSION %{_libdir}/lib%{name}.so.11* %{_bindir}/%{name}-json @@ -254,6 +260,16 @@ fi %{python3_sitearch}/gpg/ %changelog +* Fri Jun 11 2021 Jiri Kucera - 1.13.1-9 +- Remove pkgconfig files + Needs libgpg-error and libassuan rebase + Related: #1882423 + +* Tue Jun 08 2021 Jiri Kucera - 1.13.1-8 +- Add LICENSES file into the tarball, update License field + Add pkgconfig files to gpgme-devel + Resolves: #1882423, #1953905 + * Wed Nov 18 2020 Jiri Kucera - 1.13.1-7 - Fix null dereference Fix licence tag