rpms/python-setuptools/F-13 python-setuptools.spec, 1.37, 1.38 distribute-0.6.13-tests.patch, 1.1, NONE distribute-b045d0750c13.diff, 1.1, NONE distribute-tests-race.patch, 1.1, NONE

[tomspur]

Author: tomspur

Update of /cvs/pkgs/rpms/python-setuptools/F-13
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv11952/F-13

Modified Files:
	python-setuptools.spec 
Removed Files:
	distribute-0.6.13-tests.patch distribute-b045d0750c13.diff 
	distribute-tests-race.patch 
Log Message:
- update to new version
- all patches are upsteam



Index: python-setuptools.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-setuptools/F-13/python-setuptools.spec,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -p -r1.37 -r1.38
--- python-setuptools.spec	3 Jul 2010 19:10:22 -0000	1.37
+++ python-setuptools.spec	22 Jul 2010 12:20:02 -0000	1.38
@@ -7,8 +7,8 @@
 %global srcname distribute
 
 Name:           python-setuptools
-Version:        0.6.13
-Release:        5%{?dist}
+Version:        0.6.14
+Release:        1%{?dist}
 Summary:        Easily build and distribute Python packages
 
 Group:          Applications/System
@@ -17,9 +17,6 @@ URL:            http://pypi.python.org/p
 Source0:        http://pypi.python.org/packages/source/d/%{srcname}/%{srcname}-%{version}.tar.gz
 Source1:        psfl.txt
 Source2:        zpl.txt
-Patch0:         distribute-0.6.13-tests.patch
-Patch1:         distribute-tests-race.patch
-Patch2:         http://bitbucket.org/tarek/distribute/changeset/b045d0750c13/raw/distribute-b045d0750c13.diff
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
@@ -35,6 +32,7 @@ Obsoletes: python-setuptools-devel < 0.6
 
 # Provide this since some people will request distribute by name
 Provides: python-distribute = %{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
@@ -59,9 +57,6 @@ execute the software that requires pkg_r
 
 %prep
 %setup -q -n %{srcname}-%{version}
-%patch0 -p1
-%patch1 -p1
-%patch2 -p1
 
 find -name '*.txt' | xargs chmod -x
 find . -name '*.orig' -exec rm \{\} \;
@@ -127,17 +122,27 @@ rm -rf %{buildroot}
 %doc *.txt docs
 %{python_sitelib}/*
 %{_bindir}/easy_install
-%{_bindir}/easy_install-2.6
+%{_bindir}/easy_install-2.*
 
 %if 0%{?with_python3}
 %files -n python3-setuptools
 %defattr(-,root,root,-)
 %doc psfl.txt zpl.txt docs
 %{python3_sitelib}/*
-%{_bindir}/easy_install-3.1
+%{_bindir}/easy_install-3.*
 %endif # with_python3
 
 %changelog
+* Thu Jul 22 2010 Thomas Spura <tomspur at fedoraproject.org> - 0.6.14-1
+- update to new version
+- all patches are upsteam
+
+* Wed Jul 21 2010 David Malcolm <dmalcolm at redhat.com> - 0.6.13-7
+- generalize path of easy_install-2.6 and -3.1 to -2.* and -3.*
+
+* Wed Jul 21 2010 David Malcolm <dmalcolm at redhat.com> - 0.6.13-6
+- Rebuilt for https://fedoraproject.org/wiki/Features/Python_2.7/MassRebuild
+
 * Sat Jul 3 2010 Toshio Kuratomi <toshio at fedoraproject.org> - 0.6.13-5
 - Upstream patch for compatibility problem with setuptools
 - Minor spec cleanups
@@ -146,6 +151,7 @@ rm -rf %{buildroot}
 
 * Thu Jun 10 2010 Toshio Kuratomi <toshio at fedoraproject.org> - 0.6.13-4
 - Fix race condition in unittests under the python-2.6.x on F-14.
+
 * Thu Jun 10 2010 Toshio Kuratomi <toshio at fedoraproject.org> - 0.6.13-3
 - Fix few more buildroot macros
 


--- distribute-0.6.13-tests.patch DELETED ---


--- distribute-b045d0750c13.diff DELETED ---


--- distribute-tests-race.patch DELETED ---