From e9394b6f8138e55168660f66e23f9d43e98675f1 Mon Sep 17 00:00:00 2001
From: Nathaniel McCallum <npmccallum@redhat.com>
Date: Mon, 7 Nov 2016 11:08:45 -0500
Subject: [PATCH] Fixed botched update

---
 .gitignore                                 |  1 +
 python-cryptography-1.3.1-setuptools.patch | 31 ----------------------
 python-cryptography.spec                   |  1 -
 sources                                    |  2 +-
 4 files changed, 2 insertions(+), 33 deletions(-)
 delete mode 100644 python-cryptography-1.3.1-setuptools.patch

diff --git a/.gitignore b/.gitignore
index 581ba70..2ab4c5a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 /cryptography-1.3.1.tar.gz
+/cryptography-1.5.3.tar.gz
diff --git a/python-cryptography-1.3.1-setuptools.patch b/python-cryptography-1.3.1-setuptools.patch
deleted file mode 100644
index aee9d97..0000000
--- a/python-cryptography-1.3.1-setuptools.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-diff --git a/setup.py b/setup.py
-index 7267529..098a6bb 100644
---- a/setup.py
-+++ b/setup.py
-@@ -37,7 +37,7 @@ requirements = [
-     "idna>=2.0",
-     "pyasn1>=0.1.8",
-     "six>=1.4.1",
--    "setuptools>=11.3",
-+    "setuptools",
- ]
- setup_requirements = []
- 
-diff --git a/src/cryptography/hazmat/backends/__init__.py b/src/cryptography/hazmat/backends/__init__.py
-index 96a431d..256fee3 100644
---- a/src/cryptography/hazmat/backends/__init__.py
-+++ b/src/cryptography/hazmat/backends/__init__.py
-@@ -17,7 +17,12 @@ def _available_backends():
- 
-     if _available_backends_list is None:
-         _available_backends_list = [
--            ep.resolve()
-+            # setuptools 11.3 deprecated support for the require parameter to
-+            # load(), and introduced the new resolve() method instead.
-+            # This can be removed if/when we can assume setuptools>=11.3. At
-+            # some point we may wish to add a warning, to push people along,
-+            # but at present this would result in too many warnings.
-+            ep.resolve() if hasattr(ep, "resolve") else ep.load(require=False)
-             for ep in pkg_resources.iter_entry_points(
-                 "cryptography.backends"
-             )
diff --git a/python-cryptography.spec b/python-cryptography.spec
index 69a79ea..0e49fdd 100644
--- a/python-cryptography.spec
+++ b/python-cryptography.spec
@@ -152,7 +152,6 @@ popd
 * Mon Nov 07 2016 Nathaniel McCallum <npmccallum@redhat.com> - 1.5.3-1
 - Update to v1.5.3
 - Update source URL
-- Remove patch
 
 * Tue Jul 19 2016 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.3.1-4
 - https://fedoraproject.org/wiki/Changes/Automatic_Provides_for_Python_RPM_Packages
diff --git a/sources b/sources
index e0274fb..d266e68 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-bc8148d2ff2d80fef8ef2d2e856b3a7f  cryptography-1.3.1.tar.gz
+9db24923f48f6c223e9d64b517838846  cryptography-1.5.3.tar.gz