diff --git a/hide_py_pckgmgmt.patch b/hide_py_pckgmgmt.patch new file mode 100644 index 0000000..107e061 --- /dev/null +++ b/hide_py_pckgmgmt.patch @@ -0,0 +1,31 @@ +Index: botocore-1.10.62/setup.py +=================================================================== +--- botocore-1.10.62.orig/setup.py ++++ botocore-1.10.62/setup.py +@@ -42,6 +42,7 @@ if sys.version_info[:2] == (2, 6): + else: + requires.append('python-dateutil>=2.1,<3.0.0') + ++requires = [] + + setup( + name='botocore', +@@ -56,12 +57,12 @@ setup( + 'botocore.vendored.requests': ['*.pem']}, + include_package_data=True, + install_requires=requires, +- extras_require={ +- ':python_version=="2.6"': [ +- 'ordereddict==1.1', +- 'simplejson==3.3.0', +- ] +- }, ++# extras_require={ ++# ':python_version=="2.6"': [ ++# 'ordereddict==1.1', ++# 'simplejson==3.3.0', ++# ] ++# }, + license="Apache License 2.0", + classifiers=( + 'Development Status :: 5 - Production/Stable', diff --git a/python-botocore.changes b/python-botocore.changes index c2ff1c2..d33418e 100644 --- a/python-botocore.changes +++ b/python-botocore.changes @@ -1,10 +1,15 @@ +------------------------------------------------------------------- +Fri Aug 3 12:34:51 UTC 2018 - rjschwei@suse.com + +- Hide the Python package management requirements + + add hide_py_pckgmgmt.patch +- Remove the bundled requests and six module + ------------------------------------------------------------------- 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 27e4175..4ba3ec0 100644 --- a/python-botocore.spec +++ b/python-botocore.spec @@ -25,8 +25,9 @@ License: Apache-2.0 Group: Development/Languages/Python Url: https://github.com/boto/botocore Source: https://files.pythonhosted.org/packages/source/b/botocore/botocore-%{version}.tar.gz +Patch0: hide_py_pckgmgmt.patch # PATCH-FIX-OPENSUSE fix_tests.patch -- fix tests with removed vendored packages -Patch0: fix_tests.patch +Patch1: fix_tests.patch BuildRequires: %{python_module devel} BuildRequires: %{python_module docutils >= 0.10} BuildRequires: %{python_module jmespath < 1.0.0} @@ -59,6 +60,12 @@ A low-level interface to a growing number of Amazon Web Services. %prep %setup -q -n botocore-%{version} %patch0 -p1 +%patch1 -p1 +# remove bundeled 3rd party Python modules +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 @@ -71,8 +78,6 @@ A low-level interface to a growing number of Amazon Web Services. %files %{python_files} %doc README.rst %license LICENSE.txt -# these are just symlinks, nothing bundled -%{python_sitelib}/botocore/vendored/* %{python_sitelib}/botocore/ %{python_sitelib}/botocore-%{version}-py%{py_ver}.egg-info