From 8a901a452f03bf314872dfe3b369f35e0134af94 Mon Sep 17 00:00:00 2001
From: Tim Flink <tflink@fedoraproject.org>
Date: Fri, 24 Jun 2011 10:11:39 -0600
Subject: [PATCH] Update F14 to 0.8.3

---
 .gitignore      |  1 +
 python-pip.spec | 11 ++++++++---
 sources         |  2 +-
 3 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/.gitignore b/.gitignore
index 0be679f..299c1e7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 pip-0.7.2.tar.gz
 /pip-0.8.tar.gz
+/pip-0.8.3.tar.gz
diff --git a/python-pip.spec b/python-pip.spec
index 8dc4e9e..5b29a86 100644
--- a/python-pip.spec
+++ b/python-pip.spec
@@ -3,13 +3,13 @@
 %global srcname pip
 
 Name:           python-%{srcname}
-Version:        0.8
+Version:        0.8.3
 Release:        1%{?dist}
 Summary:        Pip installs packages.  Python 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)
 
@@ -38,18 +38,23 @@ pip is meant to improve on easy_install.bulletin boards, etc.).
 %{__rm} -rf %{buildroot}
 %{__python} setup.py install -O1 --skip-build --root %{buildroot}
 %{__rm} -rf %{buildroot}%{_bindir}/pip-*
+
+# 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}/pip-python
 
 %clean
 %{__rm} -rf %{buildroot}
 
 %files
-%defattr(-,root,root,-)
 %doc PKG-INFO docs
 %attr(755,root,root) %{_bindir}/pip-python
 %{python_sitelib}/pip*
 
 %changelog
+* Wed Jun 22 2011 Tim Flink <tflink@fedoraproject.org> - 0.8.3-1
+- update to 0.8.3 and project home page
+
 * Mon Aug 30 2010 Peter Halliday <phalliday@excelsiorsystems.net> - 0.8-1
 - update to 0.8 of pip
 * Thu Jul 22 2010 David Malcolm <dmalcolm@redhat.com> - 0.7.2-5
diff --git a/sources b/sources
index 9cfbdb1..a3c8d33 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-468d9adc309f33ad51cee38f0d455429  pip-0.8.tar.gz
+0603337a81f83df2b1d2f1151565efac  pip-0.8.3.tar.gz