From 3ab40f29c997b10c9e8e1ba97199fd058daf6cbe Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Thu, 12 Jan 2023 08:11:53 +0000 Subject: [PATCH] import osbuild-composer-72-1.el8 --- .gitignore | 2 +- .osbuild-composer.metadata | 2 +- SPECS/osbuild-composer.spec | 20 ++++++-------------- 3 files changed, 8 insertions(+), 16 deletions(-) diff --git a/.gitignore b/.gitignore index 19a06d5..e0c4b27 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/osbuild-composer-71.tar.gz +SOURCES/osbuild-composer-72.tar.gz diff --git a/.osbuild-composer.metadata b/.osbuild-composer.metadata index 92f762f..8d6fe8b 100644 --- a/.osbuild-composer.metadata +++ b/.osbuild-composer.metadata @@ -1 +1 @@ -ccc6e671590c8808417d7325992ae3b6e92b377c SOURCES/osbuild-composer-71.tar.gz +d2583c3c9b8531636a9484827b4f141cc2413096 SOURCES/osbuild-composer-72.tar.gz diff --git a/SPECS/osbuild-composer.spec b/SPECS/osbuild-composer.spec index 9e84eb6..2404263 100644 --- a/SPECS/osbuild-composer.spec +++ b/SPECS/osbuild-composer.spec @@ -9,7 +9,7 @@ %global goipath github.com/osbuild/osbuild-composer -Version: 71 +Version: 72 %gometa @@ -29,7 +29,7 @@ Summary: An image building service based on osbuild ExcludeArch: i686 armv7hl # Upstream license specification: Apache-2.0 -License: ASL 2.0 +License: Apache-2.0 URL: %{gourl} Source0: %{gosource} @@ -56,17 +56,6 @@ Requires: systemd Provides: weldr -%if 0%{?rhel} -Obsoletes: lorax-composer <= 29 -Conflicts: lorax-composer -%endif - -# Remove when we stop releasing into Fedora 35 -%if 0%{?fedora} >= 34 -# lorax 34.3 is the first one without the composer subpackage -Obsoletes: lorax-composer < 34.3 -%endif - %description %{common_description} @@ -342,7 +331,7 @@ fi Summary: The dnf-json binary used by osbuild-composer and the workers # Conflicts with older versions of composer that provide the same files -# this can be removed when RHEL 8 and Fedora 35 reach EOL +# this can be removed when RHEL 8 reaches EOL Conflicts: osbuild-composer <= 35 %description dnf-json @@ -428,6 +417,9 @@ Integration tests to be run on a pristine-dedicated system to test the osbuild-c %endif %changelog +* Wed Jan 11 2023 imagebuilder-bot - 72-1 +- New upstream release + * Wed Dec 28 2022 imagebuilder-bot - 71-1 - New upstream release