Accepting request 774998 from home:glaubitz:branches:Cloud:Tools

- Update to version 1.18.0
  + For detailed changes see
    https://github.com/aws/aws-cli/blob/1.18.0/CHANGELOG.rst
  + Forward port hide_py_pckgmgmt.patch
  + Install aws bash completetion script into system path
  + Install aws zsh completion script into /etc/zsh_completion.d
  + Update Requires in spec file from setup.py

OBS-URL: https://build.opensuse.org/request/show/774998
OBS-URL: https://build.opensuse.org/package/show/Cloud:Tools/aws-cli?expand=0&rev=83

aws-cli-1.17.9.tar.gz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:d36925052eafa989b071c37d3deb082957381643a2aad0c4a64facd428e1c290
-size 1664017

aws-cli-1.18.0.tar.gz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:3433bd5e5ce9e59da3548f0d066c56a5eab8ada43e6ff2dec24d90b75a7215da
+size 1695733

aws-cli.changes

@@ -1,3 +1,14 @@
+-------------------------------------------------------------------
+Mon Feb 17 20:08:19 UTC 2020 - John Paul Adrian Glaubitz <adrian.glaubitz@suse.com>
+
+- Update to version 1.18.0
+  + For detailed changes see
+    https://github.com/aws/aws-cli/blob/1.18.0/CHANGELOG.rst
+  + Forward port hide_py_pckgmgmt.patch
+  + Install aws bash completetion script into system path
+  + Install aws zsh completion script into /etc/zsh_completion.d
+  + Update Requires in spec file from setup.py
+
 -------------------------------------------------------------------
 Fri Feb 14 13:33:26 UTC 2020 - Dirk Mueller <dmueller@suse.com>
 

aws-cli.spec

@@ -17,7 +17,7 @@
 
 
 Name:           aws-cli
-Version:        1.17.9
+Version:        1.18.0
 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.13.33
+Requires:       python3-botocore >= 1.15.0
 Requires:       python3-colorama <= 0.4.2
 Requires:       python3-colorama >= 0.2.5
 Requires:       python3-docutils >= 0.10
@@ -91,9 +91,9 @@ find %{buildroot}%{python_sitelib}/awscli/examples -type f -exec chmod 644 {} \;
 %endif
 # No DOS crap
 rm %{buildroot}/%{_bindir}/aws.cmd
-# bash completion
+# Shell completion
-install -d -m 755 %{buildroot}%{_sysconfdir}/bash_completion.d
+install -DTm644 %{buildroot}%{_bindir}/aws_bash_completer %{buildroot}%{_datadir}/bash-completion/completions/aws
-ln -s %{_bindir}/aws_bash_completer %{buildroot}%{_sysconfdir}/bash_completion.d/aws
+install -DTm644 %{buildroot}%{_bindir}/aws_zsh_completer.sh %{buildroot}%{_sysconfdir}/zsh_completion.d/_aws
 
 %files
 %doc CHANGELOG.rst README.rst
@@ -109,7 +109,11 @@ ln -s %{_bindir}/aws_bash_completer %{buildroot}%{_sysconfdir}/bash_completion.d
 %{python_sitelib}/awscli/*
 %{python_sitelib}/*egg-info/*
 %endif
-%{_bindir}/*
+%{_bindir}/aws
-%{_sysconfdir}/bash_completion.d/aws
+%{_bindir}/aws_completer
+%exclude %{_bindir}/aws_bash_completer
+%exclude %{_bindir}/aws_zsh_completer.sh
+%{_datadir}/bash-completion/completions/aws
+%{_sysconfdir}/zsh_completion.d
 
 %changelog

hide_py_pckgmgmt.patch

@@ -1,25 +1,37 @@
---- setup.py.orig	2020-01-24 20:08:21.000000000 +0100
+--- setup.py.orig	2020-02-14 20:07:25.000000000 +0100
-+++ setup.py	2020-01-30 13:34:42.183694744 +0100
++++ setup.py	2020-02-17 19:55:53.766213224 +0100
-@@ -23,12 +23,12 @@
+@@ -23,19 +23,19 @@
      raise RuntimeError("Unable to find version string.")
  
  
--install_requires = ['botocore==1.14.9',
+-install_requires = [
--                    'docutils>=0.10,<0.16',
+-    'botocore==1.15.0',
--                    'rsa>=3.1.2,<=3.5.0',
+-    'docutils>=0.10,<0.16',
--                    's3transfer>=0.3.0,<0.4.0',
+-    'rsa>=3.1.2,<=3.5.0',
--                    'PyYAML>=3.10,<5.3',
+-    's3transfer>=0.3.0,<0.4.0',
--                    'colorama>=0.2.5,<0.4.2']
+-    'PyYAML>=3.10,<5.3',
-+# install_requires = ['botocore==1.14.9',
+-]
-+#                     'docutils>=0.10,<0.16',
++# install_requires = [
-+#                     'rsa>=3.1.2,<=3.5.0',
++#     'botocore==1.15.0',
-+#                     's3transfer>=0.3.0,<0.4.0',
++#     'docutils>=0.10,<0.16',
-+#                     'PyYAML>=3.10,<5.3',
++#     'rsa>=3.1.2,<=3.5.0',
-+#                     'colorama>=0.2.5,<0.4.2']
++#     's3transfer>=0.3.0,<0.4.0',
++#     'PyYAML>=3.10,<5.3',
++# ]
+ 
+ 
+-if sys.version_info[:2] == (3, 4):
+-    install_requires.append('colorama>=0.2.5,<0.4.2')
+-else:
+-    install_requires.append('colorama>=0.2.5,<0.4.4')
++# if sys.version_info[:2] == (3, 4):
++#     install_requires.append('colorama>=0.2.5,<0.4.2')
++# else:
++#     install_requires.append('colorama>=0.2.5,<0.4.4')
  
  
  setup_options = dict(
-@@ -46,8 +46,8 @@
+@@ -53,8 +53,8 @@
                               'examples/*/*.txt', 'examples/*/*/*.txt',
                               'examples/*/*/*.rst', 'topics/*.rst',
                               'topics/*.json']},