From 895ce1eb1326ea1d117bce2b7e83457ce28628b3 Mon Sep 17 00:00:00 2001
From: Toshio Kuratomi <toshio@fedoraproject.org>
Date: Apr 12 2013 01:09:47 +0000
Subject: Update to upstream 0.6.36.  Many bugfixes


---

diff --git a/.gitignore b/.gitignore
index e88ff77..7ac499f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,3 +5,4 @@ distribute-0.6.14.tar.gz
 /distribute-0.6.26.tar.gz
 /distribute-0.6.27.tar.gz
 /distribute-0.6.28.tar.gz
+/distribute-0.6.36.tar.gz
diff --git a/distribute-skip-sdist_with_utf8_encoded_filename.patch b/distribute-skip-sdist_with_utf8_encoded_filename.patch
new file mode 100644
index 0000000..21f6032
--- /dev/null
+++ b/distribute-skip-sdist_with_utf8_encoded_filename.patch
@@ -0,0 +1,30 @@
+diff -r a59fcbbf5ca7 setuptools/tests/test_sdist.py
+--- a/setuptools/tests/test_sdist.py	Fri Apr 05 17:14:51 2013 -0400
++++ b/setuptools/tests/test_sdist.py	Thu Apr 11 18:04:06 2013 -0700
+@@ -1,7 +1,7 @@
+ # -*- coding: utf-8 -*-
+ """sdist tests"""
+ 
+-
++import locale
+ import os
+ import shutil
+ import sys
+@@ -11,7 +11,7 @@
+ import unicodedata
+ from StringIO import StringIO
+ 
+-
++from setuptools.tests.py26compat import skipIf
+ from setuptools.command.sdist import sdist
+ from setuptools.command.egg_info import manifest_maker
+ from setuptools.dist import Distribution
+@@ -316,6 +316,8 @@
+             filename = filename.decode('latin-1')
+             self.assertFalse(filename in cmd.filelist.files)
+ 
++    @skipIf(sys.version_info >= (3,) and locale.getpreferredencoding() != 'UTF-8',
++            'Unittest fails if locale is not utf-8 but the manifests is recorded correctly')
+     def test_sdist_with_utf8_encoded_filename(self):
+         # Test for #303.
+         dist = Distribution(SETUP_ATTRS)
diff --git a/python-setuptools.spec b/python-setuptools.spec
index 1dc1a9a..4bb4c67 100644
--- a/python-setuptools.spec
+++ b/python-setuptools.spec
@@ -7,7 +7,7 @@
 %global srcname distribute
 
 Name:           python-setuptools
-Version:        0.6.28
+Version:        0.6.36
 Release:        1%{?dist}
 Summary:        Easily build and distribute Python packages
 
@@ -17,11 +17,9 @@ 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
-# 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
+# Submitted upstream
+# https://bitbucket.org/tarek/distribute/issue/363/skip-test_sdist_with_utf8_encoded_filename
+Patch0: distribute-skip-sdist_with_utf8_encoded_filename.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -67,8 +65,7 @@ This package contains the distribute fork of setuptools.
 %prep
 %setup -q -n %{srcname}-%{version}
 
-%patch0 -p1 -b .excmsg
-#patch1 -p1 -b .exctype
+%patch0 -p1
 
 find -name '*.txt' | xargs chmod -x
 find . -name '*.orig' -exec rm \{\} \;
@@ -152,6 +149,12 @@ rm -rf %{buildroot}
 %endif # with_python3
 
 %changelog
+* Thu Apr 11 2013 Toshio Kuratomi <toshio@fedoraproject.org> - 0.6.36-1
+- Update to upstream 0.6.36.  Many bugfixes
+
+* Sat Oct 20 2012 Toshio Kuratomi <toshio@fedoraproject.org> - 0.6.29-1
+- New upstream release
+
 * Mon Jul 23 2012 Toshio Kuratomi <toshio@fedoraproject.org> - 0.6.28-1
 - New upstream release:
   - python-3.3 fixes
diff --git a/sources b/sources
index ab5d89e..6251986 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-b400b532e33f78551e6847c1f5965e56  distribute-0.6.28.tar.gz
+a923385de72dcdca68cd4ac2b9dc1148  distribute-0.6.36.tar.gz