From fc2018efb222d008cefe8372d70a25930806b28a Mon Sep 17 00:00:00 2001 From: Peter Halliday Date: Mon, 26 Oct 2009 00:51:48 +0000 Subject: [PATCH 01/10] initial import --- .cvsignore | 1 + import.log | 1 + python-pip.spec | 51 +++++++++++++++++++++++++++++++++++++++++++++++++ sources | 1 + 4 files changed, 54 insertions(+) create mode 100644 import.log create mode 100644 python-pip.spec diff --git a/.cvsignore b/.cvsignore index e69de29..b8e1e22 100644 --- a/.cvsignore +++ b/.cvsignore @@ -0,0 +1 @@ +pip-0.4.tar.gz diff --git a/import.log b/import.log new file mode 100644 index 0000000..8edfde7 --- /dev/null +++ b/import.log @@ -0,0 +1 @@ +python-pip-0_4-1_fc11:HEAD:python-pip-0.4-1.fc11.src.rpm:1256517782 diff --git a/python-pip.spec b/python-pip.spec new file mode 100644 index 0000000..dacd466 --- /dev/null +++ b/python-pip.spec @@ -0,0 +1,51 @@ +%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} + +%global srcname pip + +Name: python-%{srcname} +Version: 0.4 +Release: 1%{?dist} +Summary: Pip installs packages. Python packages. An easy_install replacement + +Group: Development/Libraries +License: MIT +URL: http://pip.openplans.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 + +%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.). + +%prep +%setup -q -n %{srcname}-%{version} +%{__sed} -i '1d' pip.py + +%build +%{__python} setup.py build + +%install +%{__rm} -rf %{buildroot} +%{__python} setup.py install -O1 --skip-build --root %{buildroot} + +%clean +%{__rm} -rf %{buildroot} + +%files +%defattr(-,root,root,-) +%doc PKG-INFO docs +%attr(755,root,root) %{_bindir}/pip +%{python_sitelib}/pip* + +%changelog +* Mon Aug 31 2009 Peter Halliday - 0.4-1 +- Initial package diff --git a/sources b/sources index e69de29..21eb671 100644 --- a/sources +++ b/sources @@ -0,0 +1 @@ +b45714d04f8fd38fe8e3d4c7600b91a2 pip-0.4.tar.gz From 8feb7af304eabfd5f5996ce7e2e658b86563d4cd Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Wed, 25 Nov 2009 23:31:59 +0000 Subject: [PATCH 02/10] Fix typo that causes a failure to update the common directory. (releng #2781) --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index a328700..2a1826d 100644 --- a/Makefile +++ b/Makefile @@ -1,10 +1,10 @@ # Makefile for source rpm: python-pip -# $Id$ +# $Id: Makefile,v 1.1 2009/10/22 04:10:22 kevin Exp $ NAME := python-pip SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done +for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) From 24c5132c8a9544ec2a0abed415076526e034c790 Mon Sep 17 00:00:00 2001 From: Peter Halliday Date: Fri, 18 Dec 2009 02:39:41 +0000 Subject: [PATCH 03/10] Updating to 0.6.1 --- .cvsignore | 2 +- python-pip.spec | 2 +- sources | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.cvsignore b/.cvsignore index b8e1e22..d02aa5c 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -pip-0.4.tar.gz +pip-0.6.1.tar.gz diff --git a/python-pip.spec b/python-pip.spec index dacd466..146eb18 100644 --- a/python-pip.spec +++ b/python-pip.spec @@ -3,7 +3,7 @@ %global srcname pip Name: python-%{srcname} -Version: 0.4 +Version: 0.6.1 Release: 1%{?dist} Summary: Pip installs packages. Python packages. An easy_install replacement diff --git a/sources b/sources index 21eb671..f9ab078 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -b45714d04f8fd38fe8e3d4c7600b91a2 pip-0.4.tar.gz +7560e3055c66afb99ac4a7892389a237 pip-0.6.1.tar.gz From 365f19ee02ac5b3c13ba9f2c12e3a25d331dfadf Mon Sep 17 00:00:00 2001 From: Peter Halliday Date: Fri, 18 Dec 2009 13:45:01 +0000 Subject: [PATCH 04/10] Updating to 0.6.1-3 --- python-pip.spec | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/python-pip.spec b/python-pip.spec index 146eb18..fe00af1 100644 --- a/python-pip.spec +++ b/python-pip.spec @@ -4,7 +4,7 @@ Name: python-%{srcname} Version: 0.6.1 -Release: 1%{?dist} +Release: 3%{?dist} Summary: Pip installs packages. Python packages. An easy_install replacement Group: Development/Libraries @@ -47,5 +47,10 @@ pip is meant to improve on easy_install.bulletin boards, etc.). %{python_sitelib}/pip* %changelog +* Tue Dec 18 2009 Peter Halliday - 0.6.1-2 +- fix spec file +* Mon Dec 17 2009 Peter Halliday - 0.6.1-1 +- upgrade to 0.6.1 of pip * Mon Aug 31 2009 Peter Halliday - 0.4-1 - Initial package + From 97657b9e81d626088370c4266cd44eac4cf4eded Mon Sep 17 00:00:00 2001 From: Peter Halliday Date: Fri, 1 Jan 2010 20:11:19 +0000 Subject: [PATCH 05/10] fixing dependency issues --- python-pip.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/python-pip.spec b/python-pip.spec index fe00af1..c0ae165 100644 --- a/python-pip.spec +++ b/python-pip.spec @@ -4,7 +4,7 @@ Name: python-%{srcname} Version: 0.6.1 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Pip installs packages. Python packages. An easy_install replacement Group: Development/Libraries @@ -16,6 +16,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: python-devel BuildRequires: python-setuptools-devel +Requires: python-setuptools %description @@ -47,6 +48,8 @@ pip is meant to improve on easy_install.bulletin boards, etc.). %{python_sitelib}/pip* %changelog +* Fri Jan 1 2010 Peter Halliday - 0.6.1.4 +- fix dependency issue * Tue Dec 18 2009 Peter Halliday - 0.6.1-2 - fix spec file * Mon Dec 17 2009 Peter Halliday - 0.6.1-1 From 36e99b167c0f9f2daa145b71df5eca0541f3f34d Mon Sep 17 00:00:00 2001 From: Peter Halliday Date: Mon, 24 May 2010 03:02:18 +0000 Subject: [PATCH 06/10] update to 0.7.1 --- .cvsignore | 2 +- python-pip.spec | 10 ++++++---- sources | 2 +- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/.cvsignore b/.cvsignore index d02aa5c..2b9f9a5 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -pip-0.6.1.tar.gz +pip-0.7.1.tar.gz diff --git a/python-pip.spec b/python-pip.spec index c0ae165..994b967 100644 --- a/python-pip.spec +++ b/python-pip.spec @@ -3,7 +3,7 @@ %global srcname pip Name: python-%{srcname} -Version: 0.6.1 +Version: 0.7.1 Release: 4%{?dist} Summary: Pip installs packages. Python packages. An easy_install replacement @@ -16,7 +16,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: python-devel BuildRequires: python-setuptools-devel -Requires: python-setuptools +Requires: python-setuptools %description @@ -29,7 +29,7 @@ pip is meant to improve on easy_install.bulletin boards, etc.). %prep %setup -q -n %{srcname}-%{version} -%{__sed} -i '1d' pip.py +%{__sed} -i '1d' pip/__init__.py %build %{__python} setup.py build @@ -48,7 +48,9 @@ pip is meant to improve on easy_install.bulletin boards, etc.). %{python_sitelib}/pip* %changelog -* Fri Jan 1 2010 Peter Halliday - 0.6.1.4 +* Sun May 23 2010 Peter Halliday - 0.7.1-1 +- update to 0.7.1. of pip +* Fri Jan 1 2010 Peter Halliday - 0.6.1.4 - fix dependency issue * Tue Dec 18 2009 Peter Halliday - 0.6.1-2 - fix spec file diff --git a/sources b/sources index f9ab078..4a52c8b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -7560e3055c66afb99ac4a7892389a237 pip-0.6.1.tar.gz +420c83ad67bdcb542f772eb64392cce6 pip-0.7.1.tar.gz From 6b45ab4d3b21a2bb9898ad753b12f8abb7b3e8d8 Mon Sep 17 00:00:00 2001 From: Peter Halliday Date: Thu, 8 Jul 2010 05:17:31 +0000 Subject: [PATCH 07/10] Update to 0.7.2 of pip --- .cvsignore | 2 +- python-pip.spec | 6 ++++-- sources | 2 +- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/.cvsignore b/.cvsignore index 2b9f9a5..831a5ed 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -pip-0.7.1.tar.gz +pip-0.7.2.tar.gz diff --git a/python-pip.spec b/python-pip.spec index 994b967..37b582b 100644 --- a/python-pip.spec +++ b/python-pip.spec @@ -3,7 +3,7 @@ %global srcname pip Name: python-%{srcname} -Version: 0.7.1 +Version: 0.7.2 Release: 4%{?dist} Summary: Pip installs packages. Python packages. An easy_install replacement @@ -48,8 +48,10 @@ pip is meant to improve on easy_install.bulletin boards, etc.). %{python_sitelib}/pip* %changelog +* Wed Jul 7 2010 Peter Halliday - 0.7.2-1 +- update to 0.7.2 of pip * Sun May 23 2010 Peter Halliday - 0.7.1-1 -- update to 0.7.1. of pip +- update to 0.7.1 of pip * Fri Jan 1 2010 Peter Halliday - 0.6.1.4 - fix dependency issue * Tue Dec 18 2009 Peter Halliday - 0.6.1-2 diff --git a/sources b/sources index 4a52c8b..670e4d7 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -420c83ad67bdcb542f772eb64392cce6 pip-0.7.1.tar.gz +cfe73090aaa0d3b0c104179a627859d1 pip-0.7.2.tar.gz From 089f2c50f7170dfc51023ab8f670665a7f043f87 Mon Sep 17 00:00:00 2001 From: dmalcolm Date: Thu, 22 Jul 2010 05:02:19 +0000 Subject: [PATCH 08/10] - Rebuilt for https://fedoraproject.org/wiki/Features/Python_2.7/MassRebuild --- python-pip.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/python-pip.spec b/python-pip.spec index 37b582b..1000747 100644 --- a/python-pip.spec +++ b/python-pip.spec @@ -4,7 +4,7 @@ Name: python-%{srcname} Version: 0.7.2 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Pip installs packages. Python packages. An easy_install replacement Group: Development/Libraries @@ -48,6 +48,9 @@ pip is meant to improve on easy_install.bulletin boards, etc.). %{python_sitelib}/pip* %changelog +* Thu Jul 22 2010 David Malcolm - 0.7.2-5 +- Rebuilt for https://fedoraproject.org/wiki/Features/Python_2.7/MassRebuild + * Wed Jul 7 2010 Peter Halliday - 0.7.2-1 - update to 0.7.2 of pip * Sun May 23 2010 Peter Halliday - 0.7.1-1 From 324f9dc300ef6ae1da5ed820022746a7038440f4 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 29 Jul 2010 10:36:33 +0000 Subject: [PATCH 09/10] dist-git conversion --- .cvsignore => .gitignore | 0 Makefile | 21 --------------------- import.log | 1 - 3 files changed, 22 deletions(-) rename .cvsignore => .gitignore (100%) delete mode 100644 Makefile delete mode 100644 import.log diff --git a/.cvsignore b/.gitignore similarity index 100% rename from .cvsignore rename to .gitignore diff --git a/Makefile b/Makefile deleted file mode 100644 index 2a1826d..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: python-pip -# $Id: Makefile,v 1.1 2009/10/22 04:10:22 kevin Exp $ -NAME := python-pip -SPECFILE = $(firstword $(wildcard *.spec)) - -define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done -endef - -MAKEFILE_COMMON := $(shell $(find-makefile-common)) - -ifeq ($(MAKEFILE_COMMON),) -# attept a checkout -define checkout-makefile-common -test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 -endef - -MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) -endif - -include $(MAKEFILE_COMMON) diff --git a/import.log b/import.log deleted file mode 100644 index 8edfde7..0000000 --- a/import.log +++ /dev/null @@ -1 +0,0 @@ -python-pip-0_4-1_fc11:HEAD:python-pip-0.4-1.fc11.src.rpm:1256517782 From 3155cdf475c8e40535e1c30f7faa919fe0662f0b Mon Sep 17 00:00:00 2001 From: Peter Halliday Date: Mon, 30 Aug 2010 23:01:40 -0400 Subject: [PATCH 10/10] BugID: 616399 update to 0.8 --- .gitignore | 1 + python-pip.spec | 10 +++++++--- sources | 2 +- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 831a5ed..0be679f 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ pip-0.7.2.tar.gz +/pip-0.8.tar.gz diff --git a/python-pip.spec b/python-pip.spec index 1000747..8dc4e9e 100644 --- a/python-pip.spec +++ b/python-pip.spec @@ -3,8 +3,8 @@ %global srcname pip Name: python-%{srcname} -Version: 0.7.2 -Release: 5%{?dist} +Version: 0.8 +Release: 1%{?dist} Summary: Pip installs packages. Python packages. An easy_install replacement Group: Development/Libraries @@ -37,6 +37,8 @@ pip is meant to improve on easy_install.bulletin boards, etc.). %install %{__rm} -rf %{buildroot} %{__python} setup.py install -O1 --skip-build --root %{buildroot} +%{__rm} -rf %{buildroot}%{_bindir}/pip-* +mv %{buildroot}%{_bindir}/pip %{buildroot}%{_bindir}/pip-python %clean %{__rm} -rf %{buildroot} @@ -44,10 +46,12 @@ pip is meant to improve on easy_install.bulletin boards, etc.). %files %defattr(-,root,root,-) %doc PKG-INFO docs -%attr(755,root,root) %{_bindir}/pip +%attr(755,root,root) %{_bindir}/pip-python %{python_sitelib}/pip* %changelog +* 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 - Rebuilt for https://fedoraproject.org/wiki/Features/Python_2.7/MassRebuild diff --git a/sources b/sources index 670e4d7..9cfbdb1 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -cfe73090aaa0d3b0c104179a627859d1 pip-0.7.2.tar.gz +468d9adc309f33ad51cee38f0d455429 pip-0.8.tar.gz