From 777077a2f979b3aaac9a82fffddb6ed2617125cc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Toshio=20=E3=81=8F=E3=82=89=E3=81=A8=E3=81=BF?= Date: Thu, 10 Jun 2010 22:57:40 +0000 Subject: [PATCH 01/12] - Update to upstream 0.6.13 - Minor specfile formatting fixes --- .cvsignore | 2 +- python-setuptools.spec | 14 ++- sources | 2 +- svn_versioning_4.patch | 217 ----------------------------------------- 4 files changed, 11 insertions(+), 224 deletions(-) delete mode 100644 svn_versioning_4.patch diff --git a/.cvsignore b/.cvsignore index 7fa0695..a505f45 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -distribute-0.6.10.tar.gz +distribute-0.6.13.tar.gz diff --git a/python-setuptools.spec b/python-setuptools.spec index 7555599..d1e8616 100644 --- a/python-setuptools.spec +++ b/python-setuptools.spec @@ -7,8 +7,8 @@ %global srcname distribute Name: python-setuptools -Version: 0.6.10 -Release: 3%{?dist} +Version: 0.6.13 +Release: 1%{?dist} Summary: Easily build and distribute Python packages Group: Applications/System @@ -20,7 +20,7 @@ Source2: zpl.txt BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch -BuildRequires: python-devel +BuildRequires: python2-devel %if 0%{?with_python3} BuildRequires: python3-devel %endif # if with_python3 @@ -81,7 +81,7 @@ rm -rf %{buildroot} # to be the default for now). %if 0%{?with_python3} pushd %{py3dir} -%{__python3} setup.py install --skip-build --root $RPM_BUILD_ROOT +%{__python3} setup.py install --skip-build --root %{buildroot} rm -rf %{buildroot}%{python3_sitelib}/setuptools/tests @@ -91,7 +91,7 @@ chmod +x %{buildroot}%{python3_sitelib}/setuptools/command/easy_install.py popd %endif # with_python3 -%{__python} setup.py install --skip-build --root $RPM_BUILD_ROOT +%{__python} setup.py install --skip-build --root %{buildroot} rm -rf ${buildroot}%{python_sitelib}/setuptools/tests @@ -128,6 +128,10 @@ rm -rf $RPM_BUILD_ROOT %endif # with_python3 %changelog +* Thu Jun 10 2010 Toshio Kuratomi - 0.6.13-1 +- Update to upstream 0.6.13 +- Minor specfile formatting fixes + * Thu Feb 04 2010 Toshio Kuratomi - 0.6.10-3 - First build with python3 support enabled. diff --git a/sources b/sources index ad05ccb..534461e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -99fb4b3e4ef0861bba11aa1905e89fed distribute-0.6.10.tar.gz +43460b429e86bf0da2bb18574d63ec0c distribute-0.6.13.tar.gz diff --git a/svn_versioning_4.patch b/svn_versioning_4.patch deleted file mode 100644 index 175f9ae..0000000 --- a/svn_versioning_4.patch +++ /dev/null @@ -1,217 +0,0 @@ -Index: setuptools/svn_util.py -=================================================================== ---- setuptools/svn_util.py (revision 0) -+++ setuptools/svn_util.py (revision 0) -@@ -0,0 +1,109 @@ -+import os -+import re -+ -+def get_entries_files(base, recurse=True): -+ for base,dirs,files in os.walk(os.curdir): -+ if '.svn' not in dirs: -+ dirs[:] = [] -+ continue # no sense walking uncontrolled subdirs -+ dirs.remove('.svn') -+ f = open(os.path.join(base,'.svn','entries')) -+ yield f.read() -+ f.close() -+ -+class SVNEntries(object): -+ def __init__(self, data): -+ self.data = data -+ -+ @classmethod -+ def load(class_, base): -+ filename = os.path.join(base, '.svn', 'entries') -+ f = open(filename) -+ result = SVNEntries.read(f) -+ f.close() -+ return result -+ -+ @classmethod -+ def read(class_, file): -+ data = file.read() -+ is_xml = data.startswith('revision_line_number -+ and section[revision_line_number] -+ ] -+ return rev_numbers -+ -+ def get_undeleted_records(self): -+ undeleted = lambda s: s and s[0] and (len(s) < 6 or s[5] != 'delete') -+ result = [ -+ section[0] -+ for section in self.get_sections() -+ if undeleted(section) -+ ] -+ return result -+ -+class SVNEntriesXML(SVNEntries): -+ def is_valid(self): -+ return True -+ -+ def get_url(self): -+ "Get repository URL" -+ urlre = re.compile('url="([^"]+)"') -+ return urlre.search(self.data).group(1) -+ -+ def parse_revision_numbers(self): -+ revre = re.compile('committed-rev="(\d+)"') -+ return [ -+ int(m.group(1)) -+ for m in revre.finditer(self.data) -+ ] -+ -+ def get_undeleted_records(self): -+ entries_pattern = re.compile(r'name="([^"]+)"(?![^>]+deleted="true")', re.I) -+ results = [ -+ unescape(match.group(1)) -+ for match in entries_pattern.finditer(self.data) -+ ] -+ return results - -Property changes on: setuptools/svn_util.py -___________________________________________________________________ -Name: svn:keywords - + Id Rev Author Date -Name: svn:eol-style - + native - -Index: setuptools/command/egg_info.py -=================================================================== ---- setuptools/command/egg_info.py (revision 72970) -+++ setuptools/command/egg_info.py (working copy) -@@ -8,6 +8,7 @@ - from distutils.errors import * - from distutils import log - from setuptools.command.sdist import sdist -+from setuptools import svn_util - from distutils.util import convert_path - from distutils.filelist import FileList - from pkg_resources import parse_requirements, safe_name, parse_version, \ -@@ -205,30 +206,20 @@ - - def get_svn_revision(self): - revision = 0 -- urlre = re.compile('url="([^"]+)"') -- revre = re.compile('committed-rev="(\d+)"') - - for base,dirs,files in os.walk(os.curdir): - if '.svn' not in dirs: - dirs[:] = [] - continue # no sense walking uncontrolled subdirs - dirs.remove('.svn') -- f = open(os.path.join(base,'.svn','entries')) -- data = f.read() -- f.close() -- -- if data.startswith('9') or data.startswith('8'): -- data = map(str.splitlines,data.split('\n\x0c\n')) -- del data[0][0] # get rid of the '8' or '9' -- dirurl = data[0][3] -- localrev = max([int(d[9]) for d in data if len(d)>9 and d[9]]+[0]) -- elif data.startswith('"), (""", '"'), ("'", "'"), -@@ -80,24 +81,11 @@ - yield joinpath(dirname, parts[0]) - - --entries_pattern = re.compile(r'name="([^"]+)"(?![^>]+deleted="true")', re.I) - - def entries_finder(dirname, filename): -- f = open(filename,'rU') -- data = f.read() -- f.close() -- if data.startswith('9') or data.startswith('8'): # subversion 1.5/1.4 -- for record in map(str.splitlines, data.split('\n\x0c\n')[1:]): -- if not record or len(record)>=6 and record[5]=="delete": -- continue # skip deleted -- yield joinpath(dirname, record[0]) -- elif data.startswith(' Date: Thu, 10 Jun 2010 23:53:37 +0000 Subject: [PATCH 02/12] - Include data that's needed for running tests --- distribute-0.6.13-tests.patch | 25 +++++++++++++++++++++++++ python-setuptools.spec | 8 +++++++- 2 files changed, 32 insertions(+), 1 deletion(-) create mode 100644 distribute-0.6.13-tests.patch diff --git a/distribute-0.6.13-tests.patch b/distribute-0.6.13-tests.patch new file mode 100644 index 0000000..3da1be7 --- /dev/null +++ b/distribute-0.6.13-tests.patch @@ -0,0 +1,25 @@ +diff -uNr distribute-0.6.13.pristine/MANIFEST.in distribute-0.6.13/MANIFEST.in +--- distribute-0.6.13.pristine/MANIFEST.in 2009-12-28 13:44:40.000000000 -0500 ++++ distribute-0.6.13/MANIFEST.in 2010-06-10 19:43:39.508527227 -0400 +@@ -1,5 +1,6 @@ + recursive-include setuptools *.py *.txt *.exe + recursive-include tests *.py *.c *.pyx *.txt ++recursive-include setuptools/tests *.html + recursive-include docs *.py *.txt *.conf *.css *.css_t Makefile indexsidebar.html + include *.py + include *.txt +diff -uNr distribute-0.6.13.pristine/setuptools/tests/indexes/test_links_priority/external.html distribute-0.6.13/setuptools/tests/indexes/test_links_priority/external.html +--- distribute-0.6.13.pristine/setuptools/tests/indexes/test_links_priority/external.html 1969-12-31 19:00:00.000000000 -0500 ++++ distribute-0.6.13/setuptools/tests/indexes/test_links_priority/external.html 2010-06-10 19:40:53.190527048 -0400 +@@ -0,0 +1,3 @@ ++ ++bad old link ++ +diff -uNr distribute-0.6.13.pristine/setuptools/tests/indexes/test_links_priority/simple/foobar/index.html distribute-0.6.13/setuptools/tests/indexes/test_links_priority/simple/foobar/index.html +--- distribute-0.6.13.pristine/setuptools/tests/indexes/test_links_priority/simple/foobar/index.html 1969-12-31 19:00:00.000000000 -0500 ++++ distribute-0.6.13/setuptools/tests/indexes/test_links_priority/simple/foobar/index.html 2010-06-10 19:40:53.187526243 -0400 +@@ -0,0 +1,4 @@ ++ ++foobar-0.1.tar.gz
++external homepage
++ diff --git a/python-setuptools.spec b/python-setuptools.spec index d1e8616..3c34ac2 100644 --- a/python-setuptools.spec +++ b/python-setuptools.spec @@ -8,7 +8,7 @@ Name: python-setuptools Version: 0.6.13 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Easily build and distribute Python packages Group: Applications/System @@ -17,6 +17,7 @@ URL: http://pypi.python.org/pypi/%{srcname} 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 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch @@ -54,6 +55,8 @@ execute the software that requires pkg_resources.py. %prep %setup -q -n %{srcname}-%{version} +%patch0 -p1 + find -name '*.txt' | xargs chmod -x %if 0%{?with_python3} @@ -128,6 +131,9 @@ rm -rf $RPM_BUILD_ROOT %endif # with_python3 %changelog +* Thu Jun 10 2010 Toshio Kuratomi - 0.6.13-2 +- Include data that's needed for running tests + * Thu Jun 10 2010 Toshio Kuratomi - 0.6.13-1 - Update to upstream 0.6.13 - Minor specfile formatting fixes From 29bf732cc658e8c862c9164f4bda756b4830b8df Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Toshio=20=E3=81=8F=E3=82=89=E3=81=A8=E3=81=BF?= Date: Fri, 11 Jun 2010 00:21:47 +0000 Subject: [PATCH 03/12] - Fix few more buildroot macros --- python-setuptools.spec | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/python-setuptools.spec b/python-setuptools.spec index 3c34ac2..ddce812 100644 --- a/python-setuptools.spec +++ b/python-setuptools.spec @@ -8,7 +8,7 @@ Name: python-setuptools Version: 0.6.13 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Easily build and distribute Python packages Group: Applications/System @@ -96,7 +96,7 @@ popd %{__python} setup.py install --skip-build --root %{buildroot} -rm -rf ${buildroot}%{python_sitelib}/setuptools/tests +rm -rf %{buildroot}%{python_sitelib}/setuptools/tests install -p -m 0644 %{SOURCE1} %{SOURCE2} . find %{buildroot}%{python_sitelib} -name '*.exe' | xargs rm -f @@ -112,7 +112,7 @@ popd %endif # with_python3 %clean -rm -rf $RPM_BUILD_ROOT +rm -rf %{buildroot} %files @@ -131,6 +131,9 @@ rm -rf $RPM_BUILD_ROOT %endif # with_python3 %changelog +* Thu Jun 10 2010 Toshio Kuratomi - 0.6.13-3 +- Fix few more buildroot macros + * Thu Jun 10 2010 Toshio Kuratomi - 0.6.13-2 - Include data that's needed for running tests From 0b8aaaaf700ab4222658b5bb01e45252e1c87cc7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Toshio=20=E3=81=8F=E3=82=89=E3=81=A8=E3=81=BF?= Date: Fri, 11 Jun 2010 03:52:18 +0000 Subject: [PATCH 04/12] - Fix race condition in unittests under the python-2.6.x on F-14. --- distribute-tests-race.patch | 23 +++++++++++++++++++++++ python-setuptools.spec | 7 ++++++- 2 files changed, 29 insertions(+), 1 deletion(-) create mode 100644 distribute-tests-race.patch diff --git a/distribute-tests-race.patch b/distribute-tests-race.patch new file mode 100644 index 0000000..d2dd2aa --- /dev/null +++ b/distribute-tests-race.patch @@ -0,0 +1,23 @@ +# HG changeset patch +# User Toshio Kuratomi +# Date 1276227950 14400 +# Branch 0.6-maintenance +# Node ID ce279b5609b90c55c365043db02bfaa3b305d1ce +# Parent 99b0b605bfbd00f0752da34cfa15bb2eddfbf302 +Fix race condition with the http server used in unittests + +diff -r 99b0b605bfbd -r ce279b5609b9 setuptools/tests/server.py +--- a/setuptools/tests/server.py Thu Jun 10 19:47:48 2010 -0400 ++++ b/setuptools/tests/server.py Thu Jun 10 23:45:50 2010 -0400 +@@ -32,7 +32,10 @@ + def stop(self): + """self.shutdown is not supported on python < 2.6""" + self._run = False +- urllib2.urlopen('http://127.0.0.1:%s/' % self.server_port) ++ try: ++ urllib2.urlopen('http://127.0.0.1:%s/' % self.server_port, None, 5) ++ except urllib2.URLError: ++ pass + self.thread.join() + + def base_url(self): diff --git a/python-setuptools.spec b/python-setuptools.spec index ddce812..2553c1a 100644 --- a/python-setuptools.spec +++ b/python-setuptools.spec @@ -8,7 +8,7 @@ Name: python-setuptools Version: 0.6.13 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Easily build and distribute Python packages Group: Applications/System @@ -18,6 +18,7 @@ Source0: http://pypi.python.org/packages/source/d/%{srcname}/%{srcname}-% Source1: psfl.txt Source2: zpl.txt Patch0: distribute-0.6.13-tests.patch +Patch1: distribute-tests-race.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch @@ -56,6 +57,7 @@ execute the software that requires pkg_resources.py. %prep %setup -q -n %{srcname}-%{version} %patch0 -p1 +%patch1 -p1 find -name '*.txt' | xargs chmod -x @@ -131,6 +133,9 @@ rm -rf %{buildroot} %endif # with_python3 %changelog +* Thu Jun 10 2010 Toshio Kuratomi - 0.6.13-4 +- Fix race condition in unittests under the python-2.6.x on F-14. + * Thu Jun 10 2010 Toshio Kuratomi - 0.6.13-3 - Fix few more buildroot macros From 1983a88b4e8edc86a5846102066f3b504419e851 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Toshio=20=E3=81=8F=E3=82=89=E3=81=A8=E3=81=BF?= Date: Sat, 3 Jul 2010 18:58:02 +0000 Subject: [PATCH 05/12] - Upstream patch for compatibility problem with setuptools - Minor spec cleanups - Provide python-distribute for those who see an import distribute and need to get the proper package. --- distribute-b045d0750c13.diff | 66 ++++++++++++++++++++++++++++++++++++ python-setuptools.spec | 16 +++++++-- 2 files changed, 80 insertions(+), 2 deletions(-) create mode 100644 distribute-b045d0750c13.diff diff --git a/distribute-b045d0750c13.diff b/distribute-b045d0750c13.diff new file mode 100644 index 0000000..c7147d4 --- /dev/null +++ b/distribute-b045d0750c13.diff @@ -0,0 +1,66 @@ +# HG changeset patch -- Bitbucket.org +# Project distribute +# URL http://bitbucket.org/tarek/distribute/overview +# User David Cournapeau +# Date 1274351504 -32400 +# Node ID b045d0750c13d83ef577593b8bb267a10e803aca +# Parent ab666b0eacbb5523ffb42a412451550f55347fcc +BUG: Fix #142 - easy_install ignore locally installed packages. + +Backport from setuptools 0.6c10. + +--- a/setuptools/command/easy_install.py ++++ b/setuptools/command/easy_install.py +@@ -565,7 +565,8 @@ Please make the appropriate changes for + + self.check_editable(spec) + dist = self.package_index.fetch_distribution( +- spec, tmpdir, self.upgrade, self.editable, not self.always_copy ++ spec, tmpdir, self.upgrade, self.editable, not self.always_copy, ++ self.local_index + ) + + if dist is None: + +--- a/setuptools/package_index.py ++++ b/setuptools/package_index.py +@@ -418,7 +418,8 @@ class PackageIndex(Environment): + + + def fetch_distribution(self, +- requirement, tmpdir, force_scan=False, source=False, develop_ok=False ++ requirement, tmpdir, force_scan=False, source=False, develop_ok=False, ++ local_index=None + ): + """Obtain a distribution suitable for fulfilling `requirement` + +@@ -440,11 +441,14 @@ class PackageIndex(Environment): + # process a Requirement + self.info("Searching for %s", requirement) + skipped = {} ++ dist = None + +- def find(req): ++ def find(req, env=None): ++ if env is None: ++ env = self + # Find a matching distribution; may be called more than once + +- for dist in self[req.key]: ++ for dist in env[req.key]: + + if dist.precedence==DEVELOP_DIST and not develop_ok: + if dist not in skipped: +@@ -461,8 +465,11 @@ class PackageIndex(Environment): + if force_scan: + self.prescan() + self.find_packages(requirement) ++ dist = find(requirement) + +- dist = find(requirement) ++ if local_index is not None: ++ dist = dist or find(requirement, local_index) ++ + if dist is None and self.to_scan is not None: + self.prescan() + dist = find(requirement) diff --git a/python-setuptools.spec b/python-setuptools.spec index 2553c1a..1c5b199 100644 --- a/python-setuptools.spec +++ b/python-setuptools.spec @@ -8,7 +8,7 @@ Name: python-setuptools Version: 0.6.13 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Easily build and distribute Python packages Group: Applications/System @@ -19,6 +19,7 @@ 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 @@ -32,6 +33,9 @@ BuildRequires: python3-devel Provides: python-setuptools-devel = %{version}-%{release} Obsoletes: python-setuptools-devel < 0.6.7-1 +# 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 @@ -58,8 +62,10 @@ execute the software that requires pkg_resources.py. %setup -q -n %{srcname}-%{version} %patch0 -p1 %patch1 -p1 +%patch2 -p1 find -name '*.txt' | xargs chmod -x +find . -name '*.orig' -exec rm \{\} \; %if 0%{?with_python3} rm -rf %{pyver} @@ -119,7 +125,7 @@ rm -rf %{buildroot} %files %defattr(-,root,root,-) -%doc psfl.txt zpl.txt docs +%doc *.txt docs %{python_sitelib}/* %{_bindir}/easy_install %{_bindir}/easy_install-2.6 @@ -133,6 +139,12 @@ rm -rf %{buildroot} %endif # with_python3 %changelog +* Sat Jul 3 2010 Toshio Kuratomi - 0.6.13-5 +- Upstream patch for compatibility problem with setuptools +- Minor spec cleanups +- Provide python-distribute for those who see an import distribute and need + to get the proper package. + * Thu Jun 10 2010 Toshio Kuratomi - 0.6.13-4 - Fix race condition in unittests under the python-2.6.x on F-14. From cfc2bafceda91717784619c7855e658af1650571 Mon Sep 17 00:00:00 2001 From: dmalcolm Date: Wed, 21 Jul 2010 22:56:49 +0000 Subject: [PATCH 06/12] - Rebuilt for https://fedoraproject.org/wiki/Features/Python_2.7/MassRebuild --- python-setuptools.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/python-setuptools.spec b/python-setuptools.spec index 1c5b199..06ca610 100644 --- a/python-setuptools.spec +++ b/python-setuptools.spec @@ -8,7 +8,7 @@ Name: python-setuptools Version: 0.6.13 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Easily build and distribute Python packages Group: Applications/System @@ -139,6 +139,9 @@ rm -rf %{buildroot} %endif # with_python3 %changelog +* Wed Jul 21 2010 David Malcolm - 0.6.13-6 +- Rebuilt for https://fedoraproject.org/wiki/Features/Python_2.7/MassRebuild + * Sat Jul 3 2010 Toshio Kuratomi - 0.6.13-5 - Upstream patch for compatibility problem with setuptools - Minor spec cleanups From 12348a2c1bfbf27490c8a91ffb7ad2884db017d1 Mon Sep 17 00:00:00 2001 From: dmalcolm Date: Wed, 21 Jul 2010 23:06:30 +0000 Subject: [PATCH 07/12] - generalize path of easy_install-2.6 and -3.1 to -2.* and -3.* --- python-setuptools.spec | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/python-setuptools.spec b/python-setuptools.spec index 06ca610..2a8136e 100644 --- a/python-setuptools.spec +++ b/python-setuptools.spec @@ -8,7 +8,7 @@ Name: python-setuptools Version: 0.6.13 -Release: 6%{?dist} +Release: 7%{?dist} Summary: Easily build and distribute Python packages Group: Applications/System @@ -128,17 +128,20 @@ 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 +* Wed Jul 21 2010 David Malcolm - 0.6.13-7 +- generalize path of easy_install-2.6 and -3.1 to -2.* and -3.* + * Wed Jul 21 2010 David Malcolm - 0.6.13-6 - Rebuilt for https://fedoraproject.org/wiki/Features/Python_2.7/MassRebuild From dc629505aa39c651c2584e09392f8a07f628d16f Mon Sep 17 00:00:00 2001 From: tomspur Date: Thu, 22 Jul 2010 12:20:03 +0000 Subject: [PATCH 08/12] - update to new version - all patches are upsteam --- distribute-0.6.13-tests.patch | 25 ------------- distribute-b045d0750c13.diff | 66 ----------------------------------- distribute-tests-race.patch | 23 ------------ python-setuptools.spec | 14 ++++---- 4 files changed, 6 insertions(+), 122 deletions(-) delete mode 100644 distribute-0.6.13-tests.patch delete mode 100644 distribute-b045d0750c13.diff delete mode 100644 distribute-tests-race.patch diff --git a/distribute-0.6.13-tests.patch b/distribute-0.6.13-tests.patch deleted file mode 100644 index 3da1be7..0000000 --- a/distribute-0.6.13-tests.patch +++ /dev/null @@ -1,25 +0,0 @@ -diff -uNr distribute-0.6.13.pristine/MANIFEST.in distribute-0.6.13/MANIFEST.in ---- distribute-0.6.13.pristine/MANIFEST.in 2009-12-28 13:44:40.000000000 -0500 -+++ distribute-0.6.13/MANIFEST.in 2010-06-10 19:43:39.508527227 -0400 -@@ -1,5 +1,6 @@ - recursive-include setuptools *.py *.txt *.exe - recursive-include tests *.py *.c *.pyx *.txt -+recursive-include setuptools/tests *.html - recursive-include docs *.py *.txt *.conf *.css *.css_t Makefile indexsidebar.html - include *.py - include *.txt -diff -uNr distribute-0.6.13.pristine/setuptools/tests/indexes/test_links_priority/external.html distribute-0.6.13/setuptools/tests/indexes/test_links_priority/external.html ---- distribute-0.6.13.pristine/setuptools/tests/indexes/test_links_priority/external.html 1969-12-31 19:00:00.000000000 -0500 -+++ distribute-0.6.13/setuptools/tests/indexes/test_links_priority/external.html 2010-06-10 19:40:53.190527048 -0400 -@@ -0,0 +1,3 @@ -+ -+bad old link -+ -diff -uNr distribute-0.6.13.pristine/setuptools/tests/indexes/test_links_priority/simple/foobar/index.html distribute-0.6.13/setuptools/tests/indexes/test_links_priority/simple/foobar/index.html ---- distribute-0.6.13.pristine/setuptools/tests/indexes/test_links_priority/simple/foobar/index.html 1969-12-31 19:00:00.000000000 -0500 -+++ distribute-0.6.13/setuptools/tests/indexes/test_links_priority/simple/foobar/index.html 2010-06-10 19:40:53.187526243 -0400 -@@ -0,0 +1,4 @@ -+ -+foobar-0.1.tar.gz
-+external homepage
-+ diff --git a/distribute-b045d0750c13.diff b/distribute-b045d0750c13.diff deleted file mode 100644 index c7147d4..0000000 --- a/distribute-b045d0750c13.diff +++ /dev/null @@ -1,66 +0,0 @@ -# HG changeset patch -- Bitbucket.org -# Project distribute -# URL http://bitbucket.org/tarek/distribute/overview -# User David Cournapeau -# Date 1274351504 -32400 -# Node ID b045d0750c13d83ef577593b8bb267a10e803aca -# Parent ab666b0eacbb5523ffb42a412451550f55347fcc -BUG: Fix #142 - easy_install ignore locally installed packages. - -Backport from setuptools 0.6c10. - ---- a/setuptools/command/easy_install.py -+++ b/setuptools/command/easy_install.py -@@ -565,7 +565,8 @@ Please make the appropriate changes for - - self.check_editable(spec) - dist = self.package_index.fetch_distribution( -- spec, tmpdir, self.upgrade, self.editable, not self.always_copy -+ spec, tmpdir, self.upgrade, self.editable, not self.always_copy, -+ self.local_index - ) - - if dist is None: - ---- a/setuptools/package_index.py -+++ b/setuptools/package_index.py -@@ -418,7 +418,8 @@ class PackageIndex(Environment): - - - def fetch_distribution(self, -- requirement, tmpdir, force_scan=False, source=False, develop_ok=False -+ requirement, tmpdir, force_scan=False, source=False, develop_ok=False, -+ local_index=None - ): - """Obtain a distribution suitable for fulfilling `requirement` - -@@ -440,11 +441,14 @@ class PackageIndex(Environment): - # process a Requirement - self.info("Searching for %s", requirement) - skipped = {} -+ dist = None - -- def find(req): -+ def find(req, env=None): -+ if env is None: -+ env = self - # Find a matching distribution; may be called more than once - -- for dist in self[req.key]: -+ for dist in env[req.key]: - - if dist.precedence==DEVELOP_DIST and not develop_ok: - if dist not in skipped: -@@ -461,8 +465,11 @@ class PackageIndex(Environment): - if force_scan: - self.prescan() - self.find_packages(requirement) -+ dist = find(requirement) - -- dist = find(requirement) -+ if local_index is not None: -+ dist = dist or find(requirement, local_index) -+ - if dist is None and self.to_scan is not None: - self.prescan() - dist = find(requirement) diff --git a/distribute-tests-race.patch b/distribute-tests-race.patch deleted file mode 100644 index d2dd2aa..0000000 --- a/distribute-tests-race.patch +++ /dev/null @@ -1,23 +0,0 @@ -# HG changeset patch -# User Toshio Kuratomi -# Date 1276227950 14400 -# Branch 0.6-maintenance -# Node ID ce279b5609b90c55c365043db02bfaa3b305d1ce -# Parent 99b0b605bfbd00f0752da34cfa15bb2eddfbf302 -Fix race condition with the http server used in unittests - -diff -r 99b0b605bfbd -r ce279b5609b9 setuptools/tests/server.py ---- a/setuptools/tests/server.py Thu Jun 10 19:47:48 2010 -0400 -+++ b/setuptools/tests/server.py Thu Jun 10 23:45:50 2010 -0400 -@@ -32,7 +32,10 @@ - def stop(self): - """self.shutdown is not supported on python < 2.6""" - self._run = False -- urllib2.urlopen('http://127.0.0.1:%s/' % self.server_port) -+ try: -+ urllib2.urlopen('http://127.0.0.1:%s/' % self.server_port, None, 5) -+ except urllib2.URLError: -+ pass - self.thread.join() - - def base_url(self): diff --git a/python-setuptools.spec b/python-setuptools.spec index 2a8136e..9d65af8 100644 --- a/python-setuptools.spec +++ b/python-setuptools.spec @@ -7,8 +7,8 @@ %global srcname distribute Name: python-setuptools -Version: 0.6.13 -Release: 7%{?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/pypi/%{srcname} 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 @@ -60,9 +57,6 @@ execute the software that requires pkg_resources.py. %prep %setup -q -n %{srcname}-%{version} -%patch0 -p1 -%patch1 -p1 -%patch2 -p1 find -name '*.txt' | xargs chmod -x find . -name '*.orig' -exec rm \{\} \; @@ -139,6 +133,10 @@ rm -rf %{buildroot} %endif # with_python3 %changelog +* Thu Jul 22 2010 Thomas Spura - 0.6.14-1 +- update to new version +- all patches are upsteam + * Wed Jul 21 2010 David Malcolm - 0.6.13-7 - generalize path of easy_install-2.6 and -3.1 to -2.* and -3.* From 4cb416dc503bbfd0f63bc7cbdd647241a9f8979d Mon Sep 17 00:00:00 2001 From: tomspur Date: Thu, 22 Jul 2010 12:25:51 +0000 Subject: [PATCH 09/12] Forgot to add new sources --- .cvsignore | 2 +- sources | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.cvsignore b/.cvsignore index a505f45..6c2d5fd 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -distribute-0.6.13.tar.gz +distribute-0.6.14.tar.gz diff --git a/sources b/sources index 534461e..2f5c536 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -43460b429e86bf0da2bb18574d63ec0c distribute-0.6.13.tar.gz +ac607e05682116c06383b27a15e2db90 distribute-0.6.14.tar.gz From ccbd844e51538fcfdcdf00d17808ee9fa0f37f43 Mon Sep 17 00:00:00 2001 From: tomspur Date: Thu, 22 Jul 2010 12:35:39 +0000 Subject: [PATCH 10/12] bump for building against python 2.7 --- python-setuptools.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/python-setuptools.spec b/python-setuptools.spec index 9d65af8..0073064 100644 --- a/python-setuptools.spec +++ b/python-setuptools.spec @@ -8,7 +8,7 @@ Name: python-setuptools Version: 0.6.14 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Easily build and distribute Python packages Group: Applications/System @@ -133,6 +133,9 @@ rm -rf %{buildroot} %endif # with_python3 %changelog +* Thu Jul 22 2010 Thomas Spura - 0.6.14-2 +- bump for building against python 2.7 + * Thu Jul 22 2010 Thomas Spura - 0.6.14-1 - update to new version - all patches are upsteam From 7d54901c8bcfa499b2379a6f103eec8c7454a4a6 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 29 Jul 2010 10:42:07 +0000 Subject: [PATCH 11/12] dist-git conversion --- .cvsignore => .gitignore | 0 Makefile | 21 --------------------- 2 files changed, 21 deletions(-) rename .cvsignore => .gitignore (100%) delete mode 100644 Makefile diff --git a/.cvsignore b/.gitignore similarity index 100% rename from .cvsignore rename to .gitignore diff --git a/Makefile b/Makefile deleted file mode 100644 index ff58205..0000000 --- a/Makefile +++ /dev/null @@ -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 $$d/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) From 957130b2fa736cd2574a0cb8bb345cc5ddf819f7 Mon Sep 17 00:00:00 2001 From: Toshio Kuratomi Date: Tue, 10 Aug 2010 13:26:57 -0400 Subject: [PATCH 12/12] * Tue Aug 10 2010 Toshio Kuratomi - 0.6.14-3 - Update description to mention this is distribute --- python-setuptools.spec | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/python-setuptools.spec b/python-setuptools.spec index 0073064..e1a70c8 100644 --- a/python-setuptools.spec +++ b/python-setuptools.spec @@ -8,7 +8,7 @@ Name: python-setuptools Version: 0.6.14 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Easily build and distribute Python packages Group: Applications/System @@ -41,6 +41,7 @@ have dependencies on other packages. This package contains the runtime components of setuptools, necessary to execute the software that requires pkg_resources.py. +This package contains the distribute fork of setuptools. %if 0%{?with_python3} %package -n python3-setuptools Summary: Easily build and distribute Python 3 packages @@ -53,6 +54,8 @@ have dependencies on other packages. This package contains the runtime components of setuptools, necessary to execute the software that requires pkg_resources.py. + +This package contains the distribute fork of setuptools. %endif # with_python3 %prep @@ -133,6 +136,9 @@ rm -rf %{buildroot} %endif # with_python3 %changelog +* Tue Aug 10 2010 Toshio Kuratomi - 0.6.14-3 +- Update description to mention this is distribute + * Thu Jul 22 2010 Thomas Spura - 0.6.14-2 - bump for building against python 2.7