From e024d2d327dbc7fb21ab65d25aa4d7d6136159d7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert-Andr=C3=A9=20Mauchin?= <zebob.m@gmail.com>
Date: Wed, 10 Apr 2019 18:58:11 +0200
Subject: [PATCH] Release 18.1.0 (#1454995) Fix FTBFS  with pytest 4.3
 (#1693822)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Robert-André Mauchin <zebob.m@gmail.com>
---
 .gitignore                   |  1 +
 python-service-identity.spec | 75 +++++++++++++++++++++++-------------
 sources                      |  2 +-
 3 files changed, 51 insertions(+), 27 deletions(-)

diff --git a/.gitignore b/.gitignore
index c60562b..649fa14 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 /service_identity-14.0.0.tar.gz
 /service_identity-16.0.0.tar.gz
 /service-identity-16.0.0.tar.gz
+/service-identity-18.1.0.tar.gz
diff --git a/python-service-identity.spec b/python-service-identity.spec
index 80cfab7..d492d40 100644
--- a/python-service-identity.spec
+++ b/python-service-identity.spec
@@ -10,8 +10,8 @@
 %endif
 
 Name:           python-%{modname}
-Version:        16.0.0
-Release:        12%{?dist}
+Version:        18.1.0
+Release:        1%{?dist}
 Summary:        Service identity verification for pyOpenSSL
 
 License:        MIT
@@ -38,20 +38,21 @@ relevant RFCs too.
 Summary:        %{summary}
 %{?python_provide:%python_provide python2-%{modname}}
 BuildRequires:  python2-devel
-BuildRequires:  python2-setuptools
+BuildRequires:  python2dist(setuptools)
 %if %{with check}
-BuildRequires:  python2-pytest
-BuildRequires:  python2-attrs
-BuildRequires:  python2-pyasn1
-BuildRequires:  python2-pyasn1-modules
-BuildRequires:  python2-pyOpenSSL
-BuildRequires:  python2-idna
+BuildRequires:  python2dist(attrs)
+BuildRequires:  python2dist(idna) >= 0.6
+BuildRequires:  python2dist(ipaddress)
+BuildRequires:  python2dist(pyasn1)
+BuildRequires:  python2dist(pyasn1-modules)
+BuildRequires:  python2dist(pyopenssl) >= 0.14
+BuildRequires:  python2dist(pytest)
 %endif
-Requires:       python2-attrs
-Requires:       python2-pyasn1
-Requires:       python2-pyasn1-modules
-Requires:       python2-pyOpenSSL
-Recommends:     python2-idna
+Requires:       python2dist(attrs)
+Requires:       python2dist(pyasn1)
+Requires:       python2dist(pyasn1-modules)
+Requires:       python2dist(pyopenssl) >= 0.14
+Recommends:     python2dist(idna) >= 0.6
 
 %description -n python2-%{modname} %{_description}
 
@@ -62,24 +63,31 @@ Python 2 version.
 Summary:        %{summary}
 %{?python_provide:%python_provide python3-%{modname}}
 BuildRequires:  python3-devel
-BuildRequires:  python3-setuptools
+BuildRequires:  python3dist(setuptools)
+BuildRequires:  python3dist(sphinx)
 %if %{with check}
-BuildRequires:  python3-pytest
-BuildRequires:  python3-attrs
-BuildRequires:  python3-pyasn1
-BuildRequires:  python3-pyasn1-modules
-BuildRequires:  python3-pyOpenSSL
-BuildRequires:  python3-idna
+BuildRequires:  python3dist(attrs)
+BuildRequires:  python3dist(idna) >= 0.6
+BuildRequires:  python3dist(pyasn1)
+BuildRequires:  python3dist(pyasn1-modules)
+BuildRequires:  python3dist(pyopenssl) >= 0.14
+BuildRequires:  python3dist(pytest)
 %endif
-Requires:       python3-attrs
-Requires:       python3-pyasn1
-Requires:       python3-pyasn1-modules
-Requires:       python3-pyOpenSSL
-Recommends:     python3-idna
+Requires:       python3dist(attrs)
+Requires:       python3dist(pyasn1)
+Requires:       python3dist(pyasn1-modules)
+Requires:       python3dist(pyopenssl) >= 0.14
+Recommends:     python3dist(idna) >= 0.6
 
 %description -n python3-%{modname} %{_description}
 
 Python 3 version.
+
+%package -n python-%{modname}-doc
+Summary:        Service-identity documentation
+
+%description -n python-%{modname}-doc
+Documentation for service-identity.
 %endif
 
 %prep
@@ -97,6 +105,13 @@ Python 3 version.
 %py3_install
 %endif
 
+%if %{with python3}
+# generate html docs
+PYTHONPATH=%{buildroot}%{python3_sitelib} sphinx-build-3 docs html
+# remove the sphinx-build leftovers
+rm -rf html/.{doctrees,buildinfo}
+%endif
+
 %if %{with check}
 %check
 PYTHONPATH=%{buildroot}%{python2_sitelib} py.test-%{python2_version} -v
@@ -117,9 +132,17 @@ PYTHONPATH=%{buildroot}%{python3_sitelib} py.test-%{python3_version} -v
 %doc README.rst
 %{python3_sitelib}/%{srcname}-*.egg-info/
 %{python3_sitelib}/%{srcname}/
+
+%files -n python-%{modname}-doc
+%doc html
+%license LICENSE docs/license.rst
 %endif
 
 %changelog
+* Wed Apr 10 18:38:06 CET 2019 Robert-André Mauchin <zebob.m@gmail.com> - 18.1.0-1
+- Release 18.1.0 (#1454995)
+- Fix FTBFS  with pytest 4.3 (#1693822)
+
 * Sat Feb 02 2019 Fedora Release Engineering <releng@fedoraproject.org> - 16.0.0-12
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
 
diff --git a/sources b/sources
index 4ed440b..ca9e413 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (service-identity-16.0.0.tar.gz) = d85ae7a699577dc00e32f376768f3089f0cf332ae54d89ea689618aea3a6557b2cb7029380ecac65d49028b895b59bb80b54c2783cef9a95f3d55308e6c5e899
+SHA512 (service-identity-18.1.0.tar.gz) = 0d1abf6ba1e725e923171fd3b809b2cf7ba757ca47f773e8c99a2e2265425b253549609c76955c4d67fcd2fd305d479a1d7541cb26811e94db26ab853d3d3441