From 0420e5bc97743c827b8926ce2474cbfaa89faef9291c3a81420bbd908961c214 Mon Sep 17 00:00:00 2001 From: Robert Schweikert Date: Wed, 12 Jun 2019 14:28:36 +0000 Subject: [PATCH] Accepting request 709439 from home:glaubitz:branches:Cloud:Tools - Update to version 1.16.176 + For detailed changes see https://github.com/aws/aws-cli/blob/1.16.176/CHANGELOG.rst + Forward port hide_py_pckgmgmt.patch + Update Requires in spec file from setup.py - Relax version constraints for python-PyYAML and python-rsa - Run fdupes to hardlink duplicate files + Add fdupes to BuildRequires + Add %fdupes invocation to %install - Run recursive find with chmod to remove executable bit for REST files in example folder to fix rpmlint warning OBS-URL: https://build.opensuse.org/request/show/709439 OBS-URL: https://build.opensuse.org/package/show/Cloud:Tools/aws-cli?expand=0&rev=58 --- aws-cli-1.16.103.tar.gz | 3 --- aws-cli-1.16.176.tar.gz | 3 +++ aws-cli.changes | 15 +++++++++++++++ aws-cli.spec | 13 +++++++++---- hide_py_pckgmgmt.patch | 8 ++++---- 5 files changed, 31 insertions(+), 11 deletions(-) delete mode 100644 aws-cli-1.16.103.tar.gz create mode 100644 aws-cli-1.16.176.tar.gz diff --git a/aws-cli-1.16.103.tar.gz b/aws-cli-1.16.103.tar.gz deleted file mode 100644 index 4b2b03b..0000000 --- a/aws-cli-1.16.103.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:47f13fc9e29b96fe286f9fb61d1121d016dc161430b547719d1213fe1b64a50c -size 1186580 diff --git a/aws-cli-1.16.176.tar.gz b/aws-cli-1.16.176.tar.gz new file mode 100644 index 0000000..032d2f5 --- /dev/null +++ b/aws-cli-1.16.176.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:bdf3206945b932ed179a2792080318cfd30d7d519d39d67d35aba82d0f28bf61 +size 1267915 diff --git a/aws-cli.changes b/aws-cli.changes index 4c6bd48..3da091f 100644 --- a/aws-cli.changes +++ b/aws-cli.changes @@ -1,3 +1,18 @@ +------------------------------------------------------------------- +Wed Jun 12 14:10:01 UTC 2019 - John Paul Adrian Glaubitz + +- Update to version 1.16.176 + + For detailed changes see + https://github.com/aws/aws-cli/blob/1.16.176/CHANGELOG.rst + + Forward port hide_py_pckgmgmt.patch + + Update Requires in spec file from setup.py +- Relax version constraints for python-PyYAML and python-rsa +- Run fdupes to hardlink duplicate files + + Add fdupes to BuildRequires + + Add %fdupes invocation to %install +- Run recursive find with chmod to remove executable bit for + REST files in example folder to fix rpmlint warning + ------------------------------------------------------------------- Wed Feb 13 12:06:51 UTC 2019 - John Paul Adrian Glaubitz diff --git a/aws-cli.spec b/aws-cli.spec index bee6ff5..5af42e3 100644 --- a/aws-cli.spec +++ b/aws-cli.spec @@ -17,7 +17,7 @@ Name: aws-cli -Version: 1.16.103 +Version: 1.16.176 Release: 0 Summary: Amazon Web Services Command Line Interface License: Apache-2.0 @@ -25,15 +25,16 @@ Group: System/Management Url: https://github.com/aws/aws-cli Source0: %{name}-%{version}.tar.gz Patch0: hide_py_pckgmgmt.patch +BuildRequires: fdupes %if 0%{?suse_version} && 0%{?suse_version} > 1315 Requires: python3 -Requires: python3-PyYAML <= 4.0 +Requires: python3-PyYAML <= 6.0.0 Requires: python3-PyYAML >= 3.10 -Requires: python3-botocore >= 1.12.93 +Requires: python3-botocore >= 1.12.166 Requires: python3-colorama <= 0.4.1 Requires: python3-colorama >= 0.2.5 Requires: python3-docutils >= 0.10 -Requires: python3-rsa <= 3.5.0 +Requires: python3-rsa < 5.0.0 Requires: python3-rsa >= 3.1.2 Requires: python3-s3transfer < 0.3.0 Requires: python3-s3transfer >= 0.2.0 @@ -79,8 +80,12 @@ python setup.py build %install %if 0%{?suse_version} && 0%{?suse_version} > 1315 python3 setup.py install --prefix=%{_prefix} --root=%{buildroot} --install-scripts=%{_bindir} +%fdupes %{buildroot}%{python3_sitelib} +find %{buildroot}%{python3_sitelib}/awscli/examples -type f -exec chmod 644 {} \; %else python setup.py install --prefix=%{_prefix} --root=%{buildroot} --install-scripts=%{_bindir} +%fdupes %{buildroot}%{python_sitelib} +find %{buildroot}%{python_sitelib}/awscli/examples -type f -exec chmod 644 {} \; %endif # No DOS crap rm %{buildroot}/%{_bindir}/aws.cmd diff --git a/hide_py_pckgmgmt.patch b/hide_py_pckgmgmt.patch index 1f03fd8..2b4df3a 100644 --- a/hide_py_pckgmgmt.patch +++ b/hide_py_pckgmgmt.patch @@ -1,16 +1,16 @@ ---- setup.py.orig 2019-02-13 00:11:49.000000000 +0100 -+++ setup.py 2019-02-13 13:06:23.516662678 +0100 +--- setup.py.orig 2019-06-11 20:28:13.000000000 +0200 ++++ setup.py 2019-06-12 14:54:16.071249846 +0200 @@ -23,18 +23,18 @@ raise RuntimeError("Unable to find version string.") --requires = ['botocore==1.12.93', +-requires = ['botocore==1.12.166', - 'colorama>=0.2.5,<=0.3.9', - 'docutils>=0.10', - 'rsa>=3.1.2,<=3.5.0', - 's3transfer>=0.2.0,<0.3.0', - 'PyYAML>=3.10,<=3.13'] -+# requires = ['botocore==1.12.93', ++# requires = ['botocore==1.12.166', +# 'colorama>=0.2.5,<=0.3.9', +# 'docutils>=0.10', +# 'rsa>=3.1.2,<=3.5.0',