diff --git a/.gitignore b/.gitignore index 0be679f..f3ead45 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,7 @@ pip-0.7.2.tar.gz /pip-0.8.tar.gz +/pip-0.8.2.tar.gz +/pip-0.8.3.tar.gz +/pip-1.0.2.tar.gz +/pip-1.1.tar.gz +/pip-1.3.1.tar.gz diff --git a/python-pip.spec b/python-pip.spec index 8dc4e9e..4025a23 100644 --- a/python-pip.spec +++ b/python-pip.spec @@ -1,55 +1,165 @@ -%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} +%if (! 0%{?rhel}) || 0%{?rhel} > 6 +%global with_python3 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 Name: python-%{srcname} -Version: 0.8 +Version: 1.3.1 Release: 1%{?dist} -Summary: Pip installs packages. Python packages. An easy_install replacement +Summary: Pip installs packages. Python3 packages. An easy_install replacement Group: Development/Libraries License: MIT -URL: http://pip.openplans.org +URL: http://www.pip-installer.org Source0: http://pypi.python.org/packages/source/p/pip/%{srcname}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: python-devel -BuildRequires: python-setuptools-devel +BuildRequires: python-setuptools Requires: python-setuptools %description - Pip is a replacement for `easy_install `_. It uses mostly the same techniques for finding packages, so packages that were made easy_installable should be pip-installable as well. -pip is meant to improve on easy_install.bulletin boards, etc.). + +%if 0%{?with_python3} +%package -n python3-pip +Summary: Pip installs packages. Python3 packages. An easy_install replacement +Group: Development/Libraries + +BuildRequires: python3-devel +BuildRequires: python3-setuptools +Requires: python3-setuptools + +%description -n python3-pip +Pip is a replacement for `easy_install +`_. It uses mostly the +same techniques for finding packages, so packages that were made +easy_installable should be pip-installable as well. +%endif # with_python3 %prep %setup -q -n %{srcname}-%{version} %{__sed} -i '1d' pip/__init__.py +%if 0%{?with_python3} +cp -a . %{py3dir} +%endif # with_python3 + %build %{__python} setup.py build +%if 0%{?with_python3} +pushd %{py3dir} +%{__python3} setup.py build +popd +%endif # with_python3 + %install %{__rm} -rf %{buildroot} + +%if 0%{?with_python3} +pushd %{py3dir} +%{__python3} setup.py install -O1 --skip-build --root %{buildroot} + +# Change the name of the pip executable in order to not conflict with perl-pip +# https://bugzilla.redhat.com/show_bug.cgi?id=616399 +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 +popd + +# The install process creates both pip and pip- that seem to +# be the same. Remove the extra script +rm %{buildroot}%{_bindir}/pip-3* + +popd +%endif # with_python3 + %{__python} setup.py install -O1 --skip-build --root %{buildroot} -%{__rm} -rf %{buildroot}%{_bindir}/pip-* -mv %{buildroot}%{_bindir}/pip %{buildroot}%{_bindir}/pip-python + +# The install process creates both pip and pip- that seem to +# be the same. Since removing pip-* also clobbers pip-python3, just remove pip-2* +%{__rm} -rf %{buildroot}%{_bindir}/pip-2* + +# Change the name of the pip executable in order to not conflict with perl-pip +# https://bugzilla.redhat.com/show_bug.cgi?id=616399 +mv %{buildroot}%{_bindir}/pip %{buildroot}%{_bindir}/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 +pushd %{buildroot}%{_bindir} +ln -s python-pip pip-python +popd + %clean %{__rm} -rf %{buildroot} +# unfortunately, pip's test suite requires virtualenv >= 1.6 which isn't in +# fedora yet. Once it is, check can be implemented + %files %defattr(-,root,root,-) %doc PKG-INFO docs %attr(755,root,root) %{_bindir}/pip-python +%attr(755,root,root) %{_bindir}/python-pip %{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 +%{python3_sitelib}/pip* +%endif # with_python3 + %changelog +* Fri Apr 26 2013 Jon Ciesla - 1.3.1-1 +- Update to 1.3.1, fix for CVE-2013-1888. + +* Thu Feb 14 2013 Fedora Release Engineering - 1.2.1-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild + +* Tue Oct 09 2012 Tim Flink - 1.2.1-2 +- Fixing files for python3-pip + +* Thu Oct 04 2012 Tim Flink - 1.2.1-1 +- Update to upstream 1.2.1 +- Change binary from pip-python to python-pip (RHBZ#855495) +- Add alias from python-pip to pip-python, to be removed at a later date + +* Tue May 15 2012 Tim Flink - 1.1.0-1 +- Update to upstream 1.1.0 + +* Sat Jan 14 2012 Fedora Release Engineering - 1.0.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild + +* Sat Oct 22 2011 Tim Flink - 1.0.2-1 +- update to 1.0.2 and added python3 subpackage + +* Wed Jun 22 2011 Tim Flink - 0.8.3-1 +- update to 0.8.3 and project home page + +* Tue Feb 08 2011 Fedora Release Engineering - 0.8.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild + +* Mon Dec 20 2010 Luke Macken - 0.8.2-1 +- update to 0.8.2 of pip * Mon Aug 30 2010 Peter Halliday - 0.8-1 - update to 0.8 of pip * Thu Jul 22 2010 David Malcolm - 0.7.2-5 diff --git a/sources b/sources index 9cfbdb1..4b91cac 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -468d9adc309f33ad51cee38f0d455429 pip-0.8.tar.gz +cbb27a191cebc58997c4da8513863153 pip-1.3.1.tar.gz