From 35a05ad86991787da7d69b3b0e1406bea855d2ae Mon Sep 17 00:00:00 2001 From: imagebuilder-bot Date: Wed, 9 Oct 2024 11:06:48 +0000 Subject: [PATCH] Update to 131 Resolves: RHEL-56049 --- .gitignore | 1 + osbuild.spec | 14 ++++++++------ sources | 2 +- 3 files changed, 10 insertions(+), 7 deletions(-) diff --git a/.gitignore b/.gitignore index 81875b2..dc9be8f 100644 --- a/.gitignore +++ b/.gitignore @@ -104,3 +104,4 @@ /osbuild-125.tar.gz /osbuild-126.tar.gz /osbuild-130.tar.gz +/osbuild-131.tar.gz diff --git a/osbuild.spec b/osbuild.spec index f758b0a..2faae6c 100644 --- a/osbuild.spec +++ b/osbuild.spec @@ -1,7 +1,7 @@ %global forgeurl https://github.com/osbuild/osbuild %global selinuxtype targeted -Version: 130 +Version: 131 %forgemeta @@ -27,7 +27,6 @@ Requires: bash Requires: bubblewrap Requires: coreutils Requires: curl -Requires: dnf Requires: e2fsprogs Requires: glibc Requires: policycoreutils @@ -137,8 +136,8 @@ manifests and osbuild. Summary: Dependency solving support for DNF Requires: %{name} = %{version}-%{release} -# Fedora 41 and later use libdnf5, RHEL and Fedora < 41 use dnf -%if 0%{?fedora} >= 41 +# RHEL 11 and Fedora 41 and later use libdnf5, RHEL < 11 and Fedora < 41 use dnf +%if 0%{?fedora} >= 41 || 0%{?rhel} >= 11 Requires: python3-libdnf5 >= 5.2.1 %else Requires: python3-dnf @@ -226,8 +225,8 @@ install -p -m 0755 tools/osbuild-depsolve-dnf %{buildroot}%{_libexecdir}/osbuild # Configure the solver for dnf mkdir -p %{buildroot}%{_datadir}/osbuild -# Fedora 41 and later use dnf5, RHEL and Fedora < 41 use dnf -%if 0%{?fedora} >= 41 +# RHEL 11 and Fedora 41 and later use dnf5, RHEL < 11 and Fedora < 41 use dnf +%if 0%{?fedora} >= 41 || 0%{?rhel} >= 11 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 @@ -310,6 +309,9 @@ fi %{pkgdir}/solver.json %changelog +* Wed Oct 09 2024 imagebuilder-bot - 131-1 +- New upstream release + * Thu Sep 26 2024 Tomáš Hozza - 130-1 - New upstream release diff --git a/sources b/sources index b57b3b2..f13bb42 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (osbuild-130.tar.gz) = d2e595229b0107ebf8446ba444600034208a8eb81498c1056753ba10759e248da3a2ab1cef06ee3426d29bd8ac498d1ebeabda8696e48574b6b9a9ac04653321 +SHA512 (osbuild-131.tar.gz) = 7974675493d32a4c45ee7445f6f010a47a5ba7238c15f3a3c35be8903476c18dcc15447b45670cba8f4c68baf7436eff4aeefd93f7a8aabd2d57048b929fd3de