.gitignore

@@ -1 +1 @@
-SOURCES/gpgme-1.13.1.licenses.tar.bz2
+SOURCES/gpgme-1.13.1.tar.bz2

.gpgme.metadata

@@ -1 +1 @@
-a33a6121d761d499716eec342fc99bcc57f6a693 SOURCES/gpgme-1.13.1.licenses.tar.bz2
+f87f34e695e8d74ccc7c8f42864d50630afebb0e SOURCES/gpgme-1.13.1.tar.bz2

SOURCES/gpgme-1.13.1-fix-null-deref.patch

@@ -1,26 +0,0 @@
-diff --git a/src/data-mem.c b/src/data-mem.c
-index 539b453..ae16bab 100644
---- a/src/data-mem.c
-+++ b/src/data-mem.c
-@@ -271,7 +271,7 @@ gpgme_data_release_and_get_mem (gpgme_data_t dh, size_t *r_len)
-     }
-   else
-     {
--      if (blankout && len)
-+      if (str && blankout && len)
-         *str = 0;
-       /* Prevent mem_release from releasing the buffer memory.  We
-        * must not fail from this point.  */
-diff --git a/src/vfs-create.c b/src/vfs-create.c
-index 51b8307..445cd05 100644
---- a/src/vfs-create.c
-+++ b/src/vfs-create.c
-@@ -130,7 +130,7 @@ _gpgme_op_vfs_create (gpgme_ctx_t ctx, gpgme_key_t recp[],
-     return err;
- 
-   i = 0;
--  while (!err && recp[i])
-+  while (!err && recp && recp[i])
-     {
-       if (!recp[i]->subkeys || !recp[i]->subkeys->fpr)
- 	{

SOURCES/gpgme-1.13.1-pkgconfig.patch

@@ -1,31 +0,0 @@
-diff --git a/src/gpgme-glib.pc.in b/src/gpgme-glib.pc.in
-index bd42a31..781a463 100644
---- a/src/gpgme-glib.pc.in
-+++ b/src/gpgme-glib.pc.in
-@@ -7,8 +7,8 @@ api_version=@GPGME_CONFIG_API_VERSION@
- 
- Name: gpgme-glib
- Description: GnuPG Made Easy to access GnuPG with Glib
--Requires: gpg-error, libassuan, glib-2.0
-+Requires: glib-2.0
- Version: @PACKAGE_VERSION@
--Cflags: @GPGME_CONFIG_CFLAGS@
--Libs: @GPGME_CONFIG_LIBS@
-+Cflags: @GPGME_CONFIG_CFLAGS@ -I/usr/include/libassuan2
-+Libs: @GPGME_CONFIG_LIBS@ -lgpg-error -lassuan
- URL: https://www.gnupg.org/software/gpgme/index.html
-diff --git a/src/gpgme.pc.in b/src/gpgme.pc.in
-index be288b8..a71bcf7 100644
---- a/src/gpgme.pc.in
-+++ b/src/gpgme.pc.in
-@@ -7,8 +7,7 @@ api_version=@GPGME_CONFIG_API_VERSION@
- 
- Name: gpgme
- Description: GnuPG Made Easy to access GnuPG
--Requires: gpg-error, libassuan
- Version: @PACKAGE_VERSION@
--Cflags: @GPGME_CONFIG_CFLAGS@
--Libs: @GPGME_CONFIG_LIBS@
-+Cflags: @GPGME_CONFIG_CFLAGS@ -I/usr/include/libassuan2
-+Libs: @GPGME_CONFIG_LIBS@ -lgpg-error -lassuan
- URL: https://www.gnupg.org/software/gpgme/index.html

SPECS/gpgme.spec

@@ -17,17 +17,11 @@
 Name:           gpgme
 Summary:        GnuPG Made Easy - high level crypto API
 Version:        1.13.1
-Release:        12%{?dist}
+Release:        4%{?dist}
 
-# /usr/bin/gpgme-tool is licensed under GPLv3+
+License:        LGPLv2+
-# 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
@@ -41,12 +35,6 @@ Patch1003:      0001-fix-stupid-ax_python_devel.patch
 Patch1004:      gpgme-1.13.1-fix-resource-leaks.patch
 # Make the make check work with gnupg-2.2.19 and above
 Patch1005:      gpgme-build-with-gnupg-2.2.19.patch
-# Fix NULL dereference
-Patch1006:      gpgme-1.13.1-fix-null-deref.patch
-# Remove Requires: from pkgconfigs (rely only on rpm deps
-# since both libgpg-error and libassuan have no pkgconfigs
-# packaged)
-Patch1007:      gpgme-1.13.1-pkgconfig.patch
 
 #BuildRequires:  autoconf
 #BuildRequires:  automake
@@ -82,7 +70,6 @@ management.
 Summary:        Development headers and libraries for %{name}
 Requires:       %{name}%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release}
 Requires:       libgpg-error-devel%{?_isa} >= %{libgpg_error_min_ver}
-Requires:       libassuan-devel
 Requires(post): /sbin/install-info
 Requires(postun): /sbin/install-info
 
@@ -115,8 +102,6 @@ BuildRequires:  cmake
 %package -n q%{name}
 Summary:        Qt API bindings/wrapper for GPGME
 Requires:       %{name}pp%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release}
-# This is probably redundant, but it satisfies RPMDIFF:
-Requires:       %{name}%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release}
 BuildRequires:  pkgconfig(Qt5Core)
 BuildRequires:  pkgconfig(Qt5Test)
 
@@ -144,7 +129,7 @@ Requires:       %{name}%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release}
 
 %description -n python2-gpg
 %{summary}.
-%endif
+%endif # without python2
 
 %package -n python3-gpg
 Summary:        %{name} bindings for Python 3
@@ -176,6 +161,7 @@ sed -i -e 's|^libdir=@libdir@$|libdir=@exec_prefix@/lib|g' src/gpgme-config.in
 # unpackaged files
 rm -fv %{buildroot}%{_infodir}/dir
 rm -fv %{buildroot}%{_libdir}/lib*.la
+rm -fv %{buildroot}%{_libdir}/pkgconfig/%{name}*.pc
 
 # Hack to resolve multiarch conflict (#341351)
 %ifarch %{multilib_arches}
@@ -196,7 +182,7 @@ chrpath -d %{buildroot}%{_libdir}/libq%{name}.so*
 # autofoo installs useless stuff for uninstall
 %if %{with python2}
 rm -vf %{buildroot}%{python2_sitelib}/gpg/install_files.txt
-%endif
+%endif # with python2
 rm -vf %{buildroot}%{python3_sitelib}/gpg/install_files.txt
 
 %if %{with check}
@@ -207,7 +193,7 @@ make check
 %ldconfig_scriptlets
 
 %files
-%license COPYING* LICENSES
+%license COPYING*
 %doc AUTHORS ChangeLog NEWS README* THANKS TODO VERSION
 %{_libdir}/lib%{name}.so.11*
 %{_bindir}/%{name}-json
@@ -231,7 +217,6 @@ fi
 %{_libdir}/lib%{name}.so
 %{_datadir}/aclocal/%{name}.m4
 %{_infodir}/%{name}.info*
-%{_libdir}/pkgconfig/%{name}*.pc
 
 %files -n %{name}pp
 %doc lang/cpp/README
@@ -257,7 +242,7 @@ fi
 %doc lang/python/README
 %{python2_sitearch}/gpg-*.egg-info
 %{python2_sitearch}/gpg/
-%endif
+%endif # with python2
 
 %files -n python3-gpg
 %doc lang/python/README
@@ -265,40 +250,6 @@ fi
 %{python3_sitearch}/gpg/
 
 %changelog
-* Tue Jan 16 2024 Michal Hlavinka <mhlavink@redhat.com> - 1.13.1-12
-- add libassuan-devel to devel pkg requirements (#RHEL-6920)
-
-* Thu Feb 10 2022 Jiri Kucera <jkucera@redhat.com> - 1.13.1-11
-- Update pkgconfig files
-  Related: #1953905
-
-* Wed Feb 09 2022 Jiri Kucera <jkucera@redhat.com> - 1.13.1-10
-- Add fixed pkgconfig files
-  Resolves: #1953905
-
-* Fri Jun 11 2021 Jiri Kucera <jkucera@redhat.com> - 1.13.1-9
-- Remove pkgconfig files
-  Needs libgpg-error and libassuan rebase
-  Related: #1882423
-
-* Tue Jun 08 2021 Jiri Kucera <jkucera@redhat.com> - 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 <jkucera@redhat.com> - 1.13.1-7
-- Fix null dereference
-  Fix licence tag
-  Related: #1726861
-
-* Fri Nov 06 2020 Jiri Kucera <jkucera@redhat.com> - 1.13.1-6
-- Try to fix RPMDIFF issues
-  Related: #1726861
-
-* Tue Nov 03 2020 Jiri Kucera <jkucera@redhat.com> - 1.13.1-5
-- Rebuild
-  Related: #1726861
-
 * Tue Sep 29 2020 Jiri Kucera <jkucera@redhat.com> - 1.13.1-4
 - Rebuild
   Resolves: #1726861