Update to 1.17.9

Signed-off-by: Igor Raits <ignatenkobrain@fedoraproject.org>

.gitignore

@@ -114,3 +114,4 @@
 /awscli-1.16.263.tar.gz
 /awscli-1.16.266.tar.gz
 /awscli-1.16.309.tar.gz
+/awscli-1.17.9.tar.gz

awscli.spec

@@ -1,56 +1,18 @@
-%{?python_enable_dependency_generator}
-%if 0%{?rhel} && 0%{?rhel} <= 7
-%bcond_with python3
-%else
-%bcond_without python3
-%endif
-
-%global botocore_version        1.13.45
-
 Name:           awscli
-Version:        1.16.309
+Version:        1.17.9
-Release:        2%{?dist}
+Release:        1%{?dist}
 Summary:        Universal Command Line Environment for AWS
 
 License:        ASL 2.0 and MIT
-URL:            http://aws.amazon.com/cli
+URL:            https://aws.amazon.com/cli/
-Source0:        https://files.pythonhosted.org/packages/source/a/%{name}/%{name}-%{version}.tar.gz
+Source0:        %{pypi_source}
 
 BuildArch:      noarch
-%if %{with python3}
 BuildRequires:  python3-devel
 BuildRequires:  python3-setuptools
-%if %{undefined __pythondist_requires}
-Requires:       python3-botocore = %{botocore_version}
-Requires:       python3-colorama >= 0.2.5
-Requires:       python3-docutils >= 0.10
-Requires:       python3-rsa >= 3.1.2
-Requires:       python3-s3transfer >= 0.1.9
-Requires:       python3-PyYAML >= 3.10
-%endif
-%else
-BuildRequires:  python2-devel
-BuildRequires:  python-setuptools
-%if %{undefined __pythondist_requires}
-Requires:       python2-botocore = %{botocore_version}
-Requires:       python-colorama >= 0.2.5
-Requires:       python-docutils >= 0.10
-Requires:       python2-rsa >= 3.1.2
-Requires:       python2-s3transfer >= 0.1.9
-Requires:       PyYAML >= 3.10
-%endif
-%endif # with python3
-%if ! (0%{?rhel} && 0%{?rhel} <= 7)
-Recommends:     bash-completion
-Recommends:     zsh
 Recommends:     groff
-%endif # Fedora
 
-%if %{with python3}
 %{?python_provide:%python_provide python3-%{name}}
-%else
-%{?python_provide:%python_provide python2-%{name}}
-%endif # with python3
 
 %description
 This package provides a unified
@@ -58,53 +20,38 @@ command line interface to Amazon Web Services.
 
 %prep
 %autosetup -n %{name}-%{version} -p 1
-rm -rf %{name}.egg-info
+rm -vr %{name}.egg-info
+find awscli/examples/ -type f -name '*.rst' -executable -exec chmod -x '{}' +
 
 %build
-%if %{with python3}
 %py3_build
-%else
-%py2_build
-%endif # with python3
 
 %install
-%if %{with python3}
 %py3_install
-%else
+rm -vf %{buildroot}%{_bindir}/{aws_bash_completer,aws_zsh_completer.sh,aws.cmd}
-%py2_install
+install -Dpm0644 bin/aws_bash_completer \
-%endif # with python3
+  %{buildroot}%{_datadir}/bash-completion/completions/aws
-# Fix path and permissions for bash completition
+install -Dpm0644 bin/aws_zsh_completer.sh \
-%global bash_completion_dir /etc/bash_completion.d
+  %{buildroot}%{_datadir}/zsh/site-functions/_awscli
-mkdir -p %{buildroot}%{bash_completion_dir}
-mv %{buildroot}%{_bindir}/aws_bash_completer %{buildroot}%{bash_completion_dir}
-chmod 644 %{buildroot}%{bash_completion_dir}/aws_bash_completer
-# Fix path and permissions for zsh completition
-%global zsh_completion_dir /usr/share/zsh/site-functions
-mkdir -p %{buildroot}%{zsh_completion_dir}
-mv %{buildroot}%{_bindir}/aws_zsh_completer.sh %{buildroot}%{zsh_completion_dir}
-chmod 755 %{buildroot}%{zsh_completion_dir}/aws_zsh_completer.sh
-ls -alh %{buildroot}%{zsh_completion_dir}/aws_zsh_completer.sh
-# We don't need the Windows CMD script
-rm %{buildroot}%{_bindir}/aws.cmd
 
 %files
 %doc README.rst
 %license LICENSE.txt
 %{_bindir}/aws
 %{_bindir}/aws_completer
-%dir %{bash_completion_dir}
+%{python3_sitelib}/awscli/
-%{bash_completion_dir}/aws_bash_completer
+%{python3_sitelib}/%{name}-*.egg-info/
-%dir %{zsh_completion_dir}
+%dir %{_datadir}/bash-completion
-%{zsh_completion_dir}/aws_zsh_completer.sh
+%dir %{_datadir}/bash-completion/completions
-%if %{with python3}
+%{_datadir}/bash-completion/completions/aws
-%{python3_sitelib}/awscli
+%dir %{_datadir}/zsh
-%{python3_sitelib}/%{name}-%{version}-py?.?.egg-info
+%dir %{_datadir}/zsh/site-functions
-%else
+%{_datadir}/zsh/site-functions/_awscli
-%{python2_sitelib}/awscli
-%{python2_sitelib}/%{name}-%{version}-py?.?.egg-info
-%endif # with python3
 
 %changelog
+* Wed Jan 29 2020 Igor Raits <ignatenkobrain@fedoraproject.org> - 1.17.9-1
+- Update to 1.17.9
+
 * Tue Jan 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.16.309-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
 

sources

@@ -1 +1 @@
-SHA512 (awscli-1.16.309.tar.gz) = e3f90f207b92eabad96cdd75e77438b7128e595ded1241edc18c6fed27d2c3fe1b7cebdff838410d7bb10d9a483666a42ae3c3b2aec4601c6efd30e3bd107c91
+SHA512 (awscli-1.17.9.tar.gz) = 7ec848ac07c20fe72cd9621d23291fe594ed9d8785296564c390db48e553b9ac4ac8d78dc897b23f566d34daaf0f289b389f811466c49b06d67a6ba742875eaa