From 705f593f2176b91440b867059ec1dac9fd4d9ccf1ffea8de4cb5882066a63ac9 Mon Sep 17 00:00:00 2001 From: Robert Schweikert Date: Tue, 12 Sep 2017 22:05:07 +0000 Subject: [PATCH] - Update to version 1.11.151 + For detailed changes see https://github.com/aws/aws-cli/blob/1.11.151/CHANGELOG.rst + Forward port hide_py_pckgmgmt.patch - Remove build capability for SLE 11 - Set up for Python 3 build distro > SLE 12 openSUSE Leap 42.x OBS-URL: https://build.opensuse.org/package/show/Cloud:Tools/aws-cli?expand=0&rev=33 --- aws-cli-1.11.104.tar.gz | 3 --- aws-cli-1.11.151.tar.gz | 3 +++ aws-cli.changes | 10 +++++++++ aws-cli.spec | 46 ++++++++++++++++++++++++++++++----------- hide_py_pckgmgmt.patch | 4 ++-- 5 files changed, 49 insertions(+), 17 deletions(-) delete mode 100644 aws-cli-1.11.104.tar.gz create mode 100644 aws-cli-1.11.151.tar.gz diff --git a/aws-cli-1.11.104.tar.gz b/aws-cli-1.11.104.tar.gz deleted file mode 100644 index 43784d1..0000000 --- a/aws-cli-1.11.104.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:9807e4034f06a149a02f07800c945439c39b6cd52bf6c869660d993ae7c1132c -size 983989 diff --git a/aws-cli-1.11.151.tar.gz b/aws-cli-1.11.151.tar.gz new file mode 100644 index 0000000..dcbf4ca --- /dev/null +++ b/aws-cli-1.11.151.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:608610138d823374c5ccc747463f7d3425cc306ef7d2ab5dec436befb6d2126c +size 992839 diff --git a/aws-cli.changes b/aws-cli.changes index ff0044a..24020ba 100644 --- a/aws-cli.changes +++ b/aws-cli.changes @@ -1,3 +1,13 @@ +------------------------------------------------------------------- +Tue Sep 12 22:02:55 UTC 2017 - rjschwei@suse.com + +- Update to version 1.11.151 + + For detailed changes see + https://github.com/aws/aws-cli/blob/1.11.151/CHANGELOG.rst + + Forward port hide_py_pckgmgmt.patch +- Remove build capability for SLE 11 +- Set up for Python 3 build distro > SLE 12 openSUSE Leap 42.x + ------------------------------------------------------------------- Wed Jun 14 21:22:11 UTC 2017 - rjschwei@suse.com diff --git a/aws-cli.spec b/aws-cli.spec index 0b0e84e..e31b6a5 100644 --- a/aws-cli.spec +++ b/aws-cli.spec @@ -17,7 +17,7 @@ Name: aws-cli -Version: 1.11.104 +Version: 1.11.151 Release: 0 Summary: Amazon Web Services Command Line Interface License: Apache-2.0 @@ -25,13 +25,25 @@ Group: System/Management Url: https://github.com/aws/aws-cli Source0: %{name}-%{version}.tar.gz Patch0: hide_py_pckgmgmt.patch +%if 0%{?suse_version} && 0%{?suse_version} > 1315 +Requires: python3 +Requires: python3-PyYAML <= 3.12 +Requires: python3-PyYAML >= 3.10 +Requires: python3-botocore >= 1.7.9 +Requires: python3-colorama <= 0.3.8 +Requires: python3-colorama >= 0.2.5 +Requires: python3-docutils >= 0.10 +Requires: python3-rsa <= 3.5.0 +Requires: python3-rsa >= 3.1.2 +Requires: python3-s3transfer <= 0.2.0 +Requires: python3-s3transfer >= 0.1.9 +BuildRequires: python3-devel +BuildRequires: python3-setuptools +%else Requires: python -%if 0%{?suse_version} && 0%{?suse_version} <= 1110 -Requires: python-argparse >= 1.1 -%endif Requires: python-PyYAML <= 3.12 Requires: python-PyYAML >= 3.10 -Requires: python-botocore >= 1.5.67 +Requires: python-botocore >= 1.7.9 Requires: python-colorama <= 0.3.8 Requires: python-colorama >= 0.2.5 Requires: python-docutils >= 0.10 @@ -39,15 +51,10 @@ Requires: python-rsa <= 3.5.0 Requires: python-rsa >= 3.1.2 Requires: python-s3transfer <= 0.2.0 Requires: python-s3transfer >= 0.1.9 -BuildRequires: python BuildRequires: python-devel BuildRequires: python-setuptools -BuildRoot: %{_tmppath}/%{name}-%{version}-build -%if 0%{?suse_version} && 0%{?suse_version} <= 1110 -%{!?python_sitelib: %global python_sitelib %(python -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} -%else -BuildArch: noarch %endif +BuildArch: noarch %description The AWS Command Line Interface (CLI) is a unified tool to manage your AWS services. With just one tool to download and configure, you can control multiple AWS services from the command line and automate them through scripts. @@ -57,20 +64,35 @@ The AWS Command Line Interface (CLI) is a unified tool to manage your AWS servic %patch0 %build +%if 0%{?suse_version} && 0%{?suse_version} > 1315 +python3 setup.py build +%else python setup.py build +%endif %install +%if 0%{?suse_version} && 0%{?suse_version} > 1315 +python3 setup.py install --prefix=%{_prefix} --root=%{buildroot} --install-scripts=%{_bindir} +%else python setup.py install --prefix=%{_prefix} --root=%{buildroot} --install-scripts=%{_bindir} +%endif # No DOS crap rm %{buildroot}/%{_bindir}/aws.cmd %files %defattr(-,root,root,-) %doc CHANGELOG.rst LICENSE.txt README.rst +%if 0%{?suse_version} && 0%{?suse_version} > 1315 +%dir %{python3_sitelib}/awscli +%dir %{python3_sitelib}/awscli-%{version}-py%{py3_ver}.egg-info +%{python3_sitelib}/awscli/* +%{python3_sitelib}/*egg-info/* +%else %dir %{python_sitelib}/awscli %dir %{python_sitelib}/awscli-%{version}-py%{py_ver}.egg-info -%{_bindir}/* %{python_sitelib}/awscli/* %{python_sitelib}/*egg-info/* +%endif +%{_bindir}/* %changelog diff --git a/hide_py_pckgmgmt.patch b/hide_py_pckgmgmt.patch index ed81b65..1a140ff 100644 --- a/hide_py_pckgmgmt.patch +++ b/hide_py_pckgmgmt.patch @@ -4,13 +4,13 @@ raise RuntimeError("Unable to find version string.") --requires = ['botocore==1.5.67', +-requires = ['botocore==1.7.9', - 'colorama>=0.2.5,<=0.3.7', - 'docutils>=0.10', - 'rsa>=3.1.2,<=3.5.0', - 's3transfer>=0.1.9,<0.2.0', - 'PyYAML>=3.10,<=3.12'] -+#requires = ['botocore==1.5.67', ++#requires = ['botocore==1.7.9', +# 'colorama>=0.2.5,<=0.3.7', +# 'docutils>=0.10', +# 'rsa>=3.1.2,<=3.5.0',