From 08573a6a821ba37fe2ecd313d595bd8d23182372 Mon Sep 17 00:00:00 2001 From: eabdullin Date: Mon, 30 Sep 2024 16:14:49 +0000 Subject: [PATCH] import CS osbuild-126-1.el9 --- .gitignore | 2 +- .osbuild.metadata | 2 +- SPECS/osbuild.spec | 57 +++++++++++++++++++++++++++++++++++++++------- 3 files changed, 51 insertions(+), 10 deletions(-) diff --git a/.gitignore b/.gitignore index 802a12f..a7d169d 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/osbuild-110.tar.gz +SOURCES/osbuild-126.tar.gz diff --git a/.osbuild.metadata b/.osbuild.metadata index b59a0aa..61b0a60 100644 --- a/.osbuild.metadata +++ b/.osbuild.metadata @@ -1 +1 @@ -a34b43322aef7a58ce2d4faa97029aed690d1de0 SOURCES/osbuild-110.tar.gz +5bd0c9d3d7e5ad4afdc1b018320f47f0350cc90b SOURCES/osbuild-126.tar.gz diff --git a/SPECS/osbuild.spec b/SPECS/osbuild.spec index 9952d50..c4c9e16 100644 --- a/SPECS/osbuild.spec +++ b/SPECS/osbuild.spec @@ -1,7 +1,7 @@ %global forgeurl https://github.com/osbuild/osbuild %global selinuxtype targeted -Version: 110 +Version: 126 %forgemeta @@ -137,13 +137,22 @@ manifests and osbuild. Summary: Dependency solving support for DNF Requires: %{name} = %{version}-%{release} -# Fedora 40 and later use libdnf5, RHEL and Fedora < 40 use libdnf -%if 0%{?fedora} >= 40 -Requires: python3-libdnf5 >= 5.1.1 +# 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 +# osbuild 125 added a new "solver" field and osbuild-composer only +# supports this since 116 +Conflicts: osbuild-composer <= 115 + +# This version needs to get bumped every time the osbuild-dnf-json +# version changes in an incompatible way. Packages like osbuild-composer +# can depend on the exact API version this way +Provides: osbuild-dnf-json-api = 7 + %description depsolve-dnf Contains depsolving capabilities for package managers. @@ -213,11 +222,15 @@ install -p -m 0755 data/10-osbuild-inhibitor.rules %{buildroot}%{_udevrulesdir} # Install `osbuild-depsolve-dnf` into libexec mkdir -p %{buildroot}%{_libexecdir} -# Fedora 40 and later use dnf5-json, RHEL and Fedora < 40 use dnf-json -%if 0%{?fedora} >= 40 -install -p -m 0755 tools/osbuild-depsolve-dnf5 %{buildroot}%{_libexecdir}/osbuild-depsolve-dnf -%else 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 @@ -294,8 +307,36 @@ fi %files depsolve-dnf %{_libexecdir}/osbuild-depsolve-dnf +%{pkgdir}/solver.json %changelog +* Wed Aug 21 2024 imagebuilder-bot - 126-1 +- New upstream release + +* Wed Aug 14 2024 imagebuilder-bot - 125-1 +- New upstream release + +* Thu Aug 01 2024 imagebuilder-bot - 124-1 +- New upstream release + +* Thu Jul 25 2024 imagebuilder-bot - 123-1 +- New upstream release + +* Tue Jul 23 2024 Tomáš Hozza - 122-2 +- Run tests only on x86_64 + +* Thu Jul 04 2024 imagebuilder-bot - 122-1 +- New upstream release + +* Thu May 23 2024 imagebuilder-bot - 119-1 +- New upstream release + +* Fri May 10 2024 imagebuilder-bot - 118-1 +- New upstream release + +* Wed Feb 28 2024 imagebuilder-bot - 111-1 +- New upstream release + * Mon Feb 26 2024 imagebuilder-bot - 110-1 - New upstream release