diff --git a/.gitignore b/.gitignore index 7de716f..e97ef86 100644 --- a/.gitignore +++ b/.gitignore @@ -115,3 +115,4 @@ /osbuild-130.tar.gz /osbuild-131.tar.gz /osbuild-132.tar.gz +/osbuild-135.tar.gz diff --git a/osbuild.spec b/osbuild.spec index a336324..a89771d 100644 --- a/osbuild.spec +++ b/osbuild.spec @@ -1,7 +1,7 @@ %global forgeurl https://github.com/osbuild/osbuild %global selinuxtype targeted -Version: 132 +Version: 135 %forgemeta @@ -9,7 +9,7 @@ Version: 132 %global pkgdir %{_prefix}/lib/%{pypi_name} Name: %{pypi_name} -Release: 2%{?dist} +Release: 1%{?dist} License: Apache-2.0 URL: %{forgeurl} @@ -138,7 +138,10 @@ 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 -%if 0%{?fedora} >= 41 || 0%{?rhel} >= 11 +# 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 Requires: python3-libdnf5 >= 5.2.1 %else Requires: python3-dnf @@ -227,7 +230,10 @@ install -p -m 0755 tools/osbuild-depsolve-dnf %{buildroot}%{_libexecdir}/osbuild # 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 -%if 0%{?fedora} >= 41 || 0%{?rhel} >= 11 +# 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 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 +316,9 @@ fi %{pkgdir}/solver.json %changelog +* Sat Nov 23 2024 imagebuilder-bot - 135-1 +- New upstream release + * Tue Oct 29 2024 Troy Dawson - 132-2 - Bump release for October 2024 mass rebuild: Resolves: RHEL-64018 diff --git a/sources b/sources index 89cf554..5e5fa0e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (osbuild-132.tar.gz) = 07a2ffc33c600b7e300f31d493cd8c9f930008f40bb4852e9c1c6302e26a630ecf8aeefe9f1b7b36a2ed44a96415bbddfc541921b8c22cd81acd5012b70cfa59 +SHA512 (osbuild-135.tar.gz) = b95ed7b75756845ec1baaecbd7340edee78147daec7985d706f1cb690ef23b5feeef2b172c954bf4136eccab223ee5422f32da401f25f7ef699535a0aa6932df