From 2bec56f0c1fbebb22c1fd10f9ab7898151cd3dae Mon Sep 17 00:00:00 2001 From: eabdullin Date: Thu, 21 Sep 2023 19:46:46 +0000 Subject: [PATCH] import CS osbuild-composer-88-1.el9 --- .gitignore | 2 +- .osbuild-composer.metadata | 2 +- SPECS/osbuild-composer.spec | 46 +++++++++++++++++++++++++++++-------- 3 files changed, 38 insertions(+), 12 deletions(-) diff --git a/.gitignore b/.gitignore index 4a6c7d3..a13eeba 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/osbuild-composer-76.tar.gz +SOURCES/osbuild-composer-88.tar.gz diff --git a/.osbuild-composer.metadata b/.osbuild-composer.metadata index 91847e3..d221ecb 100644 --- a/.osbuild-composer.metadata +++ b/.osbuild-composer.metadata @@ -1 +1 @@ -f68a24e9d6a407708e33d72240b140e9c60378f1 SOURCES/osbuild-composer-76.tar.gz +9566fbe6bba91c7b3aba1a57c900aa6c00f77397 SOURCES/osbuild-composer-88.tar.gz diff --git a/SPECS/osbuild-composer.spec b/SPECS/osbuild-composer.spec index 57e7838..c3c7472 100644 --- a/SPECS/osbuild-composer.spec +++ b/SPECS/osbuild-composer.spec @@ -9,7 +9,7 @@ %global goipath github.com/osbuild/osbuild-composer -Version: 76 +Version: 88 %gometa @@ -114,7 +114,6 @@ go test -c -tags=integration -ldflags="${TEST_LDFLAGS}" -o _bin/osbuild-image-te go test -c -tags=integration -ldflags="${TEST_LDFLAGS}" -o _bin/osbuild-auth-tests %{goipath}/cmd/osbuild-auth-tests go test -c -tags=integration -ldflags="${TEST_LDFLAGS}" -o _bin/osbuild-koji-tests %{goipath}/cmd/osbuild-koji-tests go test -c -tags=integration -ldflags="${TEST_LDFLAGS}" -o _bin/osbuild-composer-dbjobqueue-tests %{goipath}/cmd/osbuild-composer-dbjobqueue-tests -go test -c -tags=integration -ldflags="${TEST_LDFLAGS}" -o _bin/osbuild-composer-manifest-tests %{goipath}/cmd/osbuild-composer-manifest-tests go test -c -tags=integration -ldflags="${TEST_LDFLAGS}" -o _bin/osbuild-service-maintenance-tests %{goipath}/cmd/osbuild-service-maintenance go build -tags=integration -ldflags="${TEST_LDFLAGS}" -o _bin/osbuild-mock-openid-provider %{goipath}/cmd/osbuild-mock-openid-provider @@ -180,7 +179,6 @@ install -m 0755 -vp _bin/osbuild-image-tests %{buildroot}% install -m 0755 -vp _bin/osbuild-auth-tests %{buildroot}%{_libexecdir}/osbuild-composer-test/ install -m 0755 -vp _bin/osbuild-koji-tests %{buildroot}%{_libexecdir}/osbuild-composer-test/ install -m 0755 -vp _bin/osbuild-composer-dbjobqueue-tests %{buildroot}%{_libexecdir}/osbuild-composer-test/ -install -m 0755 -vp _bin/osbuild-composer-manifest-tests %{buildroot}%{_libexecdir}/osbuild-composer-test/ install -m 0755 -vp _bin/osbuild-service-maintenance-tests %{buildroot}%{_libexecdir}/osbuild-composer-test/ install -m 0755 -vp _bin/osbuild-mock-openid-provider %{buildroot}%{_libexecdir}/osbuild-composer-test/ install -m 0755 -vp tools/define-compose-url.sh %{buildroot}%{_libexecdir}/osbuild-composer-test/ @@ -261,13 +259,13 @@ cd $PWD/_build/src/%{goipath} %endif %post -%systemd_post osbuild-composer.service osbuild-composer.socket osbuild-composer-api.socket osbuild-remote-worker.socket +%systemd_post osbuild-composer.service osbuild-composer.socket osbuild-composer-api.socket osbuild-composer-prometheus.socket osbuild-remote-worker.socket %preun -%systemd_preun osbuild-composer.service osbuild-composer.socket osbuild-composer-api.socket osbuild-remote-worker.socket +%systemd_preun osbuild-composer.service osbuild-composer.socket osbuild-composer-api.socket osbuild-composer-prometheus.socket osbuild-remote-worker.socket %postun -%systemd_postun_with_restart osbuild-composer.service osbuild-composer.socket osbuild-composer-api.socket osbuild-remote-worker.socket +%systemd_postun_with_restart osbuild-composer.service osbuild-composer.socket osbuild-composer-api.socket osbuild-composer-prometheus.socket osbuild-remote-worker.socket %files %license LICENSE @@ -276,6 +274,7 @@ cd $PWD/_build/src/%{goipath} %{_unitdir}/osbuild-composer.service %{_unitdir}/osbuild-composer.socket %{_unitdir}/osbuild-composer-api.socket +%{_unitdir}/osbuild-composer-prometheus.socket %{_unitdir}/osbuild-local-worker.socket %{_unitdir}/osbuild-remote-worker.socket %{_sysusersdir}/osbuild-composer.conf @@ -295,10 +294,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 >= 81 -Requires: osbuild-ostree >= 81 -Requires: osbuild-lvm2 >= 81 -Requires: osbuild-luks2 >= 81 +Requires: osbuild >= 93 +Requires: osbuild-ostree >= 93 +Requires: osbuild-lvm2 >= 93 +Requires: osbuild-luks2 >= 93 Requires: %{name}-dnf-json = %{version}-%{release} %description worker @@ -417,6 +416,33 @@ Integration tests to be run on a pristine-dedicated system to test the osbuild-c %endif %changelog +* Thu Aug 24 2023 imagebuilder-bot - 88-1 +- New upstream release + +* Wed Aug 09 2023 imagebuilder-bot - 87-1 +- New upstream release + +* Wed Jul 26 2023 imagebuilder-bot - 86-1 +- New upstream release + +* Fri Jul 14 2023 imagebuilder-bot - 85-1 +- New upstream release + +* Wed Jun 14 2023 imagebuilder-bot - 84-1 +- New upstream release + +* Wed May 17 2023 imagebuilder-bot - 82-1 +- New upstream release + +* Wed Apr 19 2023 imagebuilder-bot - 80-1 +- New upstream release + +* Wed Apr 05 2023 imagebuilder-bot - 79-1 +- New upstream release + +* Wed Mar 08 2023 imagebuilder-bot - 77-1 +- New upstream release + * Wed Mar 01 2023 imagebuilder-bot - 76-1 - New upstream release