[packages/rpm-ostree] - updated to 2023.4 - added patch for internal libdnf to use pkg-config for gpgme (gpgme-config has
qboosh
qboosh at pld-linux.org
Sat May 20 20:36:14 CEST 2023
commit b4c951f37032b054dc81d4032fb5eaa132754c90
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date: Sat May 20 20:38:44 2023 +0200
- updated to 2023.4
- added patch for internal libdnf to use pkg-config for gpgme (gpgme-config has been dropped)
libdnf-gpgme-pkgconfig.patch | 49 ++++++++++++++++++++++++++++++++++++++++++++
rpm-ostree.spec | 19 +++++++++--------
2 files changed, 59 insertions(+), 9 deletions(-)
---
diff --git a/rpm-ostree.spec b/rpm-ostree.spec
index 07f4b86..d18b720 100644
--- a/rpm-ostree.spec
+++ b/rpm-ostree.spec
@@ -5,13 +5,14 @@
Summary: Hybrid package/OSTree system
Summary(pl.UTF-8): Hybrydowy system pakietów/OSTree
Name: rpm-ostree
-Version: 2022.10
+Version: 2023.4
Release: 1
License: GPL v2+, LGPL v2+, Apache v2.0 or MIT
Group: Applications/System
#Source0Download: https://github.com/coreos/rpm-ostree/releases
Source0: https://github.com/coreos/rpm-ostree/releases/download/v%{version}/%{name}-%{version}.tar.xz
-# Source0-md5: 41204ce8309f2d1b753e6e161b1bab80
+# Source0-md5: 13427adb6d6cfbe70c5d1849ca0e28f5
+Patch0: libdnf-gpgme-pkgconfig.patch
URL: https://github.com/coreos/rpm-ostree
BuildRequires: autoconf >= 2.63
BuildRequires: automake >= 1:1.11
@@ -26,7 +27,7 @@ BuildRequires: libstdc++-devel >= 6:4.7
BuildRequires: libtool >= 2:2.2.4
BuildRequires: libxslt-progs
BuildRequires: openssl-devel
-BuildRequires: ostree-devel >= 2021.2
+BuildRequires: ostree-devel >= 2022.7
BuildRequires: pkgconfig
BuildRequires: polkit-devel
BuildRequires: rpm-build >= 4.6
@@ -34,7 +35,7 @@ BuildRequires: rpm-devel >= 1:4.17
BuildRequires: rust
BuildRequires: tar >= 1:1.22
BuildRequires: xz
-BuildRequires: zchunk-devel
+BuildRequires: zchunk-devel >= 0.9.11
%if %{without system_libdnf}
# is system libdnf possible?
BuildRequires: cmake >= 2.8.5
@@ -42,7 +43,8 @@ BuildRequires: gpgme-devel
BuildRequires: json-c-devel
BuildRequires: libmodulemd-devel >= 2.11.2
BuildRequires: librepo-devel >= 1.13.0
-BuildRequires: libsolv-devel
+BuildRequires: libsmartcols-devel
+BuildRequires: libsolv-devel >= 0.7.21
BuildRequires: sqlite3-devel >= 3
BuildRequires: zlib-devel
%endif
@@ -80,7 +82,7 @@ Summary: Hybrid package/OSTree system library
Summary(pl.UTF-8): Biblioteka hybrydowego systemu pakietów/OSTree
Group: Libraries
Requires: glib2 >= 1:2.50.0
-Requires: ostree >= 2021.2
+Requires: ostree >= 2022.7
%description libs
Hybrid package/OSTree system library.
@@ -94,7 +96,7 @@ Summary(pl.UTF-8): Pliki nagłówkowe biblioteki rpm-ostree
Group: Development/Libraries
Requires: %{name}-libs = %{version}-%{release}
Requires: glib2-devel >= 1:2.50.0
-Requires: ostree-devel >= 2021.2
+Requires: ostree-devel >= 2022.7
%description devel
Header files for rpm-ostree library.
@@ -116,13 +118,12 @@ Dokumentacja API biblioteki rpm-ostree.
%prep
%setup -q
+%patch0 -p1 -d libdnf
# see autogen.sh
%{__sed} -e 's,$(libglnx_srcpath),'$(pwd)/libglnx,g < libglnx/Makefile-libglnx.am >libglnx/Makefile-libglnx.am.inc
ln -sf ../libglnx/libglnx.m4 buildutil/libglnx.m4
-%{__sed} -i -e 's/4\.17/4.16/' configure.ac
-
%build
%{__gtkdocize}
%{__libtoolize}
diff --git a/libdnf-gpgme-pkgconfig.patch b/libdnf-gpgme-pkgconfig.patch
new file mode 100644
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}" )
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/rpm-ostree.git/commitdiff/b4c951f37032b054dc81d4032fb5eaa132754c90
More information about the pld-cvs-commit
mailing list