From c8db69c834b038228f74966ff73aaff18a43566b Mon Sep 17 00:00:00 2001
From: Toshio Kuratomi <toshio@fedoraproject.org>
Date: Nov 04 2013 19:59:43 +0000
Subject: Upstream update that pulls in our security patches


---

diff --git a/.gitignore b/.gitignore
index 1ed4d70..9ccc0b8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -13,3 +13,5 @@ distribute-0.6.14.tar.gz
 /setuptools-0.9.6.tar.gz
 /setuptools-1.1.6.tar.gz
 /setuptools-1.1.7.tar.gz
+/setuptools-1.3.tar.gz
+/svn17_example.zip
diff --git a/python-setuptools.spec b/python-setuptools.spec
index da0e68b..144a260 100644
--- a/python-setuptools.spec
+++ b/python-setuptools.spec
@@ -7,7 +7,7 @@
 %global srcname setuptools
 
 Name:           python-setuptools
-Version:        1.1.7
+Version:        1.3
 Release:        1%{?dist}
 Summary:        Easily build and distribute Python packages
 
@@ -17,12 +17,13 @@ URL:            http://pypi.python.org/pypi/%{srcname}
 Source0:        http://pypi.python.org/packages/source/s/%{srcname}/%{srcname}-%{version}.tar.gz
 Source1:        psfl.txt
 Source2:        zpl.txt
-# https://github.com/jaraco/setuptools/pull/2
-# Fixes security issue: http://bugs.python.org/issue17997#msg194950
-Patch0: setuptools-ssl-match_hostname-wildcard.patch
-# https://github.com/jaraco/setuptools/pull/3
-# Shouldn't actually affect us as it's compat for 2.5 or earlier
-Patch1: 0001-Import-socket.error-so-the-code-throws-the-correct-e.patch
+# Test data for the svn unittests from
+# https://bitbucket.org/pypa/setuptools/src/ca2fc862ded7e3a2c07397f0d7d929a9534493a7/setuptools/tests/svn_data/svn17_example.zip?at=default
+# Pull Request to add this to the next upstream release here: 
+# https://github.com/jaraco/setuptools/pull/4
+Source3:        svn17_example.zip
+# https://bitbucket.org/pypa/setuptools/src/ca2fc862ded7e3a2c07397f0d7d929a9534493a7/setuptools/tests/svn_data/svn18_example.zip?at=default
+Source4:        svn18_example.zip
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -34,9 +35,13 @@ BuildRequires:  python2-devel
 %if 0%{?with_python3}
 BuildRequires:  python3-devel
 %endif # if with_python3
+# For unittests
+BuildRequires: subversion
 
 # Legacy: We removed this subpackage once easy_install no longer depended on
 # python-devel
+# Planning on removing for F21
+# https://lists.fedoraproject.org/pipermail/devel/2013-November/191344.html
 Provides: python-setuptools-devel = %{version}-%{release}
 Obsoletes: python-setuptools-devel < 0.6.7-1
 
@@ -51,7 +56,7 @@ 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.
 
-This package contains the runtime components of setuptools, necessary to
+This package also contains the runtime components of setuptools, necessary to
 execute the software that requires pkg_resources.py.
 
 %if 0%{?with_python3}
@@ -68,7 +73,7 @@ Setuptools is a collection of enhancements to the Python 3 distutils that allow
 you to more easily build and distribute Python 3 packages, especially ones that
 have dependencies on other packages.
 
-This package contains the runtime components of setuptools, necessary to
+This package also contains the runtime components of setuptools, necessary to
 execute the software that requires pkg_resources.py.
 
 %endif # with_python3
@@ -76,12 +81,13 @@ execute the software that requires pkg_resources.py.
 %prep
 %setup -q -n %{srcname}-%{version}
 
-%patch0 -p1
-%patch1 -p1
-
 find -name '*.txt' -exec chmod -x \{\} \;
 find . -name '*.orig' -exec rm \{\} \;
 
+# For unittests
+cp %{SOURCE3} setuptools/tests/svn_data/
+cp %{SOURCE4} setuptools/tests/svn_data/
+
 %if 0%{?with_python3}
 rm -rf %{py3dir}
 cp -a . %{py3dir}
@@ -112,6 +118,7 @@ rm -rf %{buildroot}
 # Must do the python3 install first because the scripts in /usr/bin are
 # overwritten with every setup.py install (and we want the python2 version
 # to be the default for now).
+# Change to defaulting to python3 version in F22
 %if 0%{?with_python3}
 pushd %{py3dir}
 %{__python3} setup.py install --skip-build --root %{buildroot}
@@ -161,6 +168,9 @@ rm -rf %{buildroot}
 %endif # with_python3
 
 %changelog
+* Mon Nov  4 2013 Toshio Kuratomi <toshio@fedoraproject.org> - 1.3-1
+- Upstream update that pulls in our security patches
+
 * Mon Oct 28 2013 Toshio Kuratomi <toshio@fedoraproject.org> - 1.1.7-1
 - Update to newer upstream release that has our patch to the unittests
 - Fix for http://bugs.python.org/issue17997#msg194950 which affects us since
diff --git a/sources b/sources
index 904d419..769d017 100644
--- a/sources
+++ b/sources
@@ -1 +1,3 @@
-1f33594d25d574a1640ffb84667c6759  setuptools-1.1.7.tar.gz
+131956989d1ec7bac1f7be034800f183  setuptools-1.3.tar.gz
+f17c2dc62e023d3cff2503ef4add7897  svn17_example.zip
+ad63f937c5a9bba35573467a1fc57400  svn18_example.zip