- updated to 0.70.0

- added gpgme-pkgconfig patch to use pkg-config instead of (removed now) gpgme-config script

diff --git a/libdnf-gpgme-pkgconfig.patch b/libdnf-gpgme-pkgconfig.patch
new file mode 100644 (file)
index 0000000..bb4660f
--- /dev/null
+++ b/libdnf-gpgme-pkgconfig.patch
@@ -0,0 +1,49 @@
+--- 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}" )

diff --git a/libdnf.spec b/libdnf.spec
index 7afee26ca93acddb6bbbc49be60ced0af524055b..60a014754de86c51cdeb9f98d8af9f7e68306d12 100644 (file)
--- a/libdnf.spec
+++ b/libdnf.spec
@@ -8,14 +8,15 @@
 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.67.0
+Version:       0.70.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: 85c11f8e69c68b62a605300602137663
-Patch0:                %{name}-rpm5.patch
+# Source0-md5: e1abd04a23ca2fb35f0edda3a2e5556a
+Patch0:                %{name}-gpgme-pkgconfig.patch
+Patch1:                %{name}-rpm5.patch
 URL:           https://github.com/rpm-software-management/libdnf
 BuildRequires: check-devel
 BuildRequires: cmake >= 2.8.5
@@ -34,12 +35,14 @@ BuildRequires:      libsolv-devel >= 0.7.17
 BuildRequires: openssl-devel
 BuildRequires: pkgconfig
 BuildRequires: rpm-build >= 4.6
-%{!?with_rpm5:BuildRequires:   rpm-devel >= 1:4.11.0}
+%{!?with_rpm5:BuildRequires:   rpm-devel >= 1:4.15.0}
 %{?with_rpm5:BuildRequires:    rpm-devel >= 5}
 BuildRequires: rpm-pythonprov
 BuildRequires: rpmbuild(macros) >= 1.714
 BuildRequires: sphinx-pdg
 BuildRequires: sqlite3-devel >= 3
+BuildRequires: swig
+BuildRequires: swig-python
 BuildRequires: valgrind
 BuildRequires: zchunk-devel >= 0.9.11
 Requires:      glib2 >= 1:2.46.0
@@ -66,7 +69,7 @@ Requires:     %{name} = %{version}-%{release}
 Requires:      glib2-devel >= 1:2.46.0
 Requires:      librepo-devel >= 1.13.0
 Requires:      libsolv-devel >= 0.7.17
-%{!?with_rpm5:Requires:        rpm-devel >= 1:4.11.0}
+%{!?with_rpm5:Requires:        rpm-devel >= 1:4.15.0}
 %{?with_rpm5:Requires: rpm-devel >= 5}
 
 %description devel
@@ -174,7 +177,8 @@ Wiązania Pythona 3.x do biblioteki libdnf.
 
 %prep
 %setup -q
-%{?with_rpm5:%patch0 -p1}
+%patch0 -p1
+%{?with_rpm5:%patch1 -p1}
 
 %build
 export CFLAGS="%{rpmcflags} -D_GNU_SOURCE}"