From fa16c4459fa459fc49eaa7e6c6a2f27c89333616 Mon Sep 17 00:00:00 2001 From: Carl George Date: Thu, 11 Oct 2018 09:51:02 -0500 Subject: [PATCH] Add patch0 to relax dependencies --- awscli.spec | 8 ++++++-- relax-dependencies.patch | 25 +++++++++++++++++++++++++ 2 files changed, 31 insertions(+), 2 deletions(-) create mode 100644 relax-dependencies.patch diff --git a/awscli.spec b/awscli.spec index 31d5003..63f5484 100644 --- a/awscli.spec +++ b/awscli.spec @@ -8,12 +8,13 @@ Name: awscli Version: 1.16.28 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Universal Command Line Environment for AWS License: ASL 2.0 and MIT URL: http://aws.amazon.com/cli Source0: https://files.pythonhosted.org/packages/source/a/%{name}/%{name}-%{version}.tar.gz +Patch0: relax-dependencies.patch BuildArch: noarch %if %{with python3} BuildRequires: python3-devel @@ -51,7 +52,7 @@ This package provides a unified command line interface to Amazon Web Services. %prep -%setup -q -n %{name}-%{version} +%autosetup -n %{name}-%{version} -p 1 rm -rf %{name}.egg-info %build @@ -100,6 +101,9 @@ rm %{buildroot}%{_bindir}/aws.cmd %endif # with python3 %changelog +* Tue Nov 06 2018 Carl George - 1.16.28-3 +- Add patch0 to relax dependencies + * Wed Oct 17 2018 Justin W. Flory - 1.16.28-2 - Add groff dependency, fix 'aws help' issue in stock install diff --git a/relax-dependencies.patch b/relax-dependencies.patch new file mode 100644 index 0000000..cc0f68c --- /dev/null +++ b/relax-dependencies.patch @@ -0,0 +1,25 @@ +diff -Nurp awscli-1.16.28.orig/setup.py awscli-1.16.28/setup.py +--- awscli-1.16.28.orig/setup.py 2018-10-05 17:12:53.000000000 -0500 ++++ awscli-1.16.28/setup.py 2018-11-06 09:03:13.254273110 -0600 +@@ -23,12 +23,15 @@ def find_version(*file_paths): + raise RuntimeError("Unable to find version string.") + + +-requires = ['botocore==1.12.18', +- 'colorama>=0.2.5,<=0.3.9', +- 'docutils>=0.10', +- 'rsa>=3.1.2,<=3.5.0', +- 's3transfer>=0.1.12,<0.2.0', +- 'PyYAML>=3.10,<=3.13'] ++requires = [ ++ # upstream releases awscli and botocore in lockstep, keep this pinned ++ 'botocore==1.12.18', ++ 'colorama>=0.2.5', ++ 'docutils>=0.10', ++ 'rsa>=3.1.2', ++ 's3transfer>=0.1.12', ++ 'PyYAML>=3.10' ++] + + + if sys.version_info[:2] == (2, 6):