diff --git a/SPECS/gpgme.spec b/SPECS/gpgme.spec index 9e59d17..0d4ad6b 100644 --- a/SPECS/gpgme.spec +++ b/SPECS/gpgme.spec @@ -12,23 +12,18 @@ # STATUS_KEY_CONSIDERED has been added in 2.1.13 %global gnupg2_min_ver 2.1.13 -# GPG_ERR_SUBKEYS_EXP_OR_REV has been added in 1.23 -%global libgpg_error_min_ver 1.23 +%global libgpg_error_min_ver 1.24 Name: gpgme Summary: GnuPG Made Easy - high level crypto API -Version: 1.10.0 -Release: 6%{?dist}.0.1 +Version: 1.13.1 +Release: 3%{?dist} License: LGPLv2+ URL: https://gnupg.org/related_software/gpgme/ -Source0: ftp://ftp.gnupg.org/gcrypt/gpgme/gpgme-%{version}.tar.bz2 +Source0: https://gnupg.org/ftp/gcrypt/gpgme/gpgme-%{version}.tar.bz2 Source2: gpgme-multilib.h -## upstream patches -# https://git.gnupg.org/cgi-bin/gitweb.cgi?p=gpgme.git;a=commit;h=b99502274ae5efdf6df0d967900ec3d1e64373d7 -Patch1000: 0001-core-Tweak-STATUS_FAILURE-handling.patch - ## downstream patches # Don't add extra libs/cflags in gpgme-config/cmake equivalent Patch1001: 0001-don-t-add-extra-libraries-for-linking.patch @@ -37,20 +32,19 @@ Patch1002: gpgme-1.3.2-largefile.patch # Let's fix stupid AX_PYTHON_DEVEL Patch1003: 0001-fix-stupid-ax_python_devel.patch # Fix resource leaks discovered by static code analyzer -Patch1004: gpgme-1.10.0-fix-resource-leaks.patch - -# CentOS fix expired test certs -Patch9999: gpgme-1.10.0-fix-expired-certs.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 -BuildRequires: autoconf -BuildRequires: automake +#BuildRequires: autoconf +#BuildRequires: automake BuildRequires: gcc BuildRequires: gcc-c++ BuildRequires: gawk BuildRequires: gnupg2 >= %{gnupg2_min_ver} BuildRequires: gnupg2-smime BuildRequires: libgpg-error-devel >= %{libgpg_error_min_ver} -BuildRequires: libassuan-devel >= 2.0.2 +BuildRequires: libassuan-devel >= 2.4.2 # For python bindings BuildRequires: swig @@ -154,12 +148,10 @@ Requires: %{name}%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release} # set it to a value which we know will be suppressed. sed -i -e 's|^libdir=@libdir@$|libdir=@exec_prefix@/lib|g' src/gpgme-config.in -find -type f -name Makefile\* -exec sed -i -e 's|GPG = gpg|GPG = gpg2|' {} ';' - %build -./autogen.sh +#./autogen.sh %configure --disable-static --disable-silent-rules \ - --enable-languages=cpp,qt,python3 + --enable-languages=cpp,qt,python %make_build @@ -169,6 +161,7 @@ find -type f -name Makefile\* -exec sed -i -e 's|GPG = gpg|GPG = gpg2|' {} ';' # 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} @@ -203,6 +196,7 @@ make check %license COPYING* %doc AUTHORS ChangeLog NEWS README* THANKS TODO VERSION %{_libdir}/lib%{name}.so.11* +%{_bindir}/%{name}-json %post devel /sbin/install-info %{_infodir}/%{name}.info %{_infodir}/dir 2>/dev/null || : @@ -256,8 +250,18 @@ fi %{python3_sitearch}/gpg/ %changelog -* Wed May 15 2019 Johnny Hughes -- Fix RH Bug: 1666353 with Patch9999 +* Tue Jun 02 2020 Jiri Kucera - 1.13.1-3 +- Fix resource leaks found by static code analysis + Related: #1829822 + +* Mon Jun 01 2020 Jiri Kucera - 1.13.1-2 +- Remove *.pc files due to 'nothing provides pkgconfig(gpg-error)' + and 'nothing provides pkgconfig(libassuan)' dnf errors + Related: #1829822 + +* Mon Jun 01 2020 Jiri Kucera - 1.13.1-1 +- Update to gpgme 1.13.1 + Resolves: #1829822 * Mon Nov 12 2018 Jiri Kucera - 1.10.0-6 - Fix important static scanner issues