remove python2 subpackage

This commit is contained in:
lei_ju 2020-10-29 10:38:18 +08:00
parent 1c34601d49
commit d900ee19cb

View File

@ -1,13 +1,11 @@
Name: python-httplib2 Name: python-httplib2
Version: 0.13.1 Version: 0.13.1
Release: 5 Release: 6
Summary: Small, fast HTTP client library for Python. Summary: Small, fast HTTP client library for Python.
License: MIT License: MIT
URL: https://github.com/httplib2/httplib2 URL: https://github.com/httplib2/httplib2
Source0: https://files.pythonhosted.org/packages/78/23/bb9606e87a66fd8c72a2b1a75b049d3859a122bc2648915be845bc44e04f/httplib2-0.13.1.tar.gz Source0: https://files.pythonhosted.org/packages/78/23/bb9606e87a66fd8c72a2b1a75b049d3859a122bc2648915be845bc44e04f/httplib2-0.13.1.tar.gz
Patch0001: CVE-2020-11078.patch Patch0001: CVE-2020-11078.patch
BuildRequires: python2-setuptools python2-devel
%if 0%{?with_python3} %if 0%{?with_python3}
BuildRequires: python3-setuptools python3-devel BuildRequires: python3-setuptools python3-devel
@ -19,13 +17,6 @@ BuildArch: noarch
httplib2 is a comprehensive HTTP client library, httplib2.py supports many httplib2 is a comprehensive HTTP client library, httplib2.py supports many
features left out of other HTTP libraries. features left out of other HTTP libraries.
%package -n python2-httplib2
Summary: Small, fast HTTP client library for Python.
%{?python_provide:%python_provide python2-httplib2}
%description -n python2-httplib2
Small, fast HTTP client library for Python.
%if 0%{?with_python3} %if 0%{?with_python3}
%package -n python3-httplib2 %package -n python3-httplib2
Summary: Small, fast HTTP client library for Python. Summary: Small, fast HTTP client library for Python.
@ -44,8 +35,6 @@ find %{py3dir} -name '*.py' | xargs sed -i '1s|^#!/usr/bin/python|#!%{__python3}
%endif %endif
%build %build
%{__python2} setup.py build
%if 0%{?with_python3} %if 0%{?with_python3}
pushd %{py3dir} pushd %{py3dir}
%{__python3} setup.py build %{__python3} setup.py build
@ -53,18 +42,12 @@ popd
%endif %endif
%install %install
%py2_install
%if 0%{?with_python3} %if 0%{?with_python3}
pushd %{py3dir} pushd %{py3dir}
%py3_install %py3_install
popd popd
%endif %endif
%files -n python2-httplib2
%defattr(-,root,root)
%{python2_sitelib}/*
%if 0%{?with_python3} %if 0%{?with_python3}
%files -n python3-httplib2 %files -n python3-httplib2
%defattr(-,root,root) %defattr(-,root,root)
@ -72,6 +55,9 @@ popd
%endif %endif
%changelog %changelog
* Wed Oct 21 2020 leiju <leiju4@huawei.com> - 0.13.1-6
- remove python2 subpackage
* Mon Jul 20 2020 wangxiao <wangxiao65@huawei.com> - 0.13.1-5 * Mon Jul 20 2020 wangxiao <wangxiao65@huawei.com> - 0.13.1-5
- fix CVE-2020-11078 - fix CVE-2020-11078