From 20c34542364d921637dc5664d02b25ddcb5211b9 Mon Sep 17 00:00:00 2001
From: Clement Verna <cverna@tutanota.com>
Date: Dec 19 2019 13:12:44 +0000
Subject: Upstream Release 1.6.47


Signed-off-by: Clement Verna <cverna@tutanota.com>

---

diff --git a/.gitignore b/.gitignore
index 503ed5d..dc5be4e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -23,3 +23,4 @@
 /atomic-reactor-5d435c8c9561fc98035021c5ad77488b9e315c7e.tar.gz
 /atomic-reactor-d6b91491a302f73e51705dbe821cc60c1b319df0.tar.gz
 /atomic-reactor-a894017723ba73b049c632e4ef600cba75857b24.tar.gz
+/atomic-reactor-f46b2c4264888d2e4deb1839496c6f67cd775985.tar.gz
diff --git a/atomic-reactor-jsonschema-version.patch b/atomic-reactor-jsonschema-version.patch
index 7a69f42..ba0ef1c 100644
--- a/atomic-reactor-jsonschema-version.patch
+++ b/atomic-reactor-jsonschema-version.patch
@@ -1,12 +1,13 @@
 --- a/requirements.txt
 +++ b/requirements.txt
-@@ -1,6 +1,6 @@
--docker-py
-+docker
+@@ -1,7 +1,7 @@
+-docker-py>=1.3.0
++docker>=1.3.0
  docker-squash>=1.0.7
  dockerfile-parse>=0.0.13
- flatpak-module-tools>=0.10.4
+-flatpak-module-tools >= 0.11
 -jsonschema==2.3.0  # to match available in RHEL/CentOS 7
++flatpak-module-tools >= 0.10.4
 +jsonschema
  PyYAML
  six
diff --git a/atomic-reactor-local-buildroot.patch b/atomic-reactor-local-buildroot.patch
index 6387add..087888c 100644
--- a/atomic-reactor-local-buildroot.patch
+++ b/atomic-reactor-local-buildroot.patch
@@ -1,7 +1,7 @@
 --- a/atomic_reactor/plugins/build_orchestrate_build.py
 +++ b/atomic_reactor/plugins/build_orchestrate_build.py
-@@ -868,8 +868,12 @@ class OrchestrateBuildPlugin(BuildStepPlugin):
- 
+@@ -849,8 +849,12 @@ class OrchestrateBuildPlugin(BuildStepPlugin):
+
          # we have build_image with tag, so we can check for manifest list
          if build_image:
 -            self.check_manifest_list(build_image, orchestrator_platform,
@@ -12,6 +12,6 @@
 +            else:
 +                for p in manifest_list_platforms:
 +                    self.build_image_digests[p] = build_image
- 
+
      def run(self):
          if not self.platforms:
diff --git a/atomic-reactor.spec b/atomic-reactor.spec
index 2e2e61e..3f25438 100644
--- a/atomic-reactor.spec
+++ b/atomic-reactor.spec
@@ -1,14 +1,14 @@
 %global owner projectatomic
 %global project atomic-reactor
 
-%global commit a894017723ba73b049c632e4ef600cba75857b24
+%global commit f46b2c4264888d2e4deb1839496c6f67cd775985
 %global shortcommit %(c=%{commit}; echo ${c:0:7})
 
 %global dock_obsolete_vr 1.3.7-2
 
 Name:           %{project}
-Version:        1.6.44
-Release:        7%{?dist}
+Version:        1.6.47
+Release:        1%{?dist}
 
 Summary:        Improved builder for Docker images
 License:        BSD
@@ -213,6 +213,9 @@ cp -a docs/manpage/atomic-reactor.1 %{buildroot}%{_mandir}/man1/
 
 
 %changelog
+* Thu Dec 19 2019 Clement Verna <cverna@fedoraproject.org> - 1.6.47-1
+- Update to latest upstream
+
 * Tue Dec 10 2019 Pierre-Yves Chibon <pingou@pingoured.fr> - 1.6.44-7
 - rebuilt
 
diff --git a/sources b/sources
index c3241bd..58238cd 100644
--- a/sources
+++ b/sources
@@ -1,2 +1 @@
-SHA512 (atomic-reactor-d6b91491a302f73e51705dbe821cc60c1b319df0.tar.gz) = db22f7a64c4c69b352f08979f17ee8b5b69de38e558347309732faa57d1fb7a0d5b0978626446a0249c5ea24c87e42a3191e07be70bd11f5e7b620dea528f33a
-SHA512 (atomic-reactor-a894017723ba73b049c632e4ef600cba75857b24.tar.gz) = 5540f5b6927cc4a695db48c7031c9d6609263e82082ff52779d66752fc0955d2994259151fa8105c2d977cfa826ea21fd85014f8e2d577c972ea8a918e5279ef
+SHA512 (atomic-reactor-f46b2c4264888d2e4deb1839496c6f67cd775985.tar.gz) = 5eefcef35cf8ce5ada44b9adbbdc5a7eda90254f8e4fb0f8bf252bb30b669f7bdcace9348a57dad30aa253b5c2feb80b8dfdbce5bee1cd6bb8fe0c9a312f5fbb