From f6105e5438a4f243a2784feab1153bc7f49b7e54 Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Aug 05 2015 20:46:18 +0000 Subject: import python-urllib3-1.10.2-2.el7_1 --- diff --git a/SPECS/python-urllib3.spec b/SPECS/python-urllib3.spec index 220d057..c7a44aa 100644 --- a/SPECS/python-urllib3.spec +++ b/SPECS/python-urllib3.spec @@ -8,7 +8,7 @@ Name: python-%{srcname} Version: 1.10.2 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Python HTTP library with thread-safe connection pooling and file post License: MIT @@ -95,7 +95,11 @@ rm -rf %{buildroot}/%{python_sitelib}/urllib3/packages/six.py* rm -rf %{buildroot}/%{python_sitelib}/urllib3/packages/ssl_match_hostname/ mkdir -p %{buildroot}/%{python_sitelib}/urllib3/packages/ -ln -s ../../six.py %{buildroot}/%{python_sitelib}/urllib3/packages/six.py +# ovirt composes remove *.py files, leaving only *.pyc files there; this means we have to symlink +# six.py* to make sure urllib3.packages.six will be importable +for i in ../../six.py{,o,c}; do + ln -s $i %{buildroot}/%{python_sitelib}/urllib3/packages/ +done ln -s ../../backports/ssl_match_hostname %{buildroot}/%{python_sitelib}/urllib3/packages/ssl_match_hostname # dummyserver is part of the unittest framework @@ -132,6 +136,10 @@ popd %endif # with_python3 %changelog +* Mon Jul 27 2015 bkabrda - 1.10.2-2 +- Fix the way we unbundle six to make ovirt work even when they remove .py files +Resolves: rhbz#1247189 + * Mon Apr 13 2015 Matej Stuchlik - 1.10.2-1 - Update to 1.10.2 Resolves: rhbz#1233112