dist-git conversion

#2781)

.cvsignore

@@ -1 +0,0 @@
-setuptools-0.6c7.tar.gz

.gitignore

@@ -0,0 +1 @@
+setuptools-0.6c9.tar.gz

Makefile

@@ -1,21 +0,0 @@
-# Makefile for source rpm: python-setuptools
-# $Id$
-NAME := python-setuptools
-SPECFILE = $(firstword $(wildcard *.spec))
-
-define find-makefile-common
-for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
-endef
-
-MAKEFILE_COMMON := $(shell $(find-makefile-common))
-
-ifeq ($(MAKEFILE_COMMON),)
-# attept a checkout
-define checkout-makefile-common
-test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
-endef
-
-MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
-endif
-
-include $(MAKEFILE_COMMON)

python-setuptools.spec

@@ -1,14 +1,14 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:           python-setuptools
-Version:        0.6c7
+Version:        0.6c9
-Release:        2%{?dist}
+Release:        1%{?dist}
-Summary:        Download, build, install, upgrade, and uninstall Python packages
+Summary:        Easily build and distribute Python packages
 
 Group:          Applications/System
 License:        Python or ZPLv2.0
-URL:            http://peak.telecommunity.com/DevCenter/setuptools
+URL:            http://pypi.python.org/pypi/setuptools
-Source0:        http://cheeseshop.python.org/packages/source/s/setuptools/setuptools-%{version}.tar.gz
+Source0:        http://pypi.python.org/packages/source/s/setuptools/setuptools-%{version}.tar.gz
 Source1:        psfl.txt
 Source2:        zpl.txt
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -17,7 +17,7 @@ BuildArch:      noarch
 BuildRequires:  python-devel
 
 %description
-setuptools is a collection of enhancements to the Python distutils that allow
+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.
 
@@ -41,7 +41,7 @@ requiring setuptools.
 
 %prep
 %setup -q -n setuptools-%{version}
-chmod -x *.txt
+find -name '*.txt' | xargs chmod -x
 find -name '*.py' | xargs sed -i '1s|^#!python|#!%{__python}|'
 
 
@@ -50,8 +50,7 @@ CFLAGS="$RPM_OPT_FLAGS" %{__python} setup.py build
 
 
 %check
-# We expect one failure with the current setup
+%{__python} setup.py test
-%{__python} setup.py test || :
 
 
 %install
@@ -64,7 +63,6 @@ rm -rf $RPM_BUILD_ROOT%{python_sitelib}/setuptools/tests
 
 install -p -m 0644 %{SOURCE1} %{SOURCE2} .
 find $RPM_BUILD_ROOT%{python_sitelib} -name '*.exe' | xargs rm -f
-find $RPM_BUILD_ROOT%{python_sitelib} -name '*.txt' | xargs chmod -x
 chmod +x $RPM_BUILD_ROOT%{python_sitelib}/setuptools/command/easy_install.py
 
 
@@ -86,6 +84,14 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sun Nov 23 2008 Konstantin Ryabitsev <icon@fedoraproject.org> - 0.6c9-1
+- Update to 0.6c9
+- Small fixes to URL, summary and description
+
+* Sat Jun 21 2008 Konstantin Ryabitsev <icon@fedoraproject.org> - 0.6c8-1
+- Update to 0.6c8
+- Accept small tweaks from Gareth Armstrong
+
 * Mon Sep 24 2007 Konstantin Ryabitsev <icon@fedoraproject.org> - 0.6c7-2
 - Move pretty much everything back into runtime in order to avoid more
   brokenness than we're trying to address with these fixes.

sources

@@ -1 +1 @@
-dedbf6a4f71cd6deaf13ee885054f16b  setuptools-0.6c7.tar.gz
+3864c01d9c719c8924c455714492295e  setuptools-0.6c9.tar.gz