diff --git a/python-urllib3.spec b/python-urllib3.spec index 7a8eb80a2d4139ad76df6fca31cb9f6c81ff7e6b..5ee19c50e1c7ad25718306f6a970bc22c4f7e5f5 100644 --- a/python-urllib3.spec +++ b/python-urllib3.spec @@ -3,7 +3,7 @@ Name: python-%{srcname} Version: 1.25.9 -Release: 4 +Release: 5 Summary: Sanity-friendly HTTP client for Python License: MIT URL: https://urllib3.readthedocs.io @@ -23,30 +23,13 @@ sanity friendly, and more. %description Python %_description -%package -n python2-%{srcname} -Summary: Sanity-friendly HTTP client for python2 -%{?python_provide:%python_provide python2-urllib3} - -Requires: ca-certificates python2-six python2-backports-ssl_match_hostname -Requires: python2-ipaddress python2-pysocks - -BuildRequires: python2-devel - -%if %{with tests} -BuildRequires: python2-nose python2-coverage python2-mock python2-six python-trustme -BuildRequires: python2-pysocks python2-pytest python2-tornado python2-backports-ssl_match_hostname -%endif - -%description -n python2-urllib3 -Python2 %_description - %package -n python3-%{srcname} Summary: Python3 HTTP library with thread-safe connection pooling and file post BuildRequires: python3-devel %if %{with tests} -BuildRequires: python3-nose python3-mock python3-six +BuildRequires: python3-mock python3-six BuildRequires: python3-pysocks python3-pytest python3-tornado %endif @@ -64,22 +47,11 @@ rm -rf test/contrib/ rm -rf test/test_no_ssl.py %build -%py2_build %py3_build %install -%py2_install %py3_install -rm -rf %{buildroot}%{python2_sitelib}/urllib3/packages/six.py* -rm -rf %{buildroot}%{python2_sitelib}/urllib3/packages/ssl_match_hostname/ - -mkdir -p %{buildroot}/%{python2_sitelib}/urllib3/packages/ -ln -s %{python2_sitelib}/six.py %{buildroot}/%{python2_sitelib}/urllib3/packages/six.py -ln -s %{python2_sitelib}/six.pyc %{buildroot}/%{python2_sitelib}/urllib3/packages/six.pyc -ln -s %{python2_sitelib}/six.pyo %{buildroot}/%{python2_sitelib}/urllib3/packages/six.pyo -ln -s %{python2_sitelib}/backports/ssl_match_hostname %{buildroot}/%{python2_sitelib}/urllib3/packages/ssl_match_hostname - rm -rf %{buildroot}%{python3_sitelib}/urllib3/packages/six.py* rm -rf %{buildroot}%{python3_sitelib}/urllib3/packages/__pycache__/six* rm -rf %{buildroot}%{python3_sitelib}/urllib3/packages/ssl_match_hostname/ @@ -90,20 +62,6 @@ ln -s %{python3_sitelib}/six.py %{buildroot}/%{python3_sitelib}/urllib3/packages ln -s %{python3_sitelib}/__pycache__/six.cpython-%{python3_version_nodots}.opt-1.pyc %{buildroot}/%{python3_sitelib}/urllib3/packages/__pycache__/ ln -s %{python3_sitelib}/__pycache__/six.cpython-%{python3_version_nodots}.pyc %{buildroot}/%{python3_sitelib}/urllib3/packages/__pycache__/ -%if %{with tests} -%check -#we don't have python2-trustme,so we don't need check python2 -#PYTHONPATH=%{buildroot}%{python2_sitelib}:%{python2_sitelib} %{__python2} -m pytest -v -PYTHONPATH=%{buildroot}%{python3_sitelib}:%{python3_sitelib} %{__python3} -m pytest -v -%endif - -%files -n python2-urllib3 -%defattr(-,root,root) -%license LICENSE.txt -%doc CHANGES.rst README.rst CONTRIBUTORS.txt -%{python2_sitelib}/urllib3/ -%{python2_sitelib}/urllib3-*.egg-info - %files -n python3-urllib3 %defattr(-,root,root) %license LICENSE.txt @@ -112,6 +70,9 @@ PYTHONPATH=%{buildroot}%{python3_sitelib}:%{python3_sitelib} %{__python3} -m pyt %{python3_sitelib}/urllib3-*.egg-info %changelog +* Wed Jan 26 2022 zhangy1317 - 1.25.9-5 +- Remove python2 + * Sat Dec 04 2021 chxssg - 1.25.9-4 - Type:bugfix - CVE:NA