diff --git a/.gitignore b/.gitignore index 26c2690..bfb8204 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/osbuild-132.tar.gz +SOURCES/osbuild-135.tar.gz diff --git a/.osbuild.metadata b/.osbuild.metadata index 4d89948..1a98253 100644 --- a/.osbuild.metadata +++ b/.osbuild.metadata @@ -1 +1 @@ -17efe3049b4f203625dd36671daf95f6e26e24f1 SOURCES/osbuild-132.tar.gz +f93c7bb7ee9e339c5088b24a8980e38fe61bf2dd SOURCES/osbuild-135.tar.gz diff --git a/SPECS/osbuild.spec b/SPECS/osbuild.spec index c46eb97..56551bb 100644 --- a/SPECS/osbuild.spec +++ b/SPECS/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