From bc4acc09492dceb19a8081c8a2e13b8ac94a05ff Mon Sep 17 00:00:00 2001 From: David Duncan Date: Mon, 30 Sep 2019 22:08:09 +0000 Subject: [PATCH] Merge changes from 1.12.239 release. --- .gitignore | 1 + awscli.spec | 7 +++++-- relax-dependencies.patch | 8 ++++---- sources | 2 +- 4 files changed, 11 insertions(+), 7 deletions(-) diff --git a/.gitignore b/.gitignore index 766bf95..0db35de 100644 --- a/.gitignore +++ b/.gitignore @@ -106,3 +106,4 @@ /awscli-1.16.246.tar.gz /awscli-1.16.247.tar.gz /awscli-1.16.248.tar.gz +/awscli-1.16.249.tar.gz diff --git a/awscli.spec b/awscli.spec index 82bf533..2334d44 100644 --- a/awscli.spec +++ b/awscli.spec @@ -5,10 +5,10 @@ %bcond_without python3 %endif -%global botocore_version 1.12.238 +%global botocore_version 1.12.239 Name: awscli -Version: 1.16.248 +Version: 1.16.249 Release: 1%{?dist} Summary: Universal Command Line Environment for AWS @@ -105,6 +105,9 @@ rm %{buildroot}%{_bindir}/aws.cmd %endif # with python3 %changelog +* Mon Sep 30 2019 David Duncan davdunc@amazon.com - 1.16.249-1 +- Merge changes from 1.16.249 release. + * Sat Sep 28 2019 David Duncan davdunc@amazon.com - 1.16.248-1 - Merge changes from 1.16.248 release. diff --git a/relax-dependencies.patch b/relax-dependencies.patch index d32ff13..b4f3981 100644 --- a/relax-dependencies.patch +++ b/relax-dependencies.patch @@ -1,10 +1,10 @@ -diff -Nur awscli-1.16.248-orig/setup.py awscli-1.16.248/setup.py ---- awscli-1.16.248-orig/setup.py 2019-09-28 00:41:20.241038849 +0000 -+++ awscli-1.16.248/setup.py 2019-09-28 00:41:22.194069456 +0000 +diff -Nur awscli-1.16.249-orig/setup.py awscli-1.16.249/setup.py +--- awscli-1.16.249-orig/setup.py 2019-09-30 22:07:34.962082384 +0000 ++++ awscli-1.16.249/setup.py 2019-09-30 22:07:35.343088332 +0000 @@ -24,7 +24,7 @@ - requires = ['botocore==1.12.238', + requires = ['botocore==1.12.239', - 'colorama>=0.2.5,<=0.3.9', + 'colorama>=0.2.5', 'docutils>=0.10,<0.16', diff --git a/sources b/sources index 9a704b6..952a208 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (awscli-1.16.248.tar.gz) = 9cf29f50e70ff5bcd40475dfb2fd83c8a42477b5f042a8a30dcb9959d6dc06deffeab17655af5245b0bc7a4b4b8cfa9b0fdaa0bd6c75e955635f4e05194ffd28 +SHA512 (awscli-1.16.249.tar.gz) = 40e2d6d46aba0dfff3b5b50a977c9bca25330062da746b5e51257310a467ff9d0358bdd6cf47de2733f18a81d4903c138e299095eccdd9b7a2c710ad59e196a7