From 6093ad37c38136cd1d260e3d364e1d170528ef4d1854c4f874b36462632ef4dd Mon Sep 17 00:00:00 2001 From: John Paul Adrian Glaubitz Date: Tue, 18 Aug 2020 12:02:00 +0000 Subject: [PATCH 1/2] - Fix versions in Requires for suse_version <= 1315 OBS-URL: https://build.opensuse.org/package/show/Cloud:Tools/aws-cli?expand=0&rev=98 --- aws-cli.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/aws-cli.spec b/aws-cli.spec index d140f86..db0c65e 100644 --- a/aws-cli.spec +++ b/aws-cli.spec @@ -49,9 +49,9 @@ BuildRequires: bash-completion BuildRequires: python-devel BuildRequires: python-setuptools Requires: python -Requires: python-PyYAML <= 3.13 +Requires: python-PyYAML <= 5.4 Requires: python-PyYAML >= 3.10 -Requires: python-botocore >= 1.12.93 +Requires: python-botocore >= 1.17.40 Requires: python-colorama <= 0.3.9 Requires: python-colorama >= 0.2.5 Requires: python-docutils >= 0.10 From e5646ab1691de43ac9af54c117db79d0111c2c070acdf652fae128cfa8069bbc Mon Sep 17 00:00:00 2001 From: Robert Schweikert Date: Tue, 8 Sep 2020 20:00:09 +0000 Subject: [PATCH 2/2] Accepting request 832842 from home:glaubitz:branches:Cloud:Tools - Update to version 1.18.133 + For detailed changes see https://github.com/aws/aws-cli/blob/1.18.133/CHANGELOG.rst + Forward port hide_py_pckgmgmt.patch + Update Requires in spec file from setup.py OBS-URL: https://build.opensuse.org/request/show/832842 OBS-URL: https://build.opensuse.org/package/show/Cloud:Tools/aws-cli?expand=0&rev=99 --- aws-cli-1.18.117.tar.gz | 3 --- aws-cli-1.18.133.tar.gz | 3 +++ aws-cli.changes | 9 +++++++++ aws-cli.spec | 6 +++--- hide_py_pckgmgmt.patch | 8 ++++---- 5 files changed, 19 insertions(+), 10 deletions(-) delete mode 100644 aws-cli-1.18.117.tar.gz create mode 100644 aws-cli-1.18.133.tar.gz diff --git a/aws-cli-1.18.117.tar.gz b/aws-cli-1.18.117.tar.gz deleted file mode 100644 index ee59c4a..0000000 --- a/aws-cli-1.18.117.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:6832b0f6c3c06f347ea7ae55442fd0c34804a24091f2c33fe3f68f910c5eb395 -size 1846974 diff --git a/aws-cli-1.18.133.tar.gz b/aws-cli-1.18.133.tar.gz new file mode 100644 index 0000000..d98b14e --- /dev/null +++ b/aws-cli-1.18.133.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a8a0293b84a63b27aef136499b0fbb4a04b05e792543568a399235a1c1c7d240 +size 1853244 diff --git a/aws-cli.changes b/aws-cli.changes index d54e815..21b4750 100644 --- a/aws-cli.changes +++ b/aws-cli.changes @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +Mon Sep 7 18:23:37 UTC 2020 - John Paul Adrian Glaubitz + +- Update to version 1.18.133 + + For detailed changes see + https://github.com/aws/aws-cli/blob/1.18.133/CHANGELOG.rst + + Forward port hide_py_pckgmgmt.patch + + Update Requires in spec file from setup.py + ------------------------------------------------------------------- Wed Aug 12 11:25:30 UTC 2020 - John Paul Adrian Glaubitz diff --git a/aws-cli.spec b/aws-cli.spec index db0c65e..05b9c9d 100644 --- a/aws-cli.spec +++ b/aws-cli.spec @@ -17,7 +17,7 @@ Name: aws-cli -Version: 1.18.117 +Version: 1.18.133 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.40 +Requires: python3-botocore >= 1.17.56 Requires: python3-colorama <= 0.4.4 Requires: python3-colorama >= 0.2.5 Requires: python3-docutils >= 0.10 @@ -51,7 +51,7 @@ BuildRequires: python-setuptools Requires: python Requires: python-PyYAML <= 5.4 Requires: python-PyYAML >= 3.10 -Requires: python-botocore >= 1.17.40 +Requires: python-botocore >= 1.17.56 Requires: python-colorama <= 0.3.9 Requires: python-colorama >= 0.2.5 Requires: python-docutils >= 0.10 diff --git a/hide_py_pckgmgmt.patch b/hide_py_pckgmgmt.patch index 4c7cee1..dd75eec 100644 --- a/hide_py_pckgmgmt.patch +++ b/hide_py_pckgmgmt.patch @@ -1,16 +1,16 @@ ---- setup.py.orig 2020-08-11 20:10:30.000000000 +0200 -+++ setup.py 2020-08-12 13:23:05.368663655 +0200 +--- 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.40', +- 'botocore==1.17.56', - 'docutils>=0.10,<0.16', - 's3transfer>=0.3.0,<0.4.0', -] +# install_requires = [ -+# 'botocore==1.17.40', ++# 'botocore==1.17.56', +# 'docutils>=0.10,<0.16', +# 's3transfer>=0.3.0,<0.4.0', +# ]