From 239934c2f0ed33c4de4ac7bfe0eee54d554239a2 Mon Sep 17 00:00:00 2001
From: Ondřej Budai <obudai@redhat.com>
Date: Apr 29 2020 18:50:57 +0000
Subject: New upstream release 11


---

diff --git a/.gitignore b/.gitignore
index 1932ab9..8061a5c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 /osbuild-composer-8.tar.gz
 /osbuild-composer-9.tar.gz
 /osbuild-composer-10.tar.gz
+/osbuild-composer-11.tar.gz
diff --git a/osbuild-composer.spec b/osbuild-composer.spec
index 5d3bd04..94a2221 100644
--- a/osbuild-composer.spec
+++ b/osbuild-composer.spec
@@ -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
 
diff --git a/sources b/sources
index 2f7bab6..b220fb3 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (osbuild-composer-10.tar.gz) = ed26a5c1ec6a97f829d57ceb2193a8e74a0cf36d8e1055981e6707d43df25a1d6b71504f9dd86f1f955f69d63518a48051c3083c4f9b4e3bf9beb7fe49c3d0a4
+SHA512 (osbuild-composer-11.tar.gz) = 5e21a55ed715cdf01f4a64998b9f51fb54d6b99c8722d787591a7fa0a699a6c73b14ae82a015def7c3032f7b68ad38b16768e7f1f8d571ff3c59b8bafb3407e7