From 8597cedc2a7fcbc53312db6883766975c995e411e3892df7575a6c2cb4631653 Mon Sep 17 00:00:00 2001 From: Robert Schweikert Date: Thu, 30 Jan 2020 19:01:59 +0000 Subject: [PATCH 1/3] Accepting request 768717 from home:glaubitz:branches:Cloud:Tools - Update to version 1.17.9 + For detailed changes see https://github.com/aws/aws-cli/blob/1.17.9/CHANGELOG.rst + Forward port hide_py_pckgmgmt.patch + Update Requires in spec file from setup.py OBS-URL: https://build.opensuse.org/request/show/768717 OBS-URL: https://build.opensuse.org/package/show/Cloud:Tools/aws-cli?expand=0&rev=76 --- aws-cli-1.16.297.tar.gz | 3 -- aws-cli-1.17.9.tar.gz | 3 ++ aws-cli.changes | 9 ++++++ aws-cli.spec | 51 ++++++++++++++--------------- hide_py_pckgmgmt.patch | 72 ++++++++--------------------------------- 5 files changed, 51 insertions(+), 87 deletions(-) delete mode 100644 aws-cli-1.16.297.tar.gz create mode 100644 aws-cli-1.17.9.tar.gz diff --git a/aws-cli-1.16.297.tar.gz b/aws-cli-1.16.297.tar.gz deleted file mode 100644 index a84d677..0000000 --- a/aws-cli-1.16.297.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:6226f210fd7efc85a24f6fadc53bc714f96dddf2477f18afd7f179e4178170e9 -size 1553276 diff --git a/aws-cli-1.17.9.tar.gz b/aws-cli-1.17.9.tar.gz new file mode 100644 index 0000000..097f4b7 --- /dev/null +++ b/aws-cli-1.17.9.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d36925052eafa989b071c37d3deb082957381643a2aad0c4a64facd428e1c290 +size 1664017 diff --git a/aws-cli.changes b/aws-cli.changes index 065962d..5f05678 100644 --- a/aws-cli.changes +++ b/aws-cli.changes @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +Thu Jan 30 12:47:41 UTC 2020 - John Paul Adrian Glaubitz + +- Update to version 1.17.9 + + For detailed changes see + https://github.com/aws/aws-cli/blob/1.17.9/CHANGELOG.rst + + Forward port hide_py_pckgmgmt.patch + + Update Requires in spec file from setup.py + ------------------------------------------------------------------- Thu Dec 5 14:00:30 UTC 2019 - John Paul Adrian Glaubitz diff --git a/aws-cli.spec b/aws-cli.spec index 2b2a7ac..39cab0b 100644 --- a/aws-cli.spec +++ b/aws-cli.spec @@ -1,7 +1,7 @@ # # spec file for package aws-cli # -# Copyright (c) 2020 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2020 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,7 +17,7 @@ Name: aws-cli -Version: 1.16.297 +Version: 1.17.9 Release: 0 Summary: Amazon Web Services Command Line Interface License: Apache-2.0 @@ -25,40 +25,40 @@ Group: System/Management URL: https://github.com/aws/aws-cli Source0: %{name}-%{version}.tar.gz Patch0: hide_py_pckgmgmt.patch -Requires: groff BuildRequires: fdupes +Requires: groff +BuildArch: noarch %if 0%{?suse_version} && 0%{?suse_version} > 1315 +BuildRequires: python3-devel +BuildRequires: python3-setuptools Requires: python3 -Requires: python3-PyYAML <= 6.0.0 -Requires: python3-PyYAML >= 3.10 -Requires: python3-botocore >= 1.13.33 -Requires: python3-colorama <= 0.4.2 -Requires: python3-colorama >= 0.2.5 -Requires: python3-docutils >= 0.10 -Requires: python3-rsa < 5.0.0 -Requires: python3-rsa >= 3.1.2 +Requires: python3-PyYAML <= 6.0.0 +Requires: python3-PyYAML >= 3.10 +Requires: python3-botocore >= 1.13.33 +Requires: python3-colorama <= 0.4.2 +Requires: python3-colorama >= 0.2.5 +Requires: python3-docutils >= 0.10 +Requires: python3-rsa < 5.0.0 +Requires: python3-rsa >= 3.1.2 Requires: python3-s3transfer < 0.3.0 Requires: python3-s3transfer >= 0.2.0 Requires: python3-six -BuildRequires: python3-devel -BuildRequires: python3-setuptools %else +BuildRequires: python-devel +BuildRequires: python-setuptools Requires: python -Requires: python-PyYAML <= 3.13 -Requires: python-PyYAML >= 3.10 -Requires: python-botocore >= 1.12.93 -Requires: python-colorama <= 0.3.9 -Requires: python-colorama >= 0.2.5 -Requires: python-docutils >= 0.10 -Requires: python-rsa <= 3.5.0 -Requires: python-rsa >= 3.1.2 +Requires: python-PyYAML <= 3.13 +Requires: python-PyYAML >= 3.10 +Requires: python-botocore >= 1.12.93 +Requires: python-colorama <= 0.3.9 +Requires: python-colorama >= 0.2.5 +Requires: python-docutils >= 0.10 +Requires: python-rsa <= 3.5.0 +Requires: python-rsa >= 3.1.2 Requires: python-s3transfer < 0.3.0 Requires: python-s3transfer >= 0.2.0 Requires: python-six -BuildRequires: python-devel -BuildRequires: python-setuptools %endif -BuildArch: noarch %description The AWS Command Line Interface (CLI) is a unified tool to manage AWS @@ -92,9 +92,8 @@ find %{buildroot}%{python_sitelib}/awscli/examples -type f -exec chmod 644 {} \; rm %{buildroot}/%{_bindir}/aws.cmd %files -%defattr(-,root,root,-) %doc CHANGELOG.rst README.rst -%license LICENSE.txt +%license LICENSE.txt %if 0%{?suse_version} && 0%{?suse_version} > 1315 %dir %{python3_sitelib}/awscli %dir %{python3_sitelib}/awscli-%{version}-py%{py3_ver}.egg-info diff --git a/hide_py_pckgmgmt.patch b/hide_py_pckgmgmt.patch index d6ce1d3..604f2d9 100644 --- a/hide_py_pckgmgmt.patch +++ b/hide_py_pckgmgmt.patch @@ -1,76 +1,32 @@ ---- setup.py.orig 2019-12-05 02:29:27.000000000 +0100 -+++ setup.py 2019-12-05 15:00:13.566501035 +0100 -@@ -23,30 +23,30 @@ +--- setup.py.orig 2020-01-24 20:08:21.000000000 +0100 ++++ setup.py 2020-01-30 13:34:42.183694744 +0100 +@@ -23,12 +23,12 @@ raise RuntimeError("Unable to find version string.") --install_requires = ['botocore==1.13.33', +-install_requires = ['botocore==1.14.9', - 'docutils>=0.10,<0.16', - 'rsa>=3.1.2,<=3.5.0', -- 's3transfer>=0.2.0,<0.3.0'] -- -- --if sys.version_info[:2] == (2, 6): -- # For python2.6 we have to require argparse since it -- # was not in stdlib until 2.7. -- install_requires.append('argparse>=1.1') -- -- # For Python 2.6, we have to require a different verion of PyYAML since the latest -- # versions dropped support for Python 2.6. -- install_requires.append('PyYAML>=3.10,<=3.13') -- -- # Colorama removed support for EOL pythons. -- install_requires.append('colorama>=0.2.5,<=0.3.9') --elif sys.version_info[:2] == (3, 3): -- install_requires.append('PyYAML>=3.10,<=3.13') -- # Colorama removed support for EOL pythons. -- install_requires.append('colorama>=0.2.5,<=0.3.9') --else: -- install_requires.append('PyYAML>=3.10,<5.2') -- install_requires.append('colorama>=0.2.5,<0.4.2') -+# install_requires = ['botocore==1.13.33', +- 's3transfer>=0.3.0,<0.4.0', +- 'PyYAML>=3.10,<5.3', +- 'colorama>=0.2.5,<0.4.2'] ++# install_requires = ['botocore==1.14.9', +# 'docutils>=0.10,<0.16', +# 'rsa>=3.1.2,<=3.5.0', -+# 's3transfer>=0.2.0,<0.3.0'] -+ -+ -+# if sys.version_info[:2] == (2, 6): -+# # For python2.6 we have to require argparse since it -+# # was not in stdlib until 2.7. -+# install_requires.append('argparse>=1.1') -+ -+# # For Python 2.6, we have to require a different verion of PyYAML since the latest -+# # versions dropped support for Python 2.6. -+# install_requires.append('PyYAML>=3.10,<=3.13') -+ -+# # Colorama removed support for EOL pythons. -+# install_requires.append('colorama>=0.2.5,<=0.3.9') -+# elif sys.version_info[:2] == (3, 3): -+# install_requires.append('PyYAML>=3.10,<=3.13') -+# # Colorama removed support for EOL pythons. -+# install_requires.append('colorama>=0.2.5,<=0.3.9') -+# else: -+# install_requires.append('PyYAML>=3.10,<5.2') -+# install_requires.append('colorama>=0.2.5,<0.4.2') ++# 's3transfer>=0.3.0,<0.4.0', ++# 'PyYAML>=3.10,<5.3', ++# 'colorama>=0.2.5,<0.4.2'] setup_options = dict( -@@ -64,12 +64,12 @@ +@@ -46,8 +46,8 @@ 'examples/*/*.txt', 'examples/*/*/*.txt', 'examples/*/*/*.rst', 'topics/*.rst', 'topics/*.json']}, - install_requires=install_requires, -- extras_require={ -- ':python_version=="2.6"': [ -- 'argparse>=1.1', -- ] -- }, +- extras_require={}, + # install_requires=install_requires, -+ # extras_require={ -+ # ':python_version=="2.6"': [ -+ # 'argparse>=1.1', -+ # ] -+ # }, ++ # extras_require={}, license="Apache License 2.0", classifiers=[ 'Development Status :: 5 - Production/Stable', From f2b4607e56164c0d29660aab252f45e96003debcd456dc4f272b14086410eba8 Mon Sep 17 00:00:00 2001 From: John Paul Adrian Glaubitz Date: Fri, 31 Jan 2020 08:43:35 +0000 Subject: [PATCH 2/3] - Fix versioning for python3-s3transfer in Requires OBS-URL: https://build.opensuse.org/package/show/Cloud:Tools/aws-cli?expand=0&rev=77 --- aws-cli.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/aws-cli.spec b/aws-cli.spec index 39cab0b..0ee3fab 100644 --- a/aws-cli.spec +++ b/aws-cli.spec @@ -40,8 +40,8 @@ Requires: python3-colorama >= 0.2.5 Requires: python3-docutils >= 0.10 Requires: python3-rsa < 5.0.0 Requires: python3-rsa >= 3.1.2 -Requires: python3-s3transfer < 0.3.0 -Requires: python3-s3transfer >= 0.2.0 +Requires: python3-s3transfer < 0.4.0 +Requires: python3-s3transfer >= 0.3.0 Requires: python3-six %else BuildRequires: python-devel From e0d94096d236244d5e3dcde36e9f18aec8a3976c6edf3d57a2b51f80ed5692da Mon Sep 17 00:00:00 2001 From: John Paul Adrian Glaubitz Date: Fri, 31 Jan 2020 08:45:36 +0000 Subject: [PATCH 3/3] - Fix versioning for python3-s3transfer for SLE-12 in Requires OBS-URL: https://build.opensuse.org/package/show/Cloud:Tools/aws-cli?expand=0&rev=78 --- aws-cli.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/aws-cli.spec b/aws-cli.spec index 0ee3fab..732232e 100644 --- a/aws-cli.spec +++ b/aws-cli.spec @@ -55,8 +55,8 @@ Requires: python-colorama >= 0.2.5 Requires: python-docutils >= 0.10 Requires: python-rsa <= 3.5.0 Requires: python-rsa >= 3.1.2 -Requires: python-s3transfer < 0.3.0 -Requires: python-s3transfer >= 0.2.0 +Requires: python-s3transfer < 0.4.0 +Requires: python-s3transfer >= 0.3.0 Requires: python-six %endif