File project.diff of Package python-botocore

Overview Repositories Revisions Requests Users Attributes Meta

File project.diff of Package python-botocore (Revision f0f6a472805dd4f38a76c322279f2b3e)

Currently displaying revision f0f6a472805dd4f38a76c322279f2b3e , Show latest

--- python-botocore.changes.orig
+++ python-botocore.changes
@@ -1,4 +1,25 @@
 -------------------------------------------------------------------
+Fri Aug 10 16:24:17 UTC 2018 - tchvatal@suse.com
+
+- Run fdupes again
+- Run tests again
+- Remove python2-unittest2 dependency as it is not really needed
+  (only required on python2.6)
+
+-------------------------------------------------------------------
+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)
+
+-------------------------------------------------------------------
 Sun Jul 22 20:43:56 UTC 2018 - adrian.glaubitz@suse.com
 
 - Version update to 1.10.62
--- python-botocore.spec.orig
+++ python-botocore.spec
@@ -25,9 +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
-BuildRequires:  %{python_module devel}
+Patch1:         fix_tests.patch
 BuildRequires:  %{python_module docutils >= 0.10}
 BuildRequires:  %{python_module jmespath < 1.0.0}
 BuildRequires:  %{python_module jmespath >= 0.7.1}
@@ -49,7 +49,6 @@ BuildRequires:  %{python_module mock}
 BuildRequires:  %{python_module nose}
 BuildRequires:  %{python_module requests}
 BuildRequires:  %{python_module six}
-BuildRequires:  python-unittest2
 # /SECTION
 %python_subpackages
 
@@ -59,7 +58,8 @@ A low-level interface to a growing numbe
 %prep
 %setup -q -n botocore-%{version}
 %patch0 -p1
-# remove requests and six
+%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
@@ -71,10 +71,6 @@ sed -i 's/botocore\.vendored\.//' botoco
 %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
@@ -82,8 +78,6 @@ sed -i 's/botocore\.vendored\.//' botoco
 %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

Places

File project.diff of Package python-botocore (Revision f0f6a472805dd4f38a76c322279f2b3e)

Places