From f9f665f2ca15c5159971fdcffd0340c3b8e30e038170ccac4444c6f40de2b678 Mon Sep 17 00:00:00 2001 From: Robert Schweikert Date: Fri, 9 Oct 2020 21:56:09 +0000 Subject: [PATCH] Accepting request 840412 from home:glaubitz:branches:Cloud:Tools - Update to version 1.18.156 + For detailed changes see https://github.com/aws/aws-cli/blob/1.18.156/CHANGELOG.rst - Drop patches no longer required + hide_py_pckgmgmt.patch - Update Requires in spec file from setup.py OBS-URL: https://build.opensuse.org/request/show/840412 OBS-URL: https://build.opensuse.org/package/show/Cloud:Tools/aws-cli?expand=0&rev=101 --- aws-cli-1.18.133.tar.gz | 3 --- aws-cli-1.18.156.tar.gz | 3 +++ aws-cli.changes | 10 +++++++++ aws-cli.spec | 8 +++---- hide_py_pckgmgmt.patch | 48 ----------------------------------------- 5 files changed, 16 insertions(+), 56 deletions(-) delete mode 100644 aws-cli-1.18.133.tar.gz create mode 100644 aws-cli-1.18.156.tar.gz delete mode 100644 hide_py_pckgmgmt.patch diff --git a/aws-cli-1.18.133.tar.gz b/aws-cli-1.18.133.tar.gz deleted file mode 100644 index d98b14e..0000000 --- a/aws-cli-1.18.133.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:a8a0293b84a63b27aef136499b0fbb4a04b05e792543568a399235a1c1c7d240 -size 1853244 diff --git a/aws-cli-1.18.156.tar.gz b/aws-cli-1.18.156.tar.gz new file mode 100644 index 0000000..7cc1325 --- /dev/null +++ b/aws-cli-1.18.156.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:1676a9b715ca6a46884ba8576afe70f2b2bcdedf4346cd8edd37e2b86341ae64 +size 1879128 diff --git a/aws-cli.changes b/aws-cli.changes index 21b4750..f31ed6e 100644 --- a/aws-cli.changes +++ b/aws-cli.changes @@ -1,3 +1,13 @@ +------------------------------------------------------------------- +Fri Oct 9 10:40:09 UTC 2020 - John Paul Adrian Glaubitz + +- Update to version 1.18.156 + + For detailed changes see + https://github.com/aws/aws-cli/blob/1.18.156/CHANGELOG.rst +- Drop patches no longer required + + hide_py_pckgmgmt.patch +- Update Requires in spec file from setup.py + ------------------------------------------------------------------- Mon Sep 7 18:23:37 UTC 2020 - John Paul Adrian Glaubitz diff --git a/aws-cli.spec b/aws-cli.spec index 05b9c9d..80e6032 100644 --- a/aws-cli.spec +++ b/aws-cli.spec @@ -17,14 +17,13 @@ Name: aws-cli -Version: 1.18.133 +Version: 1.18.156 Release: 0 Summary: Amazon Web Services Command Line Interface License: Apache-2.0 Group: System/Management URL: https://github.com/aws/aws-cli Source0: %{name}-%{version}.tar.gz -Patch0: hide_py_pckgmgmt.patch BuildRequires: fdupes Requires: groff Provides: awscli = %{version} @@ -35,7 +34,7 @@ BuildRequires: python3-setuptools Requires: python3 Requires: python3-PyYAML <= 6.0.0 Requires: python3-PyYAML >= 3.10 -Requires: python3-botocore >= 1.17.56 +Requires: python3-botocore >= 1.18.15 Requires: python3-colorama <= 0.4.4 Requires: python3-colorama >= 0.2.5 Requires: python3-docutils >= 0.10 @@ -51,7 +50,7 @@ BuildRequires: python-setuptools Requires: python Requires: python-PyYAML <= 5.4 Requires: python-PyYAML >= 3.10 -Requires: python-botocore >= 1.17.56 +Requires: python-botocore >= 1.18.15 Requires: python-colorama <= 0.3.9 Requires: python-colorama >= 0.2.5 Requires: python-docutils >= 0.10 @@ -69,7 +68,6 @@ from the command line and automated through scripts. %prep %setup -q -%patch0 sed -i 's/from botocore\.vendored //' awscli/customizations/awslambda.py sed -i 's/botocore\.vendored\.//' awscli/customizations/configure/__init__.py diff --git a/hide_py_pckgmgmt.patch b/hide_py_pckgmgmt.patch deleted file mode 100644 index dd75eec..0000000 --- a/hide_py_pckgmgmt.patch +++ /dev/null @@ -1,48 +0,0 @@ ---- setup.py.orig 2020-09-04 20:13:48.000000000 +0200 -+++ setup.py 2020-09-07 20:23:23.734670079 +0200 -@@ -23,21 +23,21 @@ - raise RuntimeError("Unable to find version string.") - - --install_requires = [ -- 'botocore==1.17.56', -- 'docutils>=0.10,<0.16', -- 's3transfer>=0.3.0,<0.4.0', --] -+# install_requires = [ -+# 'botocore==1.17.56', -+# 'docutils>=0.10,<0.16', -+# 's3transfer>=0.3.0,<0.4.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') -+# 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( -@@ -55,8 +55,8 @@ - 'examples/*/*.txt', 'examples/*/*/*.txt', - 'examples/*/*/*.rst', 'topics/*.rst', - 'topics/*.json']}, -- install_requires=install_requires, -- extras_require={}, -+ # install_requires=install_requires, -+ # extras_require={}, - license="Apache License 2.0", - classifiers=[ - 'Development Status :: 5 - Production/Stable',