From 8cde5cec3a012f5e05d2e14286aa39d43aa15fbc Mon Sep 17 00:00:00 2001
From: Paul Howarth <paul@city-fan.org>
Date: Oct 13 2015 17:03:39 +0000
Subject: Update to 3.1.4 (#1226667)


---

diff --git a/.gitignore b/.gitignore
index b6e717a..ecf4404 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 /rsa-3.1.1.tar.gz
+/rsa-3.1.4.tar.gz
diff --git a/python-rsa.spec b/python-rsa.spec
index 5909e5f..c7674a7 100644
--- a/python-rsa.spec
+++ b/python-rsa.spec
@@ -7,8 +7,8 @@
 %endif
 
 Name:           python-rsa
-Version:        3.1.1
-Release:        7%{?dist}
+Version:        3.1.4
+Release:        1%{?dist}
 Summary:        Pure-Python RSA implementation
 
 License:        ASL 2.0
@@ -18,12 +18,13 @@ Source0:        https://pypi.python.org/packages/source/r/rsa/%{pkgname}-%{versi
 BuildArch:      noarch
 BuildRequires:  python2-devel
 BuildRequires:  python-setuptools
-BuildRequires:  python-pyasn1
+BuildRequires:  python-pyasn1 >= 0.1.3
 BuildRequires:  python-unittest2
+Requires:       python-pyasn1 >= 0.1.3
 %if %with python3
 BuildRequires:  python3-devel
 BuildRequires:  python3-setuptools
-BuildRequires:  python3-pyasn1
+BuildRequires:  python3-pyasn1 >= 0.1.3
 %endif
 
 %description
@@ -31,6 +32,7 @@ Pure-Python RSA implementation.
 
 %package -n python3-rsa
 Summary:        Pure-Python RSA implementation
+Requires:       python3-pyasn1 >= 0.1.3
 
 %description -n python3-rsa
 Pure-Python RSA implementation for Python 3.
@@ -38,8 +40,6 @@ Pure-Python RSA implementation for Python 3.
 %prep
 %setup -q -n %{pkgname}-%{version}
 rm -rf %{pkgname}-*.egg-info
-sed -i "/from distribute_setup import use_setuptools/d" setup.py
-sed -i "/use_setuptools('0.6.10')/d" setup.py
 
 %if %with python3
 rm -rf %{py3dir}
@@ -76,20 +76,33 @@ popd
 %{__python2} setup.py test
 
 %files
+%if 0%{?_licensedir:1}
+%license LICENSE
+%else
 %doc LICENSE
+%endif
+%doc README.rst
 %{_bindir}/pyrsa*
-%{python2_sitelib}/rsa
-%{python2_sitelib}/rsa-*.egg-info
+%{python2_sitelib}/rsa/
+%{python2_sitelib}/rsa-*.egg-info/
 
 %if %with python3
 %files -n python3-rsa
+%if 0%{?_licensedir:1}
+%license LICENSE
+%else
 %doc LICENSE
+%endif
+%doc README.rst
 %{_bindir}/python3-pyrsa*
-%{python3_sitelib}/rsa
-%{python3_sitelib}/rsa-*.egg-info
+%{python3_sitelib}/rsa/
+%{python3_sitelib}/rsa-*.egg-info/
 %endif
 
 %changelog
+* Tue Oct 13 2015 Paul Howarth <paul@city-fan.org> - 3.1.4-1
+- Update to 3.1.4 (#1226667)
+
 * Thu Jun 18 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 3.1.1-7
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
 
diff --git a/sources b/sources
index 4c44283..d88ec66 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-01e6b88c078e8f74718a455e0a05623d  rsa-3.1.1.tar.gz
+b6b1c80e1931d4eba8538fd5d4de1355  rsa-3.1.4.tar.gz