From bf413aa296bbfa7a4ecab1f92a7b67766247fef50e5352708664e2b3f096543d Mon Sep 17 00:00:00 2001
From: Sascha Peilicke <null@suse.de>
Date: Thu, 22 Sep 2011 09:07:16 +0000
Subject: [PATCH] - Don't repackage upstream tarball - Require
 python-distribute instead of setuptools - Package documentation - Fix
 non-executable script rpmlint warning

OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-pip?expand=0&rev=10
---
 pip-1.0.2.tar.bz2  |  3 ---
 pip-1.0.2.tar.gz   |  3 +++
 python-pip.changes |  8 ++++++++
 python-pip.spec    | 46 ++++++++++++++++------------------------------
 4 files changed, 27 insertions(+), 33 deletions(-)
 delete mode 100644 pip-1.0.2.tar.bz2
 create mode 100644 pip-1.0.2.tar.gz

diff --git a/pip-1.0.2.tar.bz2 b/pip-1.0.2.tar.bz2
deleted file mode 100644
index 95a161a..0000000
--- a/pip-1.0.2.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:20fc05547161d31d67c9480c2d679ef6aa55243ef0e3f4e3e3f7cf272ff0bff6
-size 74873
diff --git a/pip-1.0.2.tar.gz b/pip-1.0.2.tar.gz
new file mode 100644
index 0000000..c381575
--- /dev/null
+++ b/pip-1.0.2.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:a6ed9b36aac2f121c01a2c9e0307a9e4d9438d100a407db701ac65479a3335d2
+size 105820
diff --git a/python-pip.changes b/python-pip.changes
index 1bd1653..9dbc543 100644
--- a/python-pip.changes
+++ b/python-pip.changes
@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Thu Sep 22 09:04:39 UTC 2011 - saschpe@suse.de
+
+- Don't repackage upstream tarball
+- Require python-distribute instead of setuptools
+- Package documentation
+- Fix non-executable script rpmlint warning
+
 -------------------------------------------------------------------
 Sat Sep 17 13:04:36 UTC 2011 - ocefpaf@gmail.com
 
diff --git a/python-pip.spec b/python-pip.spec
index 5a66e10..e40f62b 100644
--- a/python-pip.spec
+++ b/python-pip.spec
@@ -15,59 +15,45 @@
 # Please submit bugfixes or comments via http://bugs.opensuse.org/
 #
 
-# norootforbuild
-%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
-%{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
-
-%define mod_name pip
-
-Name:           python-%{mod_name}
+Name:           python-pip
 Version:        1.0.2
 Release:        0
-Url:            http://pip.openplans.org
-Summary:        Pip installs packages.  Python packages.  An easy_install replacement
+Url:            http://www.pip-installer.org
+Summary:        Pip installs packages. Python packages. An easy_install replacement
 License:        MIT
 Group:          Development/Languages/Python
-Source:         %{mod_name}-%{version}.tar.bz2
+Source:         http://pypi.python.org/packages/source/p/pip/pip-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 BuildRequires:  python-devel
-BuildRequires:  python-setuptools
-Requires:       python-setuptools
+BuildRequires:  python-distribute
+Requires:       python-distribute
 %if 0%{?suse_version}
 %py_requires
-%if %{?suse_version: %{suse_version} > 1110} %{!?suse_version:1}
+%if 0%{?suse_version} > 1110
 BuildArch:      noarch
 %endif
 %endif
+%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 %description
-pip is a replacement for easy_install. It uses mostly the same techniques for
+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.
 
-
-Authors:
---------
-    Ian Bicking <python-virtualenv@groups.google.com>
-
 %prep
-%setup -n %{mod_name}-%{version}
+%setup -q -n pip-%{version}
+sed -i "1d" pip/__init__.py # Fix non-executable script
 
 %build
-export CFLAGS="%{optflags}"
 python setup.py build
 
 %install
-python setup.py install --prefix=%{_prefix} --root=%{buildroot} %{?suse_version: --record-rpm=INSTALLED_FILES}
+python setup.py install --prefix=%{_prefix} --root=%{buildroot}
 
-%clean
-rm -rf %{buildroot}
-
-%files %{?suse_version: -f INSTALLED_FILES}
+%files
 %defattr(-,root,root,-)
-%if 0%{!?suse_version:1}
-%{_bindir}/%{mod_name}*
-%python_sitelib/%{mod_name}*
-%endif
+%doc AUTHORS.txt LICENSE.txt docs/*
+%{_bindir}/pip*
+%{python_sitelib}/*
 
 %changelog