- updated to 1.15.1

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

diff --git a/librepo-gpgme-pkgconfig.patch b/librepo-gpgme-pkgconfig.patch
new file mode 100644 (file)
index 0000000..7089210
--- /dev/null
+++ b/librepo-gpgme-pkgconfig.patch
@@ -0,0 +1,49 @@
+--- librepo-1.15.1/cmake/Modules/FindGpgme.cmake.orig  2023-04-02 08:32:33.289207745 +0200
++++ librepo-1.15.1/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/librepo.spec b/librepo.spec
index 4bb124519d4e808b6bd10c7fca8c809489f8422f..5fe6ba29444ed0baf1b76552e664772c30100ca7 100644 (file)
--- a/librepo.spec
+++ b/librepo.spec
@@ -6,21 +6,22 @@
 Summary:       Library for downloading Linux repository metadata and packages
 Summary(pl.UTF-8):     Biblioteka do pobierania metadanych repozytoriów oraz pakietów dla Linuksa
 Name:          librepo
-Version:       1.14.3
+Version:       1.15.1
 Release:       1
 License:       GPL v2+
 Group:         Libraries
 #Source0Download: https://github.com/rpm-software-management/librepo/releases
 Source0:       https://github.com/rpm-software-management/librepo/archive/%{version}/%{name}-%{version}.tar.gz
-# Source0-md5: dab38c9250245fcaf39fa34c46d552f3
+# Source0-md5: 92b0b3f90efbc2818c3b50f9972d2808
 Patch0:                %{name}-link.patch
+Patch1:                %{name}-gpgme-pkgconfig.patch
 Patch2:                sphinx_executable.patch
 URL:           http://rpm-software-management.github.io/librepo/
 BuildRequires: check-devel
 BuildRequires: cmake >= 2.8.5
 BuildRequires: curl-devel >= 7.52
 %{?with_apidocs:BuildRequires: doxygen}
-BuildRequires: glib2-devel >= 2.0
+BuildRequires: glib2-devel >= 1:2.28
 BuildRequires: gpgme-devel
 BuildRequires: libxml2-devel >= 2.0
 BuildRequires: openssl-devel
@@ -35,6 +36,7 @@ BuildRequires:        tar >= 1:1.22
 BuildRequires: zchunk-devel >= 0.9.11
 BuildRequires: xz
 Requires:      curl-libs >= 7.52
+Requires:      glib2 >= 1:2.28
 Requires:      zchunk-libs >= 0.9.11
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -52,7 +54,7 @@ Summary(pl.UTF-8):    Pliki nagłówkowe biblioteki librepo
 Group:         Development/Libraries
 Requires:      %{name} = %{version}-%{release}
 Requires:      curl-devel >= 7.52
-Requires:      glib2-devel >= 2.0
+Requires:      glib2-devel >= 1:2.28
 Requires:      gpgme-devel
 Requires:      libxml2-devel >= 2.0
 Requires:      openssl-devel
@@ -103,6 +105,7 @@ Dokumentacja API do wiązań Pythona do librepo.
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
 %patch2 -p1
 
 %build