librepo: update 1.19.0 -> 1.20.0

Drop 0004-Set-gpgme-variables-with-pkg-config-not-with-cmake-m.patch
as upstream added pkg-config support at last.

(From OE-Core rev: 45e7bf27e746b12a9de1435bdb2a77196d725373)

Signed-off-by: Alexander Kanavin <alex@linutronix.de>
Signed-off-by: Mathieu Dubois-Briand <mathieu.dubois-briand@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

3 files changed, 3 insertions, 30 deletions

diff --git a/meta/recipes-devtools/librepo/librepo/0002-Do-not-try-to-obtain-PYTHON_INSTALL_DIR-by-running-p.patch b/meta/recipes-devtools/librepo/librepo/0002-Do-not-try-to-obtain-PYTHON_INSTALL_DIR-by-running-p.patch
index 1425041dad..ac5373f2e7 100644
--- a/meta/recipes-devtools/librepo/librepo/0002-Do-not-try-to-obtain-PYTHON_INSTALL_DIR-by-running-p.patch
+++ b/meta/recipes-devtools/librepo/librepo/0002-Do-not-try-to-obtain-PYTHON_INSTALL_DIR-by-running-p.patch
@@ -1,4 +1,4 @@
-From e86f562d3cc6cea3e19c4bab77ffa2902f634615 Mon Sep 17 00:00:00 2001
+From 0062f49b62ce014dc81485c6ae101d49399d22cf Mon Sep 17 00:00:00 2001
 From: Alexander Kanavin <alex.kanavin@gmail.com>
 Date: Fri, 30 Dec 2016 18:05:36 +0200
 Subject: [PATCH] Do not try to obtain PYTHON_INSTALL_DIR by running python.
diff --git a/meta/recipes-devtools/librepo/librepo/0004-Set-gpgme-variables-with-pkg-config-not-with-cmake-m.patch b/meta/recipes-devtools/librepo/librepo/0004-Set-gpgme-variables-with-pkg-config-not-with-cmake-m.patch
deleted file mode 100644
index edee8698d8..0000000000
--- a/meta/recipes-devtools/librepo/librepo/0004-Set-gpgme-variables-with-pkg-config-not-with-cmake-m.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 93d3c49dbdf348eec9900d53a152457f6d1cb816 Mon Sep 17 00:00:00 2001
-From: Alexander Kanavin <alex.kanavin@gmail.com>
-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 <alex.kanavin@gmail.com>
----
- CMakeLists.txt | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 68ce953..04f83b9 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -39,7 +39,8 @@ PKG_CHECK_MODULES(LIBXML2 libxml-2.0 REQUIRED)
- FIND_PACKAGE(CURL 7.52.0 REQUIRED)
- 
- IF (USE_GPGME)
--    FIND_PACKAGE(Gpgme REQUIRED)
-+    PKG_CHECK_MODULES(GPGME gpgme REQUIRED)
-+    set(GPGME_VANILLA_LIBRARIES ${GPGME_LIBRARIES})
-     IF (ENABLE_SELINUX)
-         PKG_CHECK_MODULES(SELINUX REQUIRED libselinux)
-     ENDIF(ENABLE_SELINUX)
diff --git a/meta/recipes-devtools/librepo/librepo_1.19.0.bb b/meta/recipes-devtools/librepo/librepo_1.20.0.bb
index ba66c8ef68..6557dda43a 100644
--- a/meta/recipes-devtools/librepo/librepo_1.19.0.bb
+++ b/meta/recipes-devtools/librepo/librepo_1.20.0.bb
@@ -5,12 +5,11 @@ DESCRIPTION = "${SUMMARY}"
 LICENSE = "LGPL-2.1-only"
 LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c"
 
-SRC_URI = "git://github.com/rpm-software-management/librepo.git;branch=master;protocol=https \
+SRC_URI = "git://github.com/rpm-software-management/librepo.git;branch=master;protocol=https;tag=${PV} \
            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 = "7955987e33ba98dddb3fc2c63bb6dc892e3505fa"
+SRCREV = "363cb70c6548be900832bc9b18ced3e7569da15a"
 
 DEPENDS = "curl glib-2.0 openssl attr gpgme libxml2"