From 16cfaec5c84c02151c8508a4358479c6a745bfbe Mon Sep 17 00:00:00 2001
From: Toshio くらとみ <toshio@fedoraproject.org>
Date: Nov 03 2009 05:28:45 +0000
Subject: - Move easy_install back into the main package as the needed files have

    been moved from python-devel to the main python package.
- Update to 0.6.7 bugfix.

---

diff --git a/.cvsignore b/.cvsignore
index 5e3064d..3091bf4 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-distribute-0.6.6.tar.gz
+distribute-0.6.7.tar.gz
diff --git a/python-setuptools.spec b/python-setuptools.spec
index 2220317..f6a9d74 100644
--- a/python-setuptools.spec
+++ b/python-setuptools.spec
@@ -1,9 +1,9 @@
-%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
+%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print (get_python_lib())")}
 
 %global srcname distribute
 
 Name:           python-setuptools
-Version:        0.6.6
+Version:        0.6.7
 Release:        1%{?dist}
 Summary:        Easily build and distribute Python packages
 
@@ -21,6 +21,11 @@ BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 BuildRequires:  python-devel
 
+# Legacy: We removed this subpackage once easy_install no longer depended on
+# python-devel
+Provides: python-setuptools-devel = %{version}-%{release}
+Obsoletes: python-setuptools-devel < %{version}-%{release}
+
 %description
 Setuptools is a collection of enhancements to the Python distutils that allow
 you to more easily build and distribute Python packages, especially ones that
@@ -29,21 +34,6 @@ have dependencies on other packages.
 This package contains the runtime components of setuptools, necessary to
 execute the software that requires pkg_resources.py.
 
-%package devel
-Summary:        Download, install, upgrade, and uninstall Python packages
-Group:          Development/Languages
-Requires:       python-devel
-Requires:       %{name} = %{version}-%{release}
-
-%description devel
-setuptools 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 components necessary to build and install software
-requiring setuptools.
-
-
 %prep
 %setup -q -n %{srcname}-%{version}
 find -name '*.txt' | xargs chmod -x
@@ -77,15 +67,16 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(-,root,root,-)
 %doc psfl.txt zpl.txt docs
 %{python_sitelib}/*
-%exclude %{python_sitelib}/easy_install*
-
-%files devel
-%defattr(-,root,root,-)
 %{python_sitelib}/easy_install*
 %{_bindir}/*
 
 
 %changelog
+* Tue Nov 3 2009 Toshio Kuratomi <toshio@fedoraproject.org> - 0.6.7-1
+- Move easy_install back into the main package as the needed files have been
+  moved from python-devel to the main python package.
+- Update to 0.6.7 bugfix.
+
 * Fri Oct 16 2009 Toshio Kuratomi <toshio@fedoraproject.org> - 0.6.6-1
 - Upstream bugfix release.
 
diff --git a/sources b/sources
index 0aefb9f..91e33e5 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-a0a7541a8169d73842e4bb88d79cf8d3  distribute-0.6.6.tar.gz
+b79b9422b1ea517bf3b43e277e9c813a  distribute-0.6.7.tar.gz