From 81e9ceb7431ac38a86165e4568c94cbd7387cf37 Mon Sep 17 00:00:00 2001 From: David Duncan Date: Wed, 25 Sep 2019 21:53:25 +0000 Subject: [PATCH] Merge changes from 1.16.246 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 f3280e5..6c1bacd 100644 --- a/.gitignore +++ b/.gitignore @@ -103,3 +103,4 @@ /awscli-1.16.235.tar.gz /awscli-1.16.241.tar.gz /awscli-1.16.243.tar.gz +/awscli-1.16.246.tar.gz diff --git a/awscli.spec b/awscli.spec index 1583431..3cd3a52 100644 --- a/awscli.spec +++ b/awscli.spec @@ -5,10 +5,10 @@ %bcond_without python3 %endif -%global botocore_version 1.12.233 +%global botocore_version 1.12.236 Name: awscli -Version: 1.16.243 +Version: 1.16.246 Release: 1%{?dist} Summary: Universal Command Line Environment for AWS @@ -105,6 +105,9 @@ rm %{buildroot}%{_bindir}/aws.cmd %endif # with python3 %changelog +* Wed Sep 25 2019 David Duncan - 1.16.246-1 +- Merge changes from 1.16.246 release. + * Sun Sep 22 2019 David Duncan - 1.16.243-1 - Merge changes from 1.16.243 release. diff --git a/relax-dependencies.patch b/relax-dependencies.patch index b598868..11625ae 100644 --- a/relax-dependencies.patch +++ b/relax-dependencies.patch @@ -1,10 +1,10 @@ -diff -Nur awscli-1.16.243-orig/setup.py awscli-1.16.243/setup.py ---- awscli-1.16.243-orig/setup.py 2019-09-21 02:54:41.952323417 +0000 -+++ awscli-1.16.243/setup.py 2019-09-22 16:50:48.890142668 +0000 +diff -Nur awscli-1.16.246-orig/setup.py awscli-1.16.246/setup.py +--- awscli-1.16.246-orig/setup.py 2019-09-25 21:18:13.966437286 +0000 ++++ awscli-1.16.246/setup.py 2019-09-25 21:18:14.337443005 +0000 @@ -24,7 +24,7 @@ - requires = ['botocore==1.12.233', + requires = ['botocore==1.12.236', - 'colorama>=0.2.5,<=0.3.9', + 'colorama>=0.2.5', 'docutils>=0.10,<0.16', diff --git a/sources b/sources index f1e0fff..b2c9ed4 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (awscli-1.16.243.tar.gz) = 963161d2cad6c225eb73631807b4855a4286ac8f2b0cc7be688fff85270752852af1dd34c71efd0b636846efa8ff21ccb10974000f149c26e9e65fa47c5e1a7d +SHA512 (awscli-1.16.246.tar.gz) = c6e9b3a6216e0abfa2840fe67e914752a238058dae0f9111576a7d0b012056e2a1c5cd2b98acbe7de6e393fb07fa98c82079ef56a446abc230defa2b1877eb21