rpms/osbuild-composer
9
0
Fork 2
Code Issues Pull Requests 1 Releases Activity

New upstream release 11

Browse Source
This commit is contained in:
Ondřej Budai 2020-04-29 20:50:40 +02:00
parent 8c1d1af47c
commit 239934c2f0
3 changed files with 20 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -1,3 +1,4 @@
/osbuild-composer-8.tar.gz
/osbuild-composer-9.tar.gz
/osbuild-composer-10.tar.gz
/osbuild-composer-11.tar.gz

22
osbuild-composer.spec
View File

@ -4,7 +4,7 @@
%global goipath github.com/osbuild/osbuild-composer
Version: 10
Version: 11
%gometa
@ -30,6 +30,7 @@ BuildRequires: systemd
BuildRequires: systemd-rpm-macros
BuildRequires: git
BuildRequires: golang(github.com/aws/aws-sdk-go)
BuildRequires: golang(github.com/Azure/azure-sdk-for-go)
BuildRequires: golang(github.com/Azure/azure-storage-blob-go/azblob)
BuildRequires: golang(github.com/BurntSushi/toml)
BuildRequires: golang(github.com/coreos/go-semver/semver)
@ -43,7 +44,7 @@ BuildRequires: golang(github.com/stretchr/testify/assert)
Requires: osbuild-composer-worker
Requires: systemd
Requires: osbuild >= 11
Requires: osbuild >= 12
Provides: weldr
@ -127,6 +128,9 @@ install -m 0755 -vp _bin/osbuild-image-tests %{buildroot}%{_libex
install -m 0755 -vp _bin/osbuild-rcm-tests %{buildroot}%{_libexecdir}/tests/osbuild-composer/
install -m 0755 -vp tools/image-info %{buildroot}%{_libexecdir}/osbuild-composer/
install -m 0755 -vd %{buildroot}%{_datadir}/tests/osbuild-composer
install -m 0644 -vp test/azure-deployment-template.json %{buildroot}%{_datadir}/tests/osbuild-composer/
install -m 0755 -vd %{buildroot}%{_datadir}/tests/osbuild-composer/cases
install -m 0644 -vp test/cases/* %{buildroot}%{_datadir}/tests/osbuild-composer/cases/
install -m 0755 -vd %{buildroot}%{_datadir}/tests/osbuild-composer/keyring
@ -210,10 +214,17 @@ The worker for osbuild-composer
%systemd_post osbuild-worker@.service osbuild-remote-worker@.service
%preun worker
%systemd_preun osbuild-worker@.service osbuild-remote-worker@.service
# 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:
# 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"
%postun worker
%systemd_postun_with_restart osbuild-worker@.service osbuild-remote-worker@.service
# restart all the worker services
%systemd_postun_with_restart "osbuild-worker@*.service" "osbuild-remote-worker@*.service"
%if %{with tests}
@ -239,6 +250,9 @@ Integration tests to be run on a pristine-dedicated system to test the osbuild-c
%endif
%changelog
* Wed Apr 29 2020 Ondrej Budai <obudai@redhat.com> - 11-1
- New upstream release
* Wed Apr 15 2020 Ondrej Budai <obudai@redhat.com> - 10-1
- New upstream release

2
sources
View File

@ -1 +1 @@
SHA512 (osbuild-composer-10.tar.gz) = ed26a5c1ec6a97f829d57ceb2193a8e74a0cf36d8e1055981e6707d43df25a1d6b71504f9dd86f1f955f69d63518a48051c3083c4f9b4e3bf9beb7fe49c3d0a4
SHA512 (osbuild-composer-11.tar.gz) = 5e21a55ed715cdf01f4a64998b9f51fb54d6b99c8722d787591a7fa0a699a6c73b14ae82a015def7c3032f7b68ad38b16768e7f1f8d571ff3c59b8bafb3407e7