From 06fe2ca02a14ffd18a9c0296455383bcbb02ffd4 Mon Sep 17 00:00:00 2001 From: eabdullin Date: Mon, 15 Sep 2025 12:29:12 +0000 Subject: [PATCH] import CS osbuild-158-1.el9 --- .gitignore | 2 +- .osbuild.metadata | 2 +- SPECS/osbuild.spec | 47 +++++++++++++++++++++++++++++++++++++++++++--- 3 files changed, 46 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index 4843a36..c1fda20 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/osbuild-141.tar.gz +SOURCES/osbuild-158.tar.gz diff --git a/.osbuild.metadata b/.osbuild.metadata index aff403a..bf54beb 100644 --- a/.osbuild.metadata +++ b/.osbuild.metadata @@ -1 +1 @@ -077777932fc7feab151aa38ffc395d169046a0a4 SOURCES/osbuild-141.tar.gz +7e9bca1abe3abd103553d9ea00257301550b1bc3 SOURCES/osbuild-158.tar.gz diff --git a/SPECS/osbuild.spec b/SPECS/osbuild.spec index 48e1f2d..70bbd92 100644 --- a/SPECS/osbuild.spec +++ b/SPECS/osbuild.spec @@ -1,7 +1,7 @@ %global forgeurl https://github.com/osbuild/osbuild %global selinuxtype targeted -Version: 141 +Version: 158 %forgemeta @@ -40,8 +40,8 @@ Requires: (%{name}-selinux if selinux-policy-%{selinuxtype}) Requires: python3-librepo # This is required for `osbuild`, for RHEL-10 and above -# the stdlib toml package can be used instead -%if 0%{?rhel} < 10 +# the stdlib tomllib module can be used instead +%if 0%{?rhel} && 0%{?rhel} < 10 Requires: python3-tomli %endif @@ -127,8 +127,12 @@ Requires: python3-dnf %if 0%{?fedora} Requires: python3-rich Requires: python3-attrs +%if 0%{?fedora} > 40 +Requires: python3dist(typer-slim[standard]) +%else Requires: python3-typer %endif +%endif %description tools Contains additional tools and utilities for development of @@ -148,6 +152,13 @@ Requires: python3-libdnf5 >= 5.2.1 Requires: python3-dnf %endif +%if 0%{?fedora} +# RHEL / CS does not have python3-license-expression +# It is needed for validating license expressions in RPM packages when generating SBOMs +# While SBOMs can be generated also without this package, it is recommended to have it. +Recommends: python3-license-expression +%endif + # osbuild 125 added a new "solver" field and osbuild-composer only # supports this since 116 Conflicts: osbuild-composer <= 115 @@ -318,6 +329,36 @@ fi %{pkgdir}/solver.json %changelog +* Thu Aug 14 2025 imagebuilder-bot - 158-1 +- New upstream release + +* Tue Jul 15 2025 imagebuilder-bot - 156-1 +- New upstream release + +* Sat Jul 12 2025 imagebuilder-bot - 155-1 +- New upstream release + +* Fri Jun 20 2025 imagebuilder-bot - 153-1 +- New upstream release + +* Fri Jun 06 2025 imagebuilder-bot - 151-1 +- New upstream release + +* Mon May 19 2025 imagebuilder-bot - 149-1 +- New upstream release + +* Wed Apr 16 2025 imagebuilder-bot - 147-1 +- New upstream release + +* Mon Apr 14 2025 imagebuilder-bot - 146-1 +- New upstream release + +* Fri Mar 28 2025 imagebuilder-bot - 144-1 +- New upstream release + +* Fri Feb 28 2025 imagebuilder-bot - 142-1 +- New upstream release + * Wed Feb 12 2025 imagebuilder-bot - 141-1 - New upstream release