diff --git a/.gitignore b/.gitignore
index 7afb908..3153588 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-SOURCES/cryptography-0.8.2.tar.gz
+SOURCES/cryptography-1.3.1.tar.gz
diff --git a/.python-cryptography.metadata b/.python-cryptography.metadata
index 2321696..4e24e25 100644
--- a/.python-cryptography.metadata
+++ b/.python-cryptography.metadata
@@ -1 +1 @@
-b04c2172d34caa40143f620afe414563f5c98c9a SOURCES/cryptography-0.8.2.tar.gz
+ebcfdc46c9a169a49ab034c819eca8d8b07167c6 SOURCES/cryptography-1.3.1.tar.gz
diff --git a/SOURCES/python-cryptography-1.3.1-setuptools.patch b/SOURCES/python-cryptography-1.3.1-setuptools.patch
new file mode 100644
index 0000000..aee9d97
--- /dev/null
+++ b/SOURCES/python-cryptography-1.3.1-setuptools.patch
@@ -0,0 +1,31 @@
+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/SPECS/python-cryptography.spec b/SPECS/python-cryptography.spec
index 5ce86c2..6bbeba3 100644
--- a/SPECS/python-cryptography.spec
+++ b/SPECS/python-cryptography.spec
@@ -6,47 +6,74 @@
%endif
Name: python-cryptography
-Version: 0.8.2
-Release: 1%{?dist}
+Version: 1.3.1
+Release: 3%{?dist}
Summary: PyCA's cryptography library
Group: Development/Libraries
License: ASL 2.0 or BSD
URL: https://cryptography.io/en/latest/
Source0: https://pypi.python.org/packages/source/c/cryptography/cryptography-%{version}.tar.gz
+Patch0: %{name}-1.3.1-setuptools.patch
BuildRequires: openssl-devel
-BuildRequires: python-enum34
-BuildRequires: python2-devel
+BuildRequires: python-devel
+BuildRequires: pytest
BuildRequires: python-setuptools
-BuildRequires: python-cffi >= 0.8
-BuildRequires: python-six
-BuildRequires: python-cryptography-vectors = %{version}
-BuildRequires: python-pyasn1
-BuildRequires: python-iso8601
BuildRequires: python-pretend
-BuildRequires: pytest
+BuildRequires: python-iso8601
+BuildRequires: python-cryptography-vectors = %{version}
+BuildRequires: python-pyasn1-modules >= 0.1.8
+BuildRequires: python-hypothesis
+
+BuildRequires: python-idna >= 2.0
+BuildRequires: python-pyasn1 >= 0.1.8
+BuildRequires: python-six >= 1.4.1
+BuildRequires: python-cffi >= 1.4.1
+BuildRequires: python-enum34
+BuildRequires: python-ipaddress
%if 0%{?with_python3}
BuildRequires: python3-devel
+BuildRequires: python3-pytest
BuildRequires: python3-setuptools
-BuildRequires: python3-cffi >= 0.8
-BuildRequires: python3-six
-BuildRequires: python3-cryptography-vectors = %{version}
-BuildRequires: python3-pyasn1
-BuildRequires: python3-iso8601
BuildRequires: python3-pretend
-BuildRequires: python3-pytest
+BuildRequires: python3-iso8601
+BuildRequires: python3-cryptography-vectors = %{version}
+BuildRequires: python3-pyasn1-modules >= 0.1.8
+BuildRequires: python3-hypothesis
+
+BuildRequires: python3-idna >= 2.0
+BuildRequires: python3-pyasn1 >= 0.1.8
+BuildRequires: python3-six >= 1.4.1
+BuildRequires: python3-cffi >= 1.4.1
+%endif
+
+%description
+cryptography is a package designed to expose cryptographic primitives and
+recipes to Python developers.
+
+%package -n python2-cryptography
+Group: Development/Libraries
+Summary: PyCA's cryptography library
+Obsoletes: python-cryptography <= %{version}-%{release}
+
+%if 0%{?fedora}
+%{?python_provide:%python_provide python2-cryptography}
+%else
+Provides: python-cryptography
%endif
Requires: openssl
+Requires: python-idna >= 2.0
+Requires: python-pyasn1 >= 0.1.8
+Requires: python-six >= 1.4.1
+Requires: python-cffi >= 1.4.1
Requires: python-enum34
-Requires: python-cffi >= 0.8
-Requires: python-six >= 1.6.1
-Requires: python-pyasn1
+Requires: python-ipaddress
-%description
+%description -n python2-cryptography
cryptography is a package designed to expose cryptographic primitives and
recipes to Python developers.
@@ -54,11 +81,13 @@ recipes to Python developers.
%package -n python3-cryptography
Group: Development/Libraries
Summary: PyCA's cryptography library
+%{?python_provide:%python_provide python3-cryptography}
Requires: openssl
-Requires: python3-cffi >= 0.8
-Requires: python3-six >= 1.6.1
-Requires: python3-pyasn1
+Requires: python3-idna >= 2.0
+Requires: python3-pyasn1 >= 0.1.8
+Requires: python3-six >= 1.4.1
+Requires: python3-cffi >= 1.4.1
%description -n python3-cryptography
cryptography is a package designed to expose cryptographic primitives and
@@ -66,7 +95,7 @@ recipes to Python developers.
%endif
%prep
-%setup -q -n cryptography-%{version}
+%autosetup -p1 -n cryptography-%{version}
%if 0%{?with_python3}
rm -rf %{py3dir}
@@ -108,7 +137,7 @@ popd
%endif
-%files
+%files -n python2-cryptography
%doc LICENSE LICENSE.APACHE LICENSE.BSD README.rst docs
%{python_sitearch}/*
@@ -121,6 +150,44 @@ popd
%changelog
+* Tue May 10 2016 Nathaniel McCallum <npmccallum@redhat.com> - 1.3.1-3
+- Remove versioned setuptools dependency
+
+* Tue May 10 2016 Nathaniel McCallum <npmccallum@redhat.com> - 1.3.1-2
+- Make it easier to build on EL7
+
+* Tue May 03 2016 Nathaniel McCallum <npmccallum@redhat.com> - 1.3.1-1
+- Update to v1.3.1
+
+* Thu Feb 04 2016 Fedora Release Engineering <releng@fedoraproject.org> - 1.2.1-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
+
+* Mon Jan 11 2016 Nathaniel McCallum <npmccallum@redhat.com> - 1.2.1-2
+- Move python-cryptograph => python2-cryptography
+
+* Sat Jan 09 2016 Nathaniel McCallum <npmccallum@redhat.com> - 1.2.1-1
+- Update to v1.2.1
+
+* Wed Nov 11 2015 Robert Kuska <rkuska@redhat.com> - 1.1-1
+- Update to v1.1
+
+* Wed Nov 04 2015 Robert Kuska <rkuska@redhat.com> - 1.0.2-2
+- Rebuilt for Python3.5 rebuild
+
+* Wed Sep 30 2015 Matěj Cepl <mcepl@redhat.com> - 1.0.2-1
+- New upstream release (fix #1267548)
+
+* Wed Aug 12 2015 Nathaniel McCallum <npmccallum@redhat.com> - 1.0-1
+- New upstream release
+
+* Thu Jun 18 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.9-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
+
+* Thu May 14 2015 Nathaniel McCallum <npmccallum@redhat.com> - 0.9-1
+- New upstream release
+- Run tests on RHEL
+- New deps: python-idna, python-ipaddress
+
* Fri Apr 17 2015 Nathaniel McCallum <npmccallum@redhat.com> - 0.8.2-1
- New upstream release
- Add python3-pyasn1 Requires (#1211073)