From 79e11044e9bdcc5840a0251d4e134928e1f5a2c2 Mon Sep 17 00:00:00 2001
From: Konstantin Ryabitsev <icon@fedoraproject.org>
Date: Fri, 14 Sep 2007 19:48:23 +0000
Subject: [PATCH] Attempt to further resolve #251645.

---
 .cvsignore             |  2 +-
 python-setuptools.spec | 17 ++++++++++++-----
 sources                |  2 +-
 3 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/.cvsignore b/.cvsignore
index bc10506..3843083 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-setuptools-0.6c6.tar.gz
+setuptools-0.6c7.tar.gz
diff --git a/python-setuptools.spec b/python-setuptools.spec
index 4aeb021..cd4e7fd 100644
--- a/python-setuptools.spec
+++ b/python-setuptools.spec
@@ -1,8 +1,8 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:           python-setuptools
-Version:        0.6c6
-Release:        2%{?dist}
+Version:        0.6c7
+Release:        1%{?dist}
 Summary:        Download, build, install, upgrade, and uninstall Python packages
 
 Group:          Applications/System
@@ -74,17 +74,24 @@ rm -rf $RPM_BUILD_ROOT
 %files
 %defattr(-,root,root,-)
 %doc psfl.txt zpl.txt pkg_resources.txt
-%{python_sitelib}/pkg_resources.py*
+%{python_sitelib}/*
+%exclude %{python_sitelib}/easy_install*
+%exclude %{python_sitelib}/setuptools/command
 
 %files devel
 %defattr(-,root,root,-)
 %doc psfl.txt zpl.txt EasyInstall.txt README.txt api_tests.txt setuptools.txt
-%{python_sitelib}/*
-%exclude %{python_sitelib}/pkg_resources.py*
+%{python_sitelib}/easy_install*
+%{python_sitelib}/setuptools/command
 %{_bindir}/*
 
 
 %changelog
+* Fri Sep 14 2007 Konstantin Ryabitsev <icon@fedoraproject.org> - 0.6c7-1
+- Upstream 0.6c7
+- Move some things from devel into runtime, in order to not break other
+  projects.
+
 * Sat Aug 18 2007 Konstantin Ryabitsev <icon@fedoraproject.org> - 0.6c6-2
 - Make license tag conform to the new Licensing Guidelines
 - Move everything except pkg_resources.py into a separate -devel package
diff --git a/sources b/sources
index 499acc0..2023b6f 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-e3d56d4d19776042607cbbecae823c8b  setuptools-0.6c6.tar.gz
+dedbf6a4f71cd6deaf13ee885054f16b  setuptools-0.6c7.tar.gz