import gpgme-1.13.1-11.el8

SOURCES/gpgme-1.13.1-pkgconfig.patch

@@ -0,0 +1,31 @@
+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,7 +17,7 @@
 Name:           gpgme
 Summary:        GnuPG Made Easy - high level crypto API
 Version:        1.13.1
-Release:        9%{?dist}
+Release:        11%{?dist}
 
 # /usr/bin/gpgme-tool is licensed under GPLv3+
 # the rest is licensed under LGPLv2+
@@ -43,6 +43,10 @@ Patch1004:      gpgme-1.13.1-fix-resource-leaks.patch
 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
@@ -139,7 +143,7 @@ Requires:       %{name}%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release}
 
 %description -n python2-gpg
 %{summary}.
-%endif # without python2
+%endif
 
 %package -n python3-gpg
 Summary:        %{name} bindings for Python 3
@@ -171,7 +175,6 @@ 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}
@@ -192,7 +195,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 # with python2
+%endif
 rm -vf %{buildroot}%{python3_sitelib}/gpg/install_files.txt
 
 %if %{with check}
@@ -227,6 +230,7 @@ fi
 %{_libdir}/lib%{name}.so
 %{_datadir}/aclocal/%{name}.m4
 %{_infodir}/%{name}.info*
+%{_libdir}/pkgconfig/%{name}*.pc
 
 %files -n %{name}pp
 %doc lang/cpp/README
@@ -252,7 +256,7 @@ fi
 %doc lang/python/README
 %{python2_sitearch}/gpg-*.egg-info
 %{python2_sitearch}/gpg/
-%endif # with python2
+%endif
 
 %files -n python3-gpg
 %doc lang/python/README
@@ -260,6 +264,14 @@ fi
 %{python3_sitearch}/gpg/
 
 %changelog
+* 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