Control: tags -1 patch On 2022-11-20 Andreas Metzler <ametz...@bebt.de> wrote: > Source: libdnf > Version: 0.55.2-6 > Severity: important > User: pkg-gnupg-ma...@lists.alioth.debian.org > Usertags: gpgme-config-transition
> The package relies on gpgme-config to detect gpgme. gpgme-config has been > dropped and replaced by pkg-config pc files. Straightforward patch attached. cu Andreas
diff -Nru libdnf-0.55.2/debian/changelog libdnf-0.55.2/debian/changelog --- libdnf-0.55.2/debian/changelog 2021-04-14 21:26:57.000000000 +0200 +++ libdnf-0.55.2/debian/changelog 2022-12-10 13:48:46.000000000 +0100 @@ -1,3 +1,10 @@ +libdnf (0.55.2-6.1) unstable; urgency=medium + + * Non-maintainer upload. + * Use pkg-config to locate gpgme. Closes: #1024500 + + -- Andreas Metzler <ametz...@debian.org> Sat, 10 Dec 2022 13:48:46 +0100 + libdnf (0.55.2-6) unstable; urgency=high * Add patch for signature check with rpmcliVerifySignatures. Closes: #986802. diff -Nru libdnf-0.55.2/debian/patches/0020_gpmgme-pkg-config.diff libdnf-0.55.2/debian/patches/0020_gpmgme-pkg-config.diff --- libdnf-0.55.2/debian/patches/0020_gpmgme-pkg-config.diff 1970-01-01 01:00:00.000000000 +0100 +++ libdnf-0.55.2/debian/patches/0020_gpmgme-pkg-config.diff 2022-12-10 13:48:46.000000000 +0100 @@ -0,0 +1,34 @@ +Description: Use pkg-config to locate gpgme +Author: Andreas Metzler <ametz...@debian.org> +Bug-Debian: https://bugs.debian.org/1024500 +Origin: vendor +Forwarded: no +Last-Update: 2022-12-10 + +--- libdnf-0.55.2.orig/CMakeLists.txt ++++ libdnf-0.55.2/CMakeLists.txt +@@ -48,9 +48,11 @@ if(APPLE) + endif() + LIST (APPEND CMAKE_MODULE_PATH "${CMAKE_INSTALL_PREFIX}/share/cmake/libsolv/") + +- + # build dependencies +-find_package(Gpgme REQUIRED) ++pkg_search_module(GPGME REQUIRED gpgme) ++if (${GPGME_FOUND}) ++ message (STATUS "found gpgme ${GPGME_VERSION}") ++endif (${GPGME_FOUND}) + find_package(LibSolv 0.6.30 REQUIRED COMPONENTS ext) + find_package(OpenSSL REQUIRED) + +--- libdnf-0.55.2.orig/libdnf/CMakeLists.txt ++++ libdnf-0.55.2/libdnf/CMakeLists.txt +@@ -71,7 +71,7 @@ target_link_libraries(libdnf + ${JSONC_LIBRARIES} + ${LIBMODULEMD_LIBRARIES} + ${SMARTCOLS_LIBRARIES} +- ${GPGME_VANILLA_LIBRARIES} ++ ${GPGME_LIBRARIES} + ) + + if(ENABLE_RHSM_SUPPORT) diff -Nru libdnf-0.55.2/debian/patches/series libdnf-0.55.2/debian/patches/series --- libdnf-0.55.2/debian/patches/series 2021-04-14 21:26:57.000000000 +0200 +++ libdnf-0.55.2/debian/patches/series 2022-12-10 13:48:46.000000000 +0100 @@ -12,3 +12,4 @@ 0012-data-workaround-for-hardcoded-absolute-path-data-in-.patch 0013-python-tests-fix-locale-issues.patch 0014-Hardening-add-signature-check-with-rpmcliVerifySigna.patch +0020_gpmgme-pkg-config.diff
