Merge branch 'master' into epel7
This commit is contained in:
Slavek Kabrda
commit
a78dc50b11
7 changed files with 1677 additions and 79 deletions
137
python-pip.spec
137
python-pip.spec
|
|
@ -1,14 +1,21 @@
|
|||
%if (! 0%{?rhel}) || 0%{?rhel} > 7
|
||||
%global with_python3 1
|
||||
%global build_wheel 1
|
||||
%endif
|
||||
%if 0%{?rhel} && 0%{?rhel} < 6
|
||||
%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())")}
|
||||
%endif
|
||||
|
||||
%global srcname pip
|
||||
%if 0%{?build_wheel}
|
||||
%global python2_wheelname %{srcname}-%{version}-py2.py3-none-any.whl
|
||||
%if 0%{?with_python3}
|
||||
%global python3_wheelname %python2_wheelname
|
||||
%endif
|
||||
%endif
|
||||
|
||||
Name: python-%{srcname}
|
||||
Version: 1.3.1
|
||||
Version: 1.5.6
|
||||
Release: 4%{?dist}
|
||||
Summary: A tool for installing and managing Python packages
|
||||
|
||||
|
|
@ -16,13 +23,30 @@ Group: Development/Libraries
|
|||
License: MIT
|
||||
URL: http://www.pip-installer.org
|
||||
Source0: http://pypi.python.org/packages/source/p/pip/%{srcname}-%{version}.tar.gz
|
||||
# Sent to dstufft (upstream)
|
||||
Patch0: 0001-fix-for-http-bugs.python.org-issue17980-in-code-back.patch
|
||||
|
||||
# to get tests:
|
||||
# git clone https://github.com/pypa/pip && cd fig
|
||||
# git checkout 1.5.6 && tar -czvf pip-1.5.6-tests.tar.gz tests/
|
||||
Source1: pip-1.5.6-tests.tar.gz
|
||||
|
||||
Patch0: pip-1.5rc1-allow-stripping-prefix-from-wheel-RECORD-files.patch
|
||||
# patch by dstufft, more at http://seclists.org/oss-sec/2014/q4/655
|
||||
Patch1: local-dos.patch
|
||||
Patch2: skip-network-tests.patch
|
||||
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
|
||||
|
||||
BuildArch: noarch
|
||||
BuildRequires: python-devel
|
||||
BuildRequires: python-setuptools
|
||||
BuildRequires: python-mock
|
||||
BuildRequires: pytest
|
||||
BuildRequires: python-scripttest
|
||||
BuildRequires: python-virtualenv
|
||||
%if 0%{?build_wheel}
|
||||
BuildRequires: python-pip
|
||||
BuildRequires: python-wheel
|
||||
%endif
|
||||
Requires: python-setuptools
|
||||
|
||||
%description
|
||||
|
|
@ -39,6 +63,10 @@ Group: Development/Libraries
|
|||
|
||||
BuildRequires: python3-devel
|
||||
BuildRequires: python3-setuptools
|
||||
%if 0%{?build_wheel}
|
||||
BuildRequires: python3-pip
|
||||
BuildRequires: python3-wheel
|
||||
%endif
|
||||
Requires: python3-setuptools
|
||||
|
||||
%description -n python3-pip
|
||||
|
|
@ -50,7 +78,11 @@ easy_installable should be pip-installable as well.
|
|||
|
||||
%prep
|
||||
%setup -q -n %{srcname}-%{version}
|
||||
tar -xf %{SOURCE1}
|
||||
|
||||
%patch0 -p1
|
||||
%patch1 -p1
|
||||
%patch2 -p1
|
||||
|
||||
%{__sed} -i '1d' pip/__init__.py
|
||||
|
||||
|
|
@ -60,11 +92,19 @@ cp -a . %{py3dir}
|
|||
|
||||
|
||||
%build
|
||||
%if 0%{?build_wheel}
|
||||
%{__python} setup.py bdist_wheel
|
||||
%else
|
||||
%{__python} setup.py build
|
||||
%endif
|
||||
|
||||
%if 0%{?with_python3}
|
||||
pushd %{py3dir}
|
||||
%if 0%{?build_wheel}
|
||||
%{__python3} setup.py bdist_wheel
|
||||
%else
|
||||
%{__python3} setup.py build
|
||||
%endif
|
||||
popd
|
||||
%endif # with_python3
|
||||
|
||||
|
|
@ -74,42 +114,24 @@ popd
|
|||
|
||||
%if 0%{?with_python3}
|
||||
pushd %{py3dir}
|
||||
%if 0%{?build_wheel}
|
||||
pip3 install -I dist/%{python3_wheelname} --root %{buildroot} --strip-file-prefix %{buildroot}
|
||||
# TODO: we have to remove this by hand now, but it'd be nice if we wouldn't have to
|
||||
# (pip install wheel doesn't overwrite)
|
||||
rm %{buildroot}%{_bindir}/pip
|
||||
%else
|
||||
%{__python3} setup.py install --skip-build --root %{buildroot}
|
||||
|
||||
# Change the name of the python3 pip executable in order to not conflict with
|
||||
# the python2 executable
|
||||
mv %{buildroot}%{_bindir}/pip %{buildroot}%{_bindir}/python3-pip
|
||||
|
||||
# after changing the pip-python binary name, make a symlink to the old name,
|
||||
# that will be removed in a later version
|
||||
# https://bugzilla.redhat.com/show_bug.cgi?id=855495
|
||||
pushd %{buildroot}%{_bindir}
|
||||
ln -s python3-pip pip-python3
|
||||
|
||||
# The install process creates both pip and pip-<python_abiversion> that seem to
|
||||
# be the same. Remove the extra script
|
||||
%{__rm} -rf pip-3*
|
||||
|
||||
popd
|
||||
%endif
|
||||
%endif # with_python3
|
||||
|
||||
%if 0%{?build_wheel}
|
||||
pip2 install -I dist/%{python2_wheelname} --root %{buildroot} --strip-file-prefix %{buildroot}
|
||||
%else
|
||||
%{__python} setup.py install -O1 --skip-build --root %{buildroot}
|
||||
%endif
|
||||
|
||||
pushd %{buildroot}%{_bindir}
|
||||
# The install process creates both pip and pip-<python_abiversion> that seem to
|
||||
# be the same. Since removing pip-* also clobbers pip-python3, just remove pip-2*
|
||||
%{__rm} -rf pip-2*
|
||||
|
||||
# The pip executable no longer needs to be renamed to avoid conflict with perl-pip
|
||||
# https://bugzilla.redhat.com/show_bug.cgi?id=958377
|
||||
# However, we'll keep a python-pip alias for now
|
||||
ln -s pip python-pip
|
||||
|
||||
# after changing the pip-python binary name, make a symlink to the old name,
|
||||
# that will be removed in a later version
|
||||
# https://bugzilla.redhat.com/show_bug.cgi?id=855495
|
||||
ln -s pip pip-python
|
||||
popd
|
||||
%check
|
||||
python setup.py test
|
||||
|
||||
|
||||
%clean
|
||||
|
|
@ -120,22 +142,53 @@ popd
|
|||
|
||||
%files
|
||||
%defattr(-,root,root,-)
|
||||
%doc PKG-INFO docs
|
||||
%doc LICENSE.txt README.rst docs
|
||||
%attr(755,root,root) %{_bindir}/pip
|
||||
%attr(755,root,root) %{_bindir}/pip-python
|
||||
%attr(755,root,root) %{_bindir}/python-pip
|
||||
%attr(755,root,root) %{_bindir}/pip2*
|
||||
%{python_sitelib}/pip*
|
||||
|
||||
%if 0%{?with_python3}
|
||||
%files -n python3-pip
|
||||
%defattr(-,root,root,-)
|
||||
%doc PKG-INFO docs
|
||||
%attr(755,root,root) %{_bindir}/pip-python3
|
||||
%attr(755,root,root) %{_bindir}/python3-pip
|
||||
%doc LICENSE.txt README.rst docs
|
||||
%attr(755,root,root) %{_bindir}/pip3*
|
||||
%{python3_sitelib}/pip*
|
||||
%endif # with_python3
|
||||
|
||||
%changelog
|
||||
* Mon Dec 01 2014 Matej Stuchlik <mstuchli@redhat.com> - 1.5.6-4
|
||||
- Add tests
|
||||
- Add patch skipping tests requiring Internet access
|
||||
|
||||
* Tue Nov 18 2014 Matej Stuchlik <mstuchli@redhat.com> - 1.5.6-3
|
||||
- Added patch for local dos with predictable temp dictionary names
|
||||
(http://seclists.org/oss-sec/2014/q4/655)
|
||||
|
||||
* Sat Jun 07 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.5.6-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
|
||||
|
||||
* Sun May 25 2014 Matej Stuchlik <mstuchli@redhat.com> - 1.5.6-1
|
||||
- Update to 1.5.6
|
||||
|
||||
* Fri Apr 25 2014 Matej Stuchlik <mstuchli@redhat.com> - 1.5.4-4
|
||||
- Rebuild as wheel for Python 3.4
|
||||
|
||||
* Thu Apr 24 2014 Matej Stuchlik <mstuchli@redhat.com> - 1.5.4-3
|
||||
- Disable build_wheel
|
||||
|
||||
* Thu Apr 24 2014 Matej Stuchlik <mstuchli@redhat.com> - 1.5.4-2
|
||||
- Rebuild as wheel for Python 3.4
|
||||
|
||||
* Mon Apr 07 2014 Matej Stuchlik <mstuchli@redhat.com> - 1.5.4-1
|
||||
- Updated to 1.5.4
|
||||
|
||||
* Mon Oct 14 2013 Tim Flink <tflink@fedoraproject.org> - 1.4.1-1
|
||||
- Removed patch for CVE 2013-2099 as it has been included in the upstream 1.4.1 release
|
||||
- Updated version to 1.4.1
|
||||
|
||||
* Sun Aug 04 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.3.1-5
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
|
||||
|
||||
* Tue Jul 16 2013 Toshio Kuratomi <toshio@fedoraproject.org> - 1.3.1-4
|
||||
- Fix for CVE 2013-2099
|
||||
|
||||
|
|
@ -188,9 +241,9 @@ popd
|
|||
- update to 0.7.1 of pip
|
||||
* Fri Jan 1 2010 Peter Halliday <phalliday@excelsiorsystems.net> - 0.6.1.4
|
||||
- fix dependency issue
|
||||
* Tue Dec 18 2009 Peter Halliday <phalliday@excelsiorsystems.net> - 0.6.1-2
|
||||
* Fri Dec 18 2009 Peter Halliday <phalliday@excelsiorsystems.net> - 0.6.1-2
|
||||
- fix spec file
|
||||
* Mon Dec 17 2009 Peter Halliday <phalliday@excelsiorsystems.net> - 0.6.1-1
|
||||
* Thu Dec 17 2009 Peter Halliday <phalliday@excelsiorsystems.net> - 0.6.1-1
|
||||
- upgrade to 0.6.1 of pip
|
||||
* Mon Aug 31 2009 Peter Halliday <phalliday@excelsiorsystems.net> - 0.4-1
|
||||
- Initial package
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue