From 850020b1ed8baf2e192e1b31bc253ab2f2fece5a Mon Sep 17 00:00:00 2001 From: Silvan Calarco Date: Sat, 18 May 2024 19:53:21 +0200 Subject: [PATCH] update to 2024.5 rebuilt with build requirements: librpm-devel>=4.19.1.1-2mamba [release 2024.5-1mamba;Thu May 16 2024] --- rpm-ostree-2024.5-fix-libdnf-build.patch | 11 +++++++++ rpm-ostree.spec | 31 ++++++++++++++++++++---- 2 files changed, 37 insertions(+), 5 deletions(-) create mode 100644 rpm-ostree-2024.5-fix-libdnf-build.patch diff --git a/rpm-ostree-2024.5-fix-libdnf-build.patch b/rpm-ostree-2024.5-fix-libdnf-build.patch new file mode 100644 index 0000000..6d08f4f --- /dev/null +++ b/rpm-ostree-2024.5-fix-libdnf-build.patch @@ -0,0 +1,11 @@ +--- rpm-ostree-2024.5/libdnf/CMakeLists.txt.orig 2024-05-17 13:11:57.181772691 +0200 ++++ rpm-ostree-2024.5/libdnf/CMakeLists.txt 2024-05-17 13:12:09.463798680 +0200 +@@ -34,7 +34,7 @@ + option(WITH_ZCHUNK "Build with zchunk support" ON) + option(ENABLE_RHSM_SUPPORT "Build with Red Hat Subscription Manager support?" OFF) + option(ENABLE_SOLV_URPMREORDER "Build with support for URPM-like solution reordering?" OFF) +-option(WITH_TESTS "Enables unit tests" ON) ++option(WITH_TESTS "Enables unit tests" OFF) + + + # build options - debugging diff --git a/rpm-ostree.spec b/rpm-ostree.spec index 5f8ac4a..976373a 100644 --- a/rpm-ostree.spec +++ b/rpm-ostree.spec @@ -1,5 +1,5 @@ Name: rpm-ostree -Version: 2023.8 +Version: 2024.5 Release: 1mamba Summary: Hybrid image/package system with atomic upgrades and package layering Group: System/Management @@ -7,7 +7,8 @@ Vendor: openmamba Distribution: openmamba Packager: Silvan Calarco URL: https://coreos.github.io/rpm-ostree/ -Source: https://github.com/coreos/rpm-ostree.git/v%{version}/rpm-ostree-%{version}.tar.bz2 +Source: https+git://github.com/coreos/rpm-ostree.git/v%{version}/rpm-ostree-%{version}.tar.bz2 +Patch0: rpm-ostree-2024.5-fix-libdnf-build.patch License: GPL, LGPL, Apache License 2.0, MIT ## AUTOBUILDREQ-BEGIN BuildRequires: glibc-devel @@ -31,6 +32,7 @@ BuildRequires: libstdc++6-devel BuildRequires: libsystemd-devel BuildRequires: libz-devel ## AUTOBUILDREQ-END +BuildRequires: librpm-devel >= 4.19.1.1-2mamba Requires: lib%{name} = %{?epoch:%epoch:}%{version}-%{release} %description @@ -58,10 +60,22 @@ This package contains libraries and header files for developing applications tha %prep %setup -q -./autogen.sh +%patch 0 -p1 +NOCONFIGURE=1 ./autogen.sh %build -%configure +%configure \ + --disable-static \ + --enable-experimental-api \ + --enable-gtk-doc \ + --with-curl \ + --with-dracut=yesbutnoconf \ + --with-ed25519-libsodium \ + --with-grub2-mkconfig-path=/usr/bin/grub-mkconfig \ + --with-mkinitcpio \ + --with-modern-grub \ + --with-openssl + %make %install @@ -96,6 +110,7 @@ This package contains libraries and header files for developing applications tha %{_unitdir}/rpm-ostreed-automatic.service %{_unitdir}/rpm-ostreed-automatic.timer %{_unitdir}/rpm-ostreed.service +%{_unitdir}/rpm-ostree-fix-shadow-mode.service %{_datadir}/dbus-1/interfaces/org.projectatomic.rpmostree1.xml %{_datadir}/dbus-1/system-services/org.projectatomic.rpmostree1.service %{_datadir}/dbus-1/system.d/org.projectatomic.rpmostree1.conf @@ -109,7 +124,7 @@ This package contains libraries and header files for developing applications tha %defattr(-,root,root) %{_libdir}/librpmostree-1.so.* %{_libdir}/girepository-1.0/RpmOstree-1.0.typelib -%{_libdir}/rpm-ostree/rpm-ostree-0-integration.conf +%{_libdir}/rpm-ostree/rpm-ostree-0-integration*.conf %dir %{_libexecdir}/libostree %dir %{_libexecdir}/libostree/ext %{_libexecdir}/libostree/ext/ostree-* @@ -123,9 +138,15 @@ This package contains libraries and header files for developing applications tha %{_libdir}/librpmostree-1.so %{_datadir}/gir-1.0/RpmOstree-1.0.gir %{_libdir}/pkgconfig/rpm-ostree-1.pc +%{_datadir}/gtk-doc/html/rpmostree +%{_datadir}/gtk-doc/html/rpmostree/* %doc README.md %changelog +* Thu May 16 2024 Silvan Calarco 2024.5-1mamba +- update to 2024.5 +- rebuilt with build requirements: librpm-devel>=4.19.1.1-2mamba + * Sun Oct 01 2023 Automatic Build System 2023.8-1mamba - automatic version update by autodist