commit e31e21fdca994d3e04bdbc7dbcbfd53f4989f735
Author: Jakub Bogusz <[email protected]>
Date: Sun Apr 2 16:06:43 2023 +0200
- updated to 17.31.9
- added gpgme-pkgconfig patch to use pkg-config instead of (removed now)
gpgme-config script
libzypp-gpgme-pkgconfig.patch | 49 +++++++++++++++++++++++++++++++++++++++++++
libzypp.spec | 6 ++++--
2 files changed, 53 insertions(+), 2 deletions(-)
---
diff --git a/libzypp.spec b/libzypp.spec
index bff892b..2d61b3d 100644
--- a/libzypp.spec
+++ b/libzypp.spec
@@ -7,15 +7,16 @@
Summary: Package management library
Summary(pl.UTF-8): Biblioteka do zarządzania pakietami
Name: libzypp
-Version: 17.31.8
+Version: 17.31.9
Release: 1
License: GPL v2+
Group: Libraries
#Source0Download: https://github.com/openSUSE/libzypp/tags
Source0:
https://github.com/openSUSE/libzypp/archive/%{version}/%{name}-%{version}.tar.gz
-# Source0-md5: 018db968d114db936c79655f632f2bef
+# Source0-md5: b21539939f0b885b633914ba00c4e1af
Patch0: %{name}-rpm5.patch
Patch1: %{name}-link.patch
+Patch2: %{name}-gpgme-pkgconfig.patch
URL: https://en.opensuse.org/Portal:Libzypp
BuildRequires: boost-devel
BuildRequires: cmake >= 3.1
@@ -93,6 +94,7 @@ Dokumentacja API biblioteki Zypp.
%patch0 -p1
%endif
%patch1 -p1
+%patch2 -p1
%build
install -d build
diff --git a/libzypp-gpgme-pkgconfig.patch b/libzypp-gpgme-pkgconfig.patch
new file mode 100644
index 0000000..1df0d9e
--- /dev/null
+++ b/libzypp-gpgme-pkgconfig.patch
@@ -0,0 +1,49 @@
+--- libzypp-17.31.9/cmake/modules/FindGpgme.cmake.orig 2023-03-31
18:39:00.000000000 +0200
++++ libzypp-17.31.9/cmake/modules/FindGpgme.cmake 2023-04-02
15:15:24.414928189 +0200
+@@ -213,14 +213,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" )
+
+@@ -232,17 +232,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()
+@@ -256,7 +256,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/libzypp.git/commitdiff/e31e21fdca994d3e04bdbc7dbcbfd53f4989f735
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
