From 63d21f0b26271d1c52250f61f80ee3995e2c578f Mon Sep 17 00:00:00 2001
From: Igor Raits <ignatenkobrain@fedoraproject.org>
Date: Fri, 7 Feb 2020 08:33:51 +0100
Subject: [PATCH] Update to 1.17.12

Signed-off-by: Igor Raits <ignatenkobrain@fedoraproject.org>
---
 .gitignore                                    |  1 +
 ...llections.abc-imports-for-Python-3.9.patch | 34 +++++++++++++++++++
 awscli.spec                                   |  9 ++++-
 sources                                       |  2 +-
 4 files changed, 44 insertions(+), 2 deletions(-)
 create mode 100644 0001-Fix-collections.abc-imports-for-Python-3.9.patch

diff --git a/.gitignore b/.gitignore
index 90a8cc9..40c4991 100644
--- a/.gitignore
+++ b/.gitignore
@@ -115,3 +115,4 @@
 /awscli-1.16.266.tar.gz
 /awscli-1.16.309.tar.gz
 /awscli-1.17.9.tar.gz
+/awscli-1.17.12.tar.gz
diff --git a/0001-Fix-collections.abc-imports-for-Python-3.9.patch b/0001-Fix-collections.abc-imports-for-Python-3.9.patch
new file mode 100644
index 0000000..a0a5713
--- /dev/null
+++ b/0001-Fix-collections.abc-imports-for-Python-3.9.patch
@@ -0,0 +1,34 @@
+From 0c9c08856bff1e60cb14ea9a2fdfa640c9af9eeb Mon Sep 17 00:00:00 2001
+From: Hugo <hugovk@users.noreply.github.com>
+Date: Tue, 21 Jan 2020 20:44:26 +0200
+Subject: [PATCH] Fix collections.abc imports for Python 3.9
+
+---
+ awscli/customizations/history/db.py | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/awscli/customizations/history/db.py b/awscli/customizations/history/db.py
+index a171cdc61..bdb96d1dc 100644
+--- a/awscli/customizations/history/db.py
++++ b/awscli/customizations/history/db.py
+@@ -16,7 +16,7 @@ import json
+ import datetime
+ import threading
+ import logging
+-from collections import MutableMapping
++from awscli.compat import collections_abc
+ 
+ from botocore.history import BaseHistoryHandler
+ 
+@@ -119,7 +119,7 @@ class PayloadSerializer(json.JSONEncoder):
+     def default(self, obj):
+         if isinstance(obj, datetime.datetime):
+             return self._encode_datetime(obj)
+-        elif isinstance(obj, MutableMapping):
++        elif isinstance(obj, collections_abc.MutableMapping):
+             return self._encode_mutable_mapping(obj)
+         elif isinstance(obj, binary_type):
+             # In PY3 the bytes type differs from the str type so the default
+-- 
+2.25.0
+
diff --git a/awscli.spec b/awscli.spec
index 8054601..e864d00 100644
--- a/awscli.spec
+++ b/awscli.spec
@@ -1,11 +1,13 @@
 Name:           awscli
-Version:        1.17.9
+Version:        1.17.12
 Release:        1%{?dist}
 Summary:        Universal Command Line Environment for AWS
 
 License:        ASL 2.0 and MIT
 URL:            https://aws.amazon.com/cli/
 Source0:        %{pypi_source}
+# https://github.com/aws/aws-cli/pull/4860
+Patch0001:      0001-Fix-collections.abc-imports-for-Python-3.9.patch
 
 BuildArch:      noarch
 BuildRequires:  python3-devel
@@ -21,6 +23,8 @@ command line interface to Amazon Web Services.
 %prep
 %autosetup -n %{name}-%{version} -p 1
 rm -vr %{name}.egg-info
+# https://github.com/aws/aws-cli/pull/4929
+sed -i -e '/PyYAML/s/5.3/5.4/' setup.{py,cfg}
 find awscli/examples/ -type f -name '*.rst' -executable -exec chmod -x '{}' +
 
 %build
@@ -49,6 +53,9 @@ install -Dpm0644 bin/aws_zsh_completer.sh \
 %{_datadir}/zsh/site-functions/_awscli
 
 %changelog
+* Fri Feb 07 2020 Igor Raits <ignatenkobrain@fedoraproject.org> - 1.17.12-1
+- Update to 1.17.12
+
 * Wed Jan 29 2020 Igor Raits <ignatenkobrain@fedoraproject.org> - 1.17.9-1
 - Update to 1.17.9
 
diff --git a/sources b/sources
index a1c66bd..1890fe6 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (awscli-1.17.9.tar.gz) = 7ec848ac07c20fe72cd9621d23291fe594ed9d8785296564c390db48e553b9ac4ac8d78dc897b23f566d34daaf0f289b389f811466c49b06d67a6ba742875eaa
+SHA512 (awscli-1.17.12.tar.gz) = 8254b0a1ae8751d0899b63eb0c491bd8703a21cba4a0bde6972804ee0650c8ef29e61f483508674793736cfd1782f0f751b4ae1c8cd3af08404e9a12a9e95137