From 3b5ed9967232ea2501330235beac4ab04c0cb190 Mon Sep 17 00:00:00 2001 From: imagebuilder-bot Date: Wed, 11 Jan 2023 09:31:43 +0000 Subject: [PATCH] Update to 72 Resolves: rhbz#2132250 --- .gitignore | 1 + osbuild-composer.spec | 20 ++++++-------------- sources | 2 +- 3 files changed, 8 insertions(+), 15 deletions(-) diff --git a/.gitignore b/.gitignore index ba8407e..316cbef 100644 --- a/.gitignore +++ b/.gitignore @@ -48,3 +48,4 @@ /osbuild-composer-69.tar.gz /osbuild-composer-70.tar.gz /osbuild-composer-71.tar.gz +/osbuild-composer-72.tar.gz diff --git a/osbuild-composer.spec b/osbuild-composer.spec index 7d5d2b6..b717791 100644 --- a/osbuild-composer.spec +++ b/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 diff --git a/sources b/sources index b4ce159..5223458 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (osbuild-composer-71.tar.gz) = 324faae33b5eb87e74b1e878ff3c9a120fee01acb2c8ff1718a28524c2170445513331f6de555160fbe259eba1ca5ad31125e7ab951cec91d71b7a94a96a54ff +SHA512 (osbuild-composer-72.tar.gz) = abb293532f5af93b9c1e01b24638f3313d739efddfda65a9ae9607fe40f6baf04fbd063a092f371591864758dfa498d2ca6239f99b80d7b94a68af5652e2abbe