From 6342c2eb712d164a4e57a65e6e9314418d2ebc82193c97b579c6313e8b27a7a7 Mon Sep 17 00:00:00 2001 From: Robert Schweikert Date: Mon, 20 Jul 2020 12:00:02 +0000 Subject: [PATCH] Accepting request 821360 from home:glaubitz:branches:Cloud:Tools - Update to version 1.18.98 + For detailed changes see https://github.com/aws/aws-cli/blob/1.18.79/CHANGELOG.rst + Forward port hide_py_pckgmgmt.patch + Update Requires in spec file from setup.py OBS-URL: https://build.opensuse.org/request/show/821360 OBS-URL: https://build.opensuse.org/package/show/Cloud:Tools/aws-cli?expand=0&rev=93 --- aws-cli-1.18.79.tar.gz | 3 --- aws-cli-1.18.98.tar.gz | 3 +++ aws-cli.changes | 9 +++++++++ aws-cli.spec | 4 ++-- hide_py_pckgmgmt.patch | 18 ++++++++++-------- 5 files changed, 24 insertions(+), 13 deletions(-) delete mode 100644 aws-cli-1.18.79.tar.gz create mode 100644 aws-cli-1.18.98.tar.gz diff --git a/aws-cli-1.18.79.tar.gz b/aws-cli-1.18.79.tar.gz deleted file mode 100644 index e8f142e..0000000 --- a/aws-cli-1.18.79.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:8dab735dcbd5b9a011b8fb99e74053a460639f845914cdab88862563f70a89a5 -size 1781858 diff --git a/aws-cli-1.18.98.tar.gz b/aws-cli-1.18.98.tar.gz new file mode 100644 index 0000000..4328ae0 --- /dev/null +++ b/aws-cli-1.18.98.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:65923f5be2cfe3cdea3ac32b8b6a874928f846e038b3d8b16724a19e98b24d7e +size 1810624 diff --git a/aws-cli.changes b/aws-cli.changes index 4caafe5..2935a72 100644 --- a/aws-cli.changes +++ b/aws-cli.changes @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +Thu Jul 16 20:32:03 UTC 2020 - John Paul Adrian Glaubitz + +- Update to version 1.18.98 + + For detailed changes see + https://github.com/aws/aws-cli/blob/1.18.79/CHANGELOG.rst + + Forward port hide_py_pckgmgmt.patch + + Update Requires in spec file from setup.py + ------------------------------------------------------------------- Mon Jun 15 13:17:37 UTC 2020 - John Paul Adrian Glaubitz diff --git a/aws-cli.spec b/aws-cli.spec index 91c2f9c..3817bbd 100644 --- a/aws-cli.spec +++ b/aws-cli.spec @@ -17,7 +17,7 @@ Name: aws-cli -Version: 1.18.79 +Version: 1.18.98 Release: 0 Summary: Amazon Web Services Command Line Interface License: Apache-2.0 @@ -35,7 +35,7 @@ BuildRequires: python3-setuptools Requires: python3 Requires: python3-PyYAML <= 6.0.0 Requires: python3-PyYAML >= 3.10 -Requires: python3-botocore >= 1.17.2 +Requires: python3-botocore >= 1.17.21 Requires: python3-colorama <= 0.4.4 Requires: python3-colorama >= 0.2.5 Requires: python3-docutils >= 0.10 diff --git a/hide_py_pckgmgmt.patch b/hide_py_pckgmgmt.patch index 832bd8a..766e0a2 100644 --- a/hide_py_pckgmgmt.patch +++ b/hide_py_pckgmgmt.patch @@ -1,19 +1,17 @@ ---- setup.py.orig 2020-06-12 20:10:00.000000000 +0200 -+++ setup.py 2020-06-15 15:09:31.139551134 +0200 -@@ -23,20 +23,20 @@ +--- setup.py.orig 2020-07-15 20:15:58.000000000 +0200 ++++ setup.py 2020-07-16 22:31:38.745172282 +0200 +@@ -23,21 +23,21 @@ raise RuntimeError("Unable to find version string.") -install_requires = [ -- 'botocore==1.17.2', +- 'botocore==1.17.21', - 'docutils>=0.10,<0.16', -- 'rsa>=3.1.2,<=3.5.0', - 's3transfer>=0.3.0,<0.4.0', -] +# install_requires = [ -+# 'botocore==1.17.2', ++# 'botocore==1.17.21', +# 'docutils>=0.10,<0.16', -+# 'rsa>=3.1.2,<=3.5.0', +# 's3transfer>=0.3.0,<0.4.0', +# ] @@ -21,19 +19,23 @@ -if sys.version_info[:2] == (3, 4): - install_requires.append('PyYAML>=3.10,<5.3') - install_requires.append('colorama>=0.2.5,<0.4.2') +- install_requires.append('rsa>=3.1.2,<=4.0.0') -else: - install_requires.append('PyYAML>=3.10,<5.4') - install_requires.append('colorama>=0.2.5,<0.4.4') +- install_requires.append('rsa>=3.1.2,<=4.5.0') +# if sys.version_info[:2] == (3, 4): +# install_requires.append('PyYAML>=3.10,<5.3') +# install_requires.append('colorama>=0.2.5,<0.4.2') ++# install_requires.append('rsa>=3.1.2,<=4.0.0') +# else: +# install_requires.append('PyYAML>=3.10,<5.4') +# install_requires.append('colorama>=0.2.5,<0.4.4') ++# install_requires.append('rsa>=3.1.2,<=4.5.0') setup_options = dict( -@@ -54,8 +54,8 @@ +@@ -55,8 +55,8 @@ 'examples/*/*.txt', 'examples/*/*/*.txt', 'examples/*/*/*.rst', 'topics/*.rst', 'topics/*.json']},