[packages/rpm-ostree] - updated to 2026.3
qboosh
qboosh at pld-linux.org
Tue Sep 22 06:13:49 CEST 2026
commit c0cbb091d6bfb4d644a9ef7a7881a9e665c8dc4e
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date: Tue Sep 22 06:14:02 2026 +0200
- updated to 2026.3
libdnf-gpgme-pkgconfig.patch | 49 --------------------------------------------
rpm-ostree-system-zlib.patch | 16 ---------------
rpm-ostree.spec | 16 ++++++---------
3 files changed, 6 insertions(+), 75 deletions(-)
---
diff --git a/rpm-ostree.spec b/rpm-ostree.spec
index e51b85f..b798dad 100644
--- a/rpm-ostree.spec
+++ b/rpm-ostree.spec
@@ -6,16 +6,14 @@
Summary: Hybrid package/OSTree system
Summary(pl.UTF-8): Hybrydowy system pakietów/OSTree
Name: rpm-ostree
-Version: 2025.7
-Release: 3
+Version: 2026.3
+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: 494ebcfb09a0c71a529c42049e347ced
-Patch0: libdnf-gpgme-pkgconfig.patch
+# Source0-md5: 7c4634c9a14a1efa534a1131439186c1
Patch1: %{name}-types.patch
-Patch2: %{name}-system-zlib.patch
URL: https://github.com/coreos/rpm-ostree
BuildRequires: autoconf >= 2.63
BuildRequires: automake >= 1:1.11
@@ -121,9 +119,7 @@ Dokumentacja API biblioteki rpm-ostree.
%prep
%setup -q
-%patch -P 0 -p1 -d libdnf
%patch -P 1 -p1
-%patch -P 2 -p1
# see autogen.sh
%{__sed} -e 's,$(libglnx_srcpath),'$(pwd)/libglnx,g < libglnx/Makefile-libglnx.am >libglnx/Makefile-libglnx.am.inc
@@ -204,13 +200,13 @@ rm -rf $RPM_BUILD_ROOT
%files libs
%defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/librpmostree-1.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/librpmostree-1.so.1
+%{_libdir}/librpmostree-1.so.*.*.*
+%ghost %{_libdir}/librpmostree-1.so.1
%{_libdir}/girepository-1.0/RpmOstree-1.0.typelib
%files devel
%defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/librpmostree-1.so
+%{_libdir}/librpmostree-1.so
%{_includedir}/rpm-ostree-1
%{_datadir}/gir-1.0/RpmOstree-1.0.gir
%{_pkgconfigdir}/rpm-ostree-1.pc
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}" )
diff --git a/rpm-ostree-system-zlib.patch b/rpm-ostree-system-zlib.patch
deleted file mode 100644
index 95c82d0..0000000
--- a/rpm-ostree-system-zlib.patch
+++ /dev/null
@@ -1,16 +0,0 @@
---- rpm-ostree-2025.7/vendor/libz-sys/build.rs.orig 2025-03-28 17:01:17.000000000 +0100
-+++ rpm-ostree-2025.7/vendor/libz-sys/build.rs 2025-05-04 19:29:50.789707114 +0200
-@@ -85,7 +85,6 @@ fn main() {
- if target.contains("msvc")
- || target.contains("pc-windows-gnu")
- || want_static
-- || (cross_compiling && !target.contains("-apple-"))
- {
- return build_zlib(&mut cfg, &target);
- }
---- rpm-ostree-2025.7/vendor/libz-sys/.cargo-checksum.json.orig 2025-03-28 17:01:17.000000000 +0100
-+++ rpm-ostree-2025.7/vendor/libz-sys/.cargo-checksum.json 2025-05-04 20:22:05.731618481 +0200
-@@ -1 +1 @@
--{"files":{"Cargo.toml":"9affea24b897d2a1fe6b091c89429cd78821d8a580f0ef5da85224172f145c29","LICENSE-APACHE":"a60eea817514531668d7e00765731449fe14d059d3249e0bc93b36de45f759f2","LICENSE-MIT":"34c467b6945a22696d060b8fdd2379d464acb3408d4c599d3dc5fe4fa1b4c84f","README-zng.md":"438ab65416835d72c7dd168338af3db6f1a3d8ccee455af4e1d75438a781eb71","README.md":"3607fa398947cdc3cfba6cc985fd8191fcbf2699d89d3a36e3500eb27a0ca17e","build.rs":"98c443fc279a2d2c692278c1ae7f511641cefe41f9499f8cd85886b5cb15c237","src/lib.rs":"8f9f42e8c80e134fa6f5724c677a341689e2e16cbe93a15495a1b4d8bfa90c49","src/smoke.c":"10607c81b73811bfcb9718767312bf97ba2ccf7048ea2f18a2085aa06ad7f91b","zng/cc.rs":"97a158aaa45c8ef8902fcdececc56271a1985b9fca05c70bbe801864847c574e","zng/cmake.rs":"0af9a27eace82c80058bb8d393fbb38a5d1b9437215fd831bfe360e2e163c0b1"},"package":"df9b68e50e6e0b26f672573834882eb57759f6db9b3be2ea3c35c91188bb4eaa"}
-\ No newline at end of file
-+{"files":{"Cargo.toml":"9affea24b897d2a1fe6b091c89429cd78821d8a580f0ef5da85224172f145c29","LICENSE-APACHE":"a60eea817514531668d7e00765731449fe14d059d3249e0bc93b36de45f759f2","LICENSE-MIT":"34c467b6945a22696d060b8fdd2379d464acb3408d4c599d3dc5fe4fa1b4c84f","README-zng.md":"438ab65416835d72c7dd168338af3db6f1a3d8ccee455af4e1d75438a781eb71","README.md":"3607fa398947cdc3cfba6cc985fd8191fcbf2699d89d3a36e3500eb27a0ca17e","build.rs":"97fcb8cf869f3e907cd6977de5b068b80fffe65a80ef65143533e8dcdc330f99","src/lib.rs":"8f9f42e8c80e134fa6f5724c677a341689e2e16cbe93a15495a1b4d8bfa90c49","src/smoke.c":"10607c81b73811bfcb9718767312bf97ba2ccf7048ea2f18a2085aa06ad7f91b","zng/cc.rs":"97a158aaa45c8ef8902fcdececc56271a1985b9fca05c70bbe801864847c574e","zng/cmake.rs":"0af9a27eace82c80058bb8d393fbb38a5d1b9437215fd831bfe360e2e163c0b1"},"package":"df9b68e50e6e0b26f672573834882eb57759f6db9b3be2ea3c35c91188bb4eaa"}
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/rpm-ostree.git/commitdiff/c0cbb091d6bfb4d644a9ef7a7881a9e665c8dc4e
More information about the pld-cvs-commit
mailing list