[packages/libdnf] up to 0.71.0

[atler]

commit f413e5281bd9d650289e49564786743de22bf75f
Author: Jan Palus <atler at pld-linux.org>
Date:   Thu Sep 7 01:48:33 2023 +0200

    up to 0.71.0

 libdnf-gpgme-pkgconfig.patch | 49 --------------------------------------------
 libdnf.spec                  | 16 +++++++--------
 2 files changed, 7 insertions(+), 58 deletions(-)
---
diff --git a/libdnf.spec b/libdnf.spec
index 18eb6b5..3d73c49 100644
--- a/libdnf.spec
+++ b/libdnf.spec
@@ -8,15 +8,14 @@
 Summary:	Library providing simplified C and Python API to libsolv
 Summary(pl.UTF-8):	Biblioteka zapewniająca uproszczone API C i Pythona do libsolv
 Name:		libdnf
-Version:	0.70.2
+Version:	0.71.0
 Release:	1
 License:	LGPL v2.1+
 Group:		Libraries
 #Source0Download: https://github.com/rpm-software-management/libdnf/releases
 Source0:	https://github.com/rpm-software-management/libdnf/archive/%{version}/%{name}-%{version}.tar.gz
-# Source0-md5:	5ac93fde7aab7625607635db0a2edf27
-Patch0:		%{name}-gpgme-pkgconfig.patch
-Patch1:		%{name}-rpm5.patch
+# Source0-md5:	98cab29196d2016e91070c1861486de3
+Patch0:		%{name}-rpm5.patch
 URL:		https://github.com/rpm-software-management/libdnf
 BuildRequires:	check-devel
 BuildRequires:	cmake >= 2.8.5
@@ -24,11 +23,10 @@ BuildRequires:	cppunit-devel
 BuildRequires:	gettext-tools
 BuildRequires:	glib2-devel >= 1:2.46.0
 BuildRequires:	gobject-introspection-devel
-BuildRequires:	gpgme-devel
 BuildRequires:	gtk-doc
 BuildRequires:	json-c-devel
 BuildRequires:	libmodulemd-devel >= 2.12.0
-BuildRequires:	librepo-devel >= 1.13.0
+BuildRequires:	librepo-devel >= 1.15.0
 %{?with_rhsm:BuildRequires:	librhsm-devel >= 0.0.3}
 BuildRequires:	libsmartcols-devel
 BuildRequires:	libsolv-devel >= 0.7.17
@@ -51,6 +49,7 @@ BuildRequires:	swig
 BuildRequires:	swig-python
 BuildRequires:	zchunk-devel >= 0.9.11
 Requires:	glib2 >= 1:2.46.0
+Requires:	librepo >= 1.15.0
 Requires:	libsolv >= 0.7.17
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -72,7 +71,7 @@ Summary(pl.UTF-8):	Pliki nagłówkowe biblioteki libdnf
 Group:		Development/Libraries
 Requires:	%{name} = %{version}-%{release}
 Requires:	glib2-devel >= 1:2.46.0
-Requires:	librepo-devel >= 1.13.0
+Requires:	librepo-devel >= 1.15.0
 Requires:	libsolv-devel >= 0.7.17
 %{!?with_rpm5:Requires:	rpm-devel >= 1:4.15.0}
 %{?with_rpm5:Requires:	rpm-devel >= 5}
@@ -182,8 +181,7 @@ Wiązania Pythona 3.x do biblioteki libdnf.
 
 %prep
 %setup -q
-%patch0 -p1
-%{?with_rpm5:%patch1 -p1}
+%{?with_rpm5:%patch0 -p1}
 
 %build
 export CFLAGS="%{rpmcflags} -D_GNU_SOURCE}"
diff --git a/libdnf-gpgme-pkgconfig.patch b/libdnf-gpgme-pkgconfig.patch
deleted file mode 100644
index bb4660f..0000000
--- a/libdnf-gpgme-pkgconfig.patch
+++ /dev/null
@@ -1,49 +0,0 @@
---- libdnf-0.70.0/cmake/modules/FindGpgme.cmake.orig	2023-04-02 08:32:33.289207745 +0200
-+++ libdnf-0.70.0/cmake/modules/FindGpgme.cmake	2023-04-02 08:32:38.262514136 +0200
-@@ -199,14 +199,14 @@ else() # not WIN32
-     set( GPGME_PTHREAD_FOUND false )
-     set( GPGME_PTH_FOUND     false )
- 
--    find_program( _GPGMECONFIG_EXECUTABLE NAMES gpgme-config )
-+    find_program( _GPGMECONFIG_EXECUTABLE NAMES pkg-config )
- 
-     # if gpgme-config has been found
-     if ( _GPGMECONFIG_EXECUTABLE )
- 
-       message( STATUS "Found gpgme-config at ${_GPGMECONFIG_EXECUTABLE}" )
- 
--      exec_program( ${_GPGMECONFIG_EXECUTABLE} ARGS --version OUTPUT_VARIABLE GPGME_VERSION )
-+      exec_program( ${_GPGMECONFIG_EXECUTABLE} ARGS --modversion gpgme OUTPUT_VARIABLE GPGME_VERSION )
- 
- #      set( _GPGME_MIN_VERSION "1.1.7" )
- #      macro_ensure_version( ${_GPGME_MIN_VERSION} ${GPGME_VERSION} _GPGME_INSTALLED_VERSION_OK )
-@@ -219,17 +219,17 @@ else() # not WIN32
- 
-         message( STATUS "Found gpgme v${GPGME_VERSION}, checking for flavours..." )
- 
--        exec_program( ${_GPGMECONFIG_EXECUTABLE} ARGS                  --libs OUTPUT_VARIABLE _gpgme_config_vanilla_libs RETURN_VALUE _ret )
-+        exec_program( ${_GPGMECONFIG_EXECUTABLE} ARGS                  --libs gpgme OUTPUT_VARIABLE _gpgme_config_vanilla_libs RETURN_VALUE _ret )
- 	if ( _ret )
- 	  set( _gpgme_config_vanilla_libs )
- 	endif()
- 
--        exec_program( ${_GPGMECONFIG_EXECUTABLE} ARGS --thread=pthread --libs OUTPUT_VARIABLE _gpgme_config_pthread_libs RETURN_VALUE _ret )
-+        exec_program( ${_GPGMECONFIG_EXECUTABLE} ARGS --libs gpgme OUTPUT_VARIABLE _gpgme_config_pthread_libs RETURN_VALUE _ret )
- 	if ( _ret )
- 	  set( _gpgme_config_pthread_libs )
- 	endif()
- 
--        exec_program( ${_GPGMECONFIG_EXECUTABLE} ARGS --thread=pth     --libs OUTPUT_VARIABLE _gpgme_config_pth_libs     RETURN_VALUE _ret )
-+        exec_program( ${_GPGMECONFIG_EXECUTABLE} ARGS --libs gpgme OUTPUT_VARIABLE _gpgme_config_pth_libs     RETURN_VALUE _ret )
- 	if ( _ret )
- 	  set( _gpgme_config_pth_libs )
- 	endif()
-@@ -243,7 +243,7 @@ else() # not WIN32
- 
-         if ( _gpgme_config_vanilla_libs OR _gpgme_config_pthread_libs OR _gpgme_config_pth_libs )
- 
--          exec_program( ${_GPGMECONFIG_EXECUTABLE} ARGS --cflags OUTPUT_VARIABLE _GPGME_CFLAGS )
-+          exec_program( ${_GPGMECONFIG_EXECUTABLE} ARGS --cflags gpgme OUTPUT_VARIABLE _GPGME_CFLAGS )
- 
-           if ( _GPGME_CFLAGS )
-             string( REGEX REPLACE "(\r?\n)+$" " " _GPGME_CFLAGS  "${_GPGME_CFLAGS}" )
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/libdnf.git/commitdiff/f413e5281bd9d650289e49564786743de22bf75f