From d32f41af2ede9306388fb1bb0adb925474ffa248 Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Tue, 28 Mar 2023 12:24:59 +0000 Subject: [PATCH] import osbuild-composer-75-1.el8 --- .gitignore | 2 +- .osbuild-composer.metadata | 2 +- SPECS/osbuild-composer.spec | 66 ++++++++++++++++++++++++------------- 3 files changed, 45 insertions(+), 25 deletions(-) diff --git a/.gitignore b/.gitignore index e2c317c..d1030e9 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/osbuild-composer-62.tar.gz +SOURCES/osbuild-composer-75.tar.gz diff --git a/.osbuild-composer.metadata b/.osbuild-composer.metadata index 9576688..c47d362 100644 --- a/.osbuild-composer.metadata +++ b/.osbuild-composer.metadata @@ -1 +1 @@ -507b6d1c7dd00aafb3fc3988d7a1f61be10a0c03 SOURCES/osbuild-composer-62.tar.gz +b03146ce367157bf2ea8028c1a9bdbf27e69de97 SOURCES/osbuild-composer-75.tar.gz diff --git a/SPECS/osbuild-composer.spec b/SPECS/osbuild-composer.spec index 319135c..0b9bb99 100644 --- a/SPECS/osbuild-composer.spec +++ b/SPECS/osbuild-composer.spec @@ -9,7 +9,7 @@ %global goipath github.com/osbuild/osbuild-composer -Version: 62 +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} @@ -251,9 +240,6 @@ install -m 0644 -vp test/data/koji/* %{buildroot}% install -m 0755 -vd %{buildroot}%{_datadir}/tests/osbuild-composer/x509 install -m 0644 -vp test/data/x509/* %{buildroot}%{_datadir}/tests/osbuild-composer/x509/ -install -m 0755 -vd %{buildroot}%{_datadir}/tests/osbuild-composer/openshift -install -m 0644 -vp test/data/openshift/* %{buildroot}%{_datadir}/tests/osbuild-composer/openshift/ - install -m 0755 -vd %{buildroot}%{_datadir}/tests/osbuild-composer/schemas install -m 0644 -vp pkg/jobqueue/dbjobqueue/schemas/* %{buildroot}%{_datadir}/tests/osbuild-composer/schemas/ @@ -309,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 >= 63 -Requires: osbuild-ostree >= 63 -Requires: osbuild-lvm2 >= 63 -Requires: osbuild-luks2 >= 63 +Requires: osbuild >= 80 +Requires: osbuild-ostree >= 80 +Requires: osbuild-lvm2 >= 80 +Requires: osbuild-luks2 >= 80 Requires: %{name}-dnf-json = %{version}-%{release} %description worker @@ -329,8 +315,9 @@ The worker for osbuild-composer %preun worker # systemd_preun uses systemctl disable --now which doesn't work well with template services. # See https://github.com/systemd/systemd/issues/15620 -# The following lines mimicks its behaviour by running two commands: -if [ -d /run/systemd/system ]; then +# The following lines mimicks its behaviour by running two commands. +# The scriptlet is supposed to run only when the package is being removed. +if [ $1 -eq 0 ] && [ -d /run/systemd/system ]; then # disable and stop all the worker services systemctl --no-reload disable osbuild-worker@.service osbuild-remote-worker@.service systemctl stop "osbuild-worker@*.service" "osbuild-remote-worker@*.service" @@ -344,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 @@ -353,6 +340,12 @@ The dnf-json binary used by osbuild-composer and the workers. %files dnf-json %{_libexecdir}/osbuild-composer/dnf-json +%post dnf-json +# Fix ownership of the rpmmd cache files from previous versions where it was owned by root:root +if [ -e /var/cache/osbuild-composer/rpmmd ]; then + chown -f -R --from root:root _osbuild-composer:_osbuild-composer /var/cache/osbuild-composer/rpmmd +fi + %if %{with tests} || 0%{?rhel} %package tests @@ -424,6 +417,33 @@ Integration tests to be run on a pristine-dedicated system to test the osbuild-c %endif %changelog +* Wed Feb 22 2023 imagebuilder-bot - 75-1 +- New upstream release + +* Wed Feb 08 2023 imagebuilder-bot - 74-1 +- New upstream release + +* Wed Jan 25 2023 imagebuilder-bot - 73-1 +- New upstream release + +* Wed Jan 11 2023 imagebuilder-bot - 72-1 +- New upstream release + +* Wed Dec 28 2022 imagebuilder-bot - 71-1 +- New upstream release + +* Wed Dec 14 2022 imagebuilder-bot - 70-1 +- New upstream release + +* Wed Nov 30 2022 imagebuilder-bot - 69-1 +- New upstream release + +* Wed Nov 16 2022 imagebuilder-bot - 68-1 +- New upstream release + +* Wed Nov 02 2022 imagebuilder-bots+imagebuilder-bot@redhat.com - 67-1 +- New upstream release + * Mon Aug 29 2022 Ondřej Budai - 62-1 - New upstream release