New upstream release:
- python-3.3 fixes - honor umask when setuptools is used to install other modules
This commit is contained in:
parent
0ef78f7cec
commit
a4d5040e19
1
.gitignore
vendored
1
.gitignore
vendored
@ -4,3 +4,4 @@ distribute-0.6.14.tar.gz
|
||||
/distribute-0.6.24.tar.gz
|
||||
/distribute-0.6.26.tar.gz
|
||||
/distribute-0.6.27.tar.gz
|
||||
/distribute-0.6.28.tar.gz
|
||||
|
@ -1,13 +1,14 @@
|
||||
Index: distribute-0.6.27/setuptools/tests/test_packageindex.py
|
||||
Index: distribute-0.6.28/setuptools/tests/test_packageindex.py
|
||||
===================================================================
|
||||
--- distribute-0.6.27.orig/setuptools/tests/test_packageindex.py
|
||||
+++ distribute-0.6.27/setuptools/tests/test_packageindex.py
|
||||
@@ -70,7 +70,7 @@ class TestPackageIndex(unittest.TestCase
|
||||
--- distribute-0.6.28.orig/setuptools/tests/test_packageindex.py
|
||||
+++ distribute-0.6.28/setuptools/tests/test_packageindex.py
|
||||
@@ -73,7 +73,8 @@ class TestPackageIndex(unittest.TestCase
|
||||
index.open_url(url)
|
||||
except distutils.errors.DistutilsError, error:
|
||||
# Python 2.7.3
|
||||
- self.assert_('getaddrinfo failed' in str(error))
|
||||
+ self.assert_('getaddrinfo failed' in str(error) or 'Name or service not known' in str(error))
|
||||
except httplib.InvalidURL, error:
|
||||
# Python 2.7.2 and earlier
|
||||
self.assert_('nonnumeric port' in str(error))
|
||||
msg = unicode(error)
|
||||
- assert 'nonnumeric port' in msg or 'getaddrinfo failed' in msg
|
||||
+ assert 'nonnumeric port' in msg or 'getaddrinfo failed' in msg\
|
||||
+ or 'Name or service not known' in msg
|
||||
return
|
||||
raise RuntimeError("Did not raise")
|
||||
|
||||
|
@ -7,8 +7,8 @@
|
||||
%global srcname distribute
|
||||
|
||||
Name: python-setuptools
|
||||
Version: 0.6.27
|
||||
Release: 2%{?dist}
|
||||
Version: 0.6.28
|
||||
Release: 1%{?dist}
|
||||
Summary: Easily build and distribute Python packages
|
||||
|
||||
Group: Applications/System
|
||||
@ -17,8 +17,11 @@ 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
|
||||
# https://bitbucket.org/tarek/distribute/issue/300/invalid-urls-can-fail-with-other-error
|
||||
Patch0: distribute-different-exception-message.patch
|
||||
Patch1: distribute-timeout-exception.patch
|
||||
# Sometimes this times out in the build system. Hanging onto the patch in git
|
||||
# for a bit in case that behavior returns
|
||||
#Patch1: distribute-timeout-exception.patch
|
||||
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
|
||||
|
||||
@ -65,7 +68,7 @@ This package contains the distribute fork of setuptools.
|
||||
%setup -q -n %{srcname}-%{version}
|
||||
|
||||
%patch0 -p1 -b .excmsg
|
||||
%patch1 -p1 -b .exctype
|
||||
#patch1 -p1 -b .exctype
|
||||
|
||||
find -name '*.txt' | xargs chmod -x
|
||||
find . -name '*.orig' -exec rm \{\} \;
|
||||
@ -149,6 +152,11 @@ rm -rf %{buildroot}
|
||||
%endif # with_python3
|
||||
|
||||
%changelog
|
||||
* Mon Jul 23 2012 Toshio Kuratomi <toshio@fedoraproject.org> - 0.6.28-1
|
||||
- New upstream release:
|
||||
- python-3.3 fixes
|
||||
- honor umask when setuptools is used to install other modules
|
||||
|
||||
* Mon Jun 11 2012 Toshio Kuratomi <toshio@fedoraproject.org> - 0.6.27-2
|
||||
- Fix easy_install.py having a python3 shebang in the python2 package
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user