--- python26-setuptools.spec	2010-03-17 14:01:38.000000000 -0400
+++ python26-distribute.spec	2010-03-19 14:48:37.000000000 -0400
@@ -6,17 +6,15 @@
 
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
-%global srcname distribute
-
-Name:           python%{pyver}-setuptools
+Name:           python%{pyver}-distribute
 Version:        0.6.10
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Easily build and distribute Python packages
 
 Group:          Applications/System
 License:        Python or ZPLv2.0
-URL:            http://pypi.python.org/pypi/%{srcname}
-Source0:        http://pypi.python.org/packages/source/d/%{srcname}/%{srcname}-%{version}.tar.gz
+URL:            http://pypi.python.org/pypi/distribute
+Source0:        http://pypi.python.org/packages/source/d/distribute/distribute-%{version}.tar.gz
 Source1:        psfl.txt
 Source2:        zpl.txt
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -24,16 +22,22 @@ BuildRoot:      %{_tmppath}/%{name}-%{ve
 BuildArch:      noarch
 BuildRequires:  python26-devel
 
+Obsoletes:      python26-setuptools < 0.6.10-3
+Provides:       python26-setuptools = %{version}-%{release}
+
+
 %description
-Setuptools is a collection of enhancements to the Python distutils that allow
+Distribute is a collection of enhancements to the Python distutils that allow
 you to more easily build and distribute Python packages, especially ones that
 have dependencies on other packages.
 
-This package contains the runtime components of setuptools, necessary to
+This package contains the runtime components of Distribute, necessary to
 execute the software that requires pkg_resources.py.
 
+Distribute is a fork of the "Setuptools" project
+
 %prep
-%setup -q -n %{srcname}-%{version}
+%setup -q -n distribute-%{version}
 find -name '*.txt' | xargs chmod -x
 find -name '*.py' | xargs sed -i '1s|^#!python|#!%{__python}|'
 
@@ -71,6 +75,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Fri Mar 19 2010 David Malcolm <dmalcolm@redhat.com> - 0.6.10-3
+- rename from "python26-setuptools" to "python26-distribute", to make it more
+clear which fork of the code we're using
+
 * Wed Mar 17 2010 David Malcolm <dmalcolm@redhat.com> - 0.6.10-2
 - move the easy_install into place, and explicitly list _bindir content to
 ensure we aren't shadowing the easy_install from the standard python 2.4 stack
