From cfd86b7910e11068e12e4508ea5ce7c9a5e417e70c68980aeffab423ba98e71a Mon Sep 17 00:00:00 2001 From: Robert Schweikert Date: Fri, 3 Aug 2018 12:06:50 +0000 Subject: [PATCH] - Remove the broken attempt to avoid using the bundeled requests module provided by the source (boo#1088310) + Problem introduced by commit Thu May 10 09:05:58 UTC 2018 - tchvatal@suse.com OBS-URL: https://build.opensuse.org/package/show/devel:languages:python:aws/python-botocore?expand=0&rev=11 --- python-botocore.changes | 8 ++++++++ python-botocore.spec | 11 ----------- 2 files changed, 8 insertions(+), 11 deletions(-) diff --git a/python-botocore.changes b/python-botocore.changes index 66783d3..c2ff1c2 100644 --- a/python-botocore.changes +++ b/python-botocore.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Fri Aug 3 12:04:41 UTC 2018 - rjschwei@suse.com + +- Remove the broken attempt to avoid using the bundeled requests module + provided by the source (boo#1088310) + + Problem introduced by commit + Thu May 10 09:05:58 UTC 2018 - tchvatal@suse.com + ------------------------------------------------------------------- Sun Jul 22 20:43:56 UTC 2018 - adrian.glaubitz@suse.com diff --git a/python-botocore.spec b/python-botocore.spec index 789ca8f..27e4175 100644 --- a/python-botocore.spec +++ b/python-botocore.spec @@ -59,25 +59,14 @@ A low-level interface to a growing number of Amazon Web Services. %prep %setup -q -n botocore-%{version} %patch0 -p1 -# remove requests and six -rm -r botocore/vendored/ -# fix all imports: -sed -i 's/from botocore\.vendored //' botocore/*.py tests/unit/*.py -sed -i 's/botocore\.vendored\.//' botocore/*.py tests/unit/*.py tests/unit/auth/*.py %build %python_build %install %python_install -%python_expand %fdupes %{buildroot}%{$python_sitelib} -# just for compat sake symlink the bundles as other pkgs import it :/ -%python_expand mkdir -p %{buildroot}%{$python_sitelib}/botocore/vendored -%python_expand ln -s %{$python_sitelib}/six.py %{buildroot}%{$python_sitelib}/botocore/vendored/six.py -%python_expand ln -s %{$python_sitelib}/requests %{buildroot}%{$python_sitelib}/botocore/vendored/requests %check -%python_expand nosetests-%{$python_bin_suffix} tests/unit %files %{python_files} %doc README.rst