Compare commits

...

No commits in common. "imports/c8s/osbuild-composer-69-1.el8" and "c8" have entirely different histories.

3 changed files with 27 additions and 20 deletions

2
.gitignore vendored
View File

@ -1 +1 @@
SOURCES/osbuild-composer-69.tar.gz
SOURCES/osbuild-composer-75.tar.gz

View File

@ -1 +1 @@
c644ce7f5fec39f8263dde143a103d2da450152e SOURCES/osbuild-composer-69.tar.gz
b03146ce367157bf2ea8028c1a9bdbf27e69de97 SOURCES/osbuild-composer-75.tar.gz

View File

@ -9,7 +9,7 @@
%global goipath github.com/osbuild/osbuild-composer
Version: 69
Version: 75
%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}
@ -306,10 +295,10 @@ The core osbuild-composer binary. This is suitable both for spawning in containe
Summary: The worker for osbuild-composer
Requires: systemd
Requires: qemu-img
Requires: osbuild >= 70
Requires: osbuild-ostree >= 70
Requires: osbuild-lvm2 >= 70
Requires: osbuild-luks2 >= 70
Requires: osbuild >= 80
Requires: osbuild-ostree >= 80
Requires: osbuild-lvm2 >= 80
Requires: osbuild-luks2 >= 80
Requires: %{name}-dnf-json = %{version}-%{release}
%description worker
@ -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,24 @@ Integration tests to be run on a pristine-dedicated system to test the osbuild-c
%endif
%changelog
* Wed Feb 22 2023 imagebuilder-bot <imagebuilder-bots+imagebuilder-bot@redhat.com> - 75-1
- New upstream release
* Wed Feb 08 2023 imagebuilder-bot <imagebuilder-bots+imagebuilder-bot@redhat.com> - 74-1
- New upstream release
* Wed Jan 25 2023 imagebuilder-bot <imagebuilder-bots+imagebuilder-bot@redhat.com> - 73-1
- New upstream release
* Wed Jan 11 2023 imagebuilder-bot <imagebuilder-bots+imagebuilder-bot@redhat.com> - 72-1
- New upstream release
* Wed Dec 28 2022 imagebuilder-bot <imagebuilder-bots+imagebuilder-bot@redhat.com> - 71-1
- New upstream release
* Wed Dec 14 2022 imagebuilder-bot <imagebuilder-bots+imagebuilder-bot@redhat.com> - 70-1
- New upstream release
* Wed Nov 30 2022 imagebuilder-bot <imagebuilder-bots+imagebuilder-bot@redhat.com> - 69-1
- New upstream release