From 282b4204f4b63e1b43ead349a3387fbebda3e234 Mon Sep 17 00:00:00 2001 From: imagebuilder-bot Date: Wed, 27 May 2026 10:34:06 +0000 Subject: [PATCH] Update to 183 Resolves: RHEL-168682 --- .gitignore | 1 + osbuild.spec | 46 +++++++++++++++++++++++++++++++--------------- sources | 2 +- 3 files changed, 33 insertions(+), 16 deletions(-) diff --git a/.gitignore b/.gitignore index 8868400..f5eba1f 100644 --- a/.gitignore +++ b/.gitignore @@ -138,3 +138,4 @@ /osbuild-initrd-0.1.tar.gz /osbuild-173.tar.gz /osbuild-174.tar.gz +/osbuild-183.tar.gz diff --git a/osbuild.spec b/osbuild.spec index d7c6e2e..7fb1201 100644 --- a/osbuild.spec +++ b/osbuild.spec @@ -1,7 +1,7 @@ %global forgeurl https://github.com/osbuild/osbuild %global selinuxtype targeted -Version: 174 +Version: 183 %global osbuild_initrd_version 0.1 %forgemeta @@ -136,8 +136,8 @@ Osbuild initrd used for in-vm support. %package selinux Summary: SELinux policies Requires: %{name} = %{version}-%{release} -Requires: selinux-policy-%{selinuxtype} -Requires(post): selinux-policy-%{selinuxtype} +Requires: selinux-policy-%{selinuxtype} >= %{_selinux_policy_version} +Requires(post): selinux-policy-%{selinuxtype} >= %{_selinux_policy_version} BuildRequires: selinux-policy-devel %{?selinux_requires} @@ -148,9 +148,9 @@ containers it uses to build OS artifacts. %package container-selinux Summary: SELinux container policies -Requires: selinux-policy-%{selinuxtype} +Requires: selinux-policy-%{selinuxtype} >= %{_selinux_policy_version} Requires: container-selinux -Requires(post): selinux-policy-%{selinuxtype} +Requires(post): selinux-policy-%{selinuxtype} >= %{_selinux_policy_version} Requires(post): container-selinux BuildRequires: selinux-policy-devel BuildRequires: selinux-policy-devel @@ -181,11 +181,8 @@ manifests and osbuild. Summary: Dependency solving support for DNF Requires: %{name} = %{version}-%{release} -# RHEL 11 and Fedora 41 and later use libdnf5, RHEL < 11 and Fedora < 41 use dnf -# On Fedora 41 however, we force dnf4 (and depend on python3-dnf) until dnf5 issues are resolved. -# See https://github.com/rpm-software-management/dnf5/issues/1748 -# and https://issues.redhat.com/browse/COMPOSER-2361 -%if 0%{?rhel} >= 11 +# Default to using DNF5 solver for RHEL 11 and Fedora 45 and later +%if 0%{?rhel} >= 11 || 0%{?fedora} >= 45 Requires: python3-libdnf5 >= 5.2.1 %else Requires: python3-dnf @@ -208,6 +205,17 @@ Provides: osbuild-dnf-json-api = 8 %description depsolve-dnf Contains depsolving capabilities for package managers. +%if ! (0%{?rhel} && "%{_arch}" == "ppc64le") +%package virt-deps +Summary: Dependencies required for running osbuild pipelines in a VM. +Requires: %{name} = %{version}-%{release} +Requires: qemu-kvm +Requires: virtiofsd + +%description virt-deps +Dependencies required for running osbuild pipelines in a VM. +%endif + %prep %forgeautosetup -p1 tar xf %SOURCE1 @@ -286,13 +294,13 @@ install -p -m 0755 data/10-osbuild-inhibitor.rules %{buildroot}%{_udevrulesdir} mkdir -p %{buildroot}%{_libexecdir} install -p -m 0755 tools/osbuild-depsolve-dnf %{buildroot}%{_libexecdir}/osbuild-depsolve-dnf +# Install `osbuild-store` into libexec +install -p -m 0755 tools/osbuild-store %{buildroot}%{_libexecdir}/osbuild-store + # Configure the solver for dnf mkdir -p %{buildroot}%{_datadir}/osbuild -# RHEL 11 and Fedora 41 and later use dnf5, RHEL < 11 and Fedora < 41 use dnf -# On Fedora 41 however, we force dnf4 (and depend on python3-dnf) until dnf5 issues are resolved. -# See https://github.com/rpm-software-management/dnf5/issues/1748 -# and https://issues.redhat.com/browse/COMPOSER-2361 -%if 0%{?rhel} >= 11 +# Default to using DNF5 solver for RHEL 11 and Fedora 45 and later +%if 0%{?rhel} >= 11 || 0%{?fedora} >= 45 install -p -m 0644 tools/solver-dnf5.json %{buildroot}%{pkgdir}/solver.json %else install -p -m 0644 tools/solver-dnf.json %{buildroot}%{pkgdir}/solver.json @@ -466,12 +474,20 @@ fi %{_bindir}/osbuild-image-info %{_bindir}/osbuild-mpp %{?fedora:%{_bindir}/osbuild-dev} +%{_libexecdir}/osbuild-store %files depsolve-dnf %{_libexecdir}/osbuild-depsolve-dnf %{pkgdir}/solver.json +%if ! (0%{?rhel} && "%{_arch}" == "ppc64le") +%files virt-deps +%endif + %changelog +* Wed May 27 2026 imagebuilder-bot - 183-1 +- New upstream release + * Thu Feb 19 2026 imagebuilder-bot - 174-1 - New upstream release diff --git a/sources b/sources index eab2313..302d244 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (osbuild-174.tar.gz) = 5759068be604e925e1dfc4e61d5933ad084d819d6fec78dce37afb148429bd18b915dbbb4bb50b3c553fc2751c7b9c12f7caad8c6aefca3918016f1bc5aa3e6e +SHA512 (osbuild-183.tar.gz) = 09fbbd62aa6c87611ac4e366a6d55687055fa92e60fd39b4ec4c5da8af4a68dc0e242f7cc9faa96082b7f1466a499d8706d4b897031b75d5e41780160c8c7a63 SHA512 (osbuild-initrd-0.1.tar.gz) = af8fd6b3b84f4f0ffca9847d8cef49322d75a03fc60743c8bf697a21df019666778e826bc0a8e9f5faca59151bf91f12d65d2a5e820ca9d0bd840ff92d33054a