librepo: upgrade 1.15.2 -> 1.16.0
PATCH 1/1 librepo: upgrade 1.15.2 -> 1.16.0
From: Wang Mingyu <[email protected]>
Changelog:
Implement OpenPGP using librpm API
0004-Set-gpgme-variables-with-pkg-config-not-with-cmake-m.patch removed since it's included in 1.16.0
---
...les-with-pkg-config-not-with-cmake-m.patch | 27 -------------------
.../{librepo_1.15.2.bb => librepo_1.16.0.bb} | 3 +--
2 files changed, 1 insertion(+), 29 deletions(-)
delete mode 100644 meta/recipes-devtools/librepo/librepo/0004-Set-gpgme-variables-with-pkg-config-not-with-cmake-m.patch
rename meta/recipes-devtools/librepo/{librepo_1.15.2.bb => librepo_1.16.0.bb} (86%)meta/recipes-devtools/librepo/librepo/0004-Set-gpgme-variables-with-pkg-config-not-with-cmake-m.patch deleted +0 -27
@@ -1,27 +0,0 @@ -From 25113b34bc1aae377d7bf447e69528783e2c177e Mon Sep 17 00:00:00 2001 -From: Alexander Kanavin <[email protected]> -Date: Fri, 30 Dec 2016 18:23:27 +0200 -Subject: [PATCH] Set gpgme variables with pkg-config, not with cmake module - (which doesn't work properly) - -Upstream-Status: Inappropriate [gpgme upstream does not have pkg-config support and is not interested in it] -Signed-off-by: Alexander Kanavin <[email protected]> - ---- - CMakeLists.txt | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index a45d5c4..40249e6 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -32,7 +32,8 @@ PKG_CHECK_MODULES(GLIB2 glib-2.0 REQUIRED) - PKG_SEARCH_MODULE(LIBCRYPTO REQUIRED libcrypto openssl) - PKG_CHECK_MODULES(LIBXML2 libxml-2.0 REQUIRED) - FIND_PACKAGE(CURL 7.52.0 REQUIRED) --FIND_PACKAGE(Gpgme REQUIRED) -+PKG_CHECK_MODULES(GPGME gpgme REQUIRED) -+set(GPGME_VANILLA_LIBRARIES ${GPGME_LIBRARIES}) - - - IF (WITH_ZCHUNK)
meta/recipes-devtools/librepo/librepo_1.16.0.bb renamed from meta/recipes-devtools/librepo/librepo_1.15.2.bb +1 -2
@@ -7,10 +7,9 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c" SRC_URI = "git://github.com/rpm-software-management/librepo.git;branch=master;protocol=https \ file://0002-Do-not-try-to-obtain-PYTHON_INSTALL_DIR-by-running-p.patch \ - file://0004-Set-gpgme-variables-with-pkg-config-not-with-cmake-m.patch \ " -SRCREV = "1a0a5fd2b040d00872118b32d09d1f79730897a2" +SRCREV = "7c9af219abd49f8961542b7622fc82cfdaa572e3" S = "${WORKDIR}/git"
Signature · 1 line
2.34.1
meta/recipes-devtools/librepo/librepo/0004-Set-gpgme-variables-with-pkg-config-not-with-cmake-m.patch line 8
Quoted 11 lines · wangmy
0004-Set-gpgme-variables-with-pkg-config-not-with-cmake-m.patch removed since it's included in 1.16.0
meta/recipes-devtools/librepo/librepo/0004-Set-gpgme-variables-with-pkg-config-not-with-cmake-m.patch deleted +0
-8-From 25113b34bc1aae377d7bf447e69528783e2c177e Mon Sep 17 00:00:00 2001 -From: Alexander Kanavin <[email protected]> -Date: Fri, 30 Dec 2016 18:23:27 +0200 -Subject: [PATCH] Set gpgme variables with pkg-config, not with cmake module - (which doesn't work properly) - -Upstream-Status: Inappropriate [gpgme upstream does not have pkg-config support and is not interested in it] -Signed-off-by: Alexander Kanavin <[email protected]>
It is most definitely not included and thus cannot be removed, as seen here:
https://github.com/rpm-software-management/librepo/blob/master/CMakeLists.txt#L37C1-L41C18
IF (USE_GPGME)
FIND_PACKAGE(Gpgme REQUIRED)
ELSE (USE_GPGME)
PKG_CHECK_MODULES(RPM REQUIRED rpm>=4.18.0)
ENDIF (USE_GPGME)
We can *probably* remove the patch, but then gpgme dependency needs to be removed as well from the recipe, and the reasoning in commit message needs to explain that.
Alex