Update to 125

Resolves: RHEL-32133

.gitignore

@@ -110,3 +110,4 @@
 /osbuild-122.tar.gz
 /osbuild-123.tar.gz
 /osbuild-124.tar.gz
+/osbuild-125.tar.gz

osbuild.spec

@@ -1,7 +1,7 @@
 %global         forgeurl https://github.com/osbuild/osbuild
 %global         selinuxtype targeted
 
-Version:        124
+Version:        125
 
 %forgemeta
 
@@ -137,7 +137,12 @@ manifests and osbuild.
 Summary:        Dependency solving support for DNF
 Requires:       %{name} = %{version}-%{release}
 
+# Fedora 41 and later use libdnf5, RHEL and Fedora < 41 use libdnf
+%if 0%{?fedora} >= 41
+Requires: python3-libdnf5 >= 5.2.1
+%else
 Requires: python3-libdnf
+%endif
 
 %description    depsolve-dnf
 Contains depsolving capabilities for package managers.
@@ -210,6 +215,15 @@ 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
 
+# 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
+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
+%endif
+
 %check
 exit 0
 # We have some integration tests, but those require running a VM, so that would
@@ -284,8 +298,12 @@ fi
 
 %files depsolve-dnf
 %{_libexecdir}/osbuild-depsolve-dnf
+%{pkgdir}/solver.json
 
 %changelog
+* Wed Aug 14 2024 imagebuilder-bot <imagebuilder-bots+imagebuilder-bot@redhat.com> - 125-1
+- New upstream release
+
 * Thu Aug 01 2024 imagebuilder-bot <imagebuilder-bots+imagebuilder-bot@redhat.com> - 124-1
 - New upstream release
 

sources

@@ -1 +1 @@
-SHA512 (osbuild-124.tar.gz) = 8cbed21abca5950a58a85e49f5ea78ec60b988cc62e98c3b1bd3351689f7c720636aee9c08087b7119ea4016616a6efbd58714ef0aa2b044e08f7a28f6ca2d0f
+SHA512 (osbuild-125.tar.gz) = fb9751408a64828b59798a438d0ff9ae3d485fb0d1e182f6bb094ea93012e3bff2756156bcbdca0dd37766fd67d640c861c8ab862a2b9634c040df9121c7d9db