From 2e0637f86b637f029646dadf4517921900b61079 Mon Sep 17 00:00:00 2001
From: Tomas Mraz <tmraz@fedoraproject.org>
Date: Mon, 11 Jun 2018 14:47:12 +0200
Subject: [PATCH] New upstream release 18.0.0

---
 .gitignore     |  1 +
 pyOpenSSL.spec | 47 ++++++++++++++++++++++++++---------------------
 sources        |  3 +--
 3 files changed, 28 insertions(+), 23 deletions(-)

diff --git a/.gitignore b/.gitignore
index dd68dd0..3cace03 100644
--- a/.gitignore
+++ b/.gitignore
@@ -10,3 +10,4 @@
 /pyOpenSSL-17.2.0.tar.gz
 /pyOpenSSL-17.3.0.tar.gz
 /pyOpenSSL-17.3.0.tar.gz.asc
+/pyOpenSSL-18.0.0.tar.gz
diff --git a/pyOpenSSL.spec b/pyOpenSSL.spec
index f1084fe..005e8cf 100644
--- a/pyOpenSSL.spec
+++ b/pyOpenSSL.spec
@@ -1,29 +1,31 @@
-%if 0%{?fedora} || 0%{?rhel} >= 8
-%global with_python3 1
+%if 0%{?fedora}
+%bcond_without python2
+%else
+# Disable python2 build by default
+%bcond_with python2
 %endif
 
 Summary: Python wrapper module around the OpenSSL library
 Name: pyOpenSSL
-Version: 17.3.0
-Release: 4%{?dist}
+Version: 18.0.0
+Release: 1%{?dist}
 Source0: https://files.pythonhosted.org/packages/source/p/pyOpenSSL/pyOpenSSL-%{version}.tar.gz
-Source1: https://files.pythonhosted.org/packages/source/p/pyOpenSSL/pyOpenSSL-%{version}.tar.gz.asc
 
 BuildArch: noarch
 License: ASL 2.0
 Group: Development/Libraries
 URL: https://pyopenssl.readthedocs.org/
 
-BuildRequires: python2-setuptools
-BuildRequires: python2-sphinx
-BuildRequires: python2-sphinx_rtd_theme
+BuildRequires: python3-setuptools
+BuildRequires: python3-sphinx
+BuildRequires: python3-sphinx_rtd_theme
 
+%if %{with python2}
 BuildRequires: python2-devel
 BuildRequires: python2-cryptography >= 1.3.0
-%if 0%{?with_python3}
+%endif
 BuildRequires: python3-devel
 BuildRequires: python3-cryptography >= 1.3.0
-%endif
 
 %description
 High-level wrapper around a subset of the OpenSSL library, includes among others
@@ -32,6 +34,7 @@ High-level wrapper around a subset of the OpenSSL library, includes among others
  * Callbacks written in Python
  * Extensive error-handling mechanism, mirroring OpenSSL's error codes
 
+%if %{with python2}
 %package -n python2-pyOpenSSL
 Summary: Python 2 wrapper module around the OpenSSL library
 Requires: python2-cryptography >= 1.3.0
@@ -45,8 +48,8 @@ High-level wrapper around a subset of the OpenSSL library, includes among others
    sockets
  * Callbacks written in Python
  * Extensive error-handling mechanism, mirroring OpenSSL's error codes
+%endif
 
-%if 0%{?with_python3}
 %package -n python3-pyOpenSSL
 Summary: Python 3 wrapper module around the OpenSSL library
 Requires: python3-cryptography
@@ -58,7 +61,6 @@ High-level wrapper around a subset of the OpenSSL library, includes among others
    sockets
  * Callbacks written in Python
  * Extensive error-handling mechanism, mirroring OpenSSL's error codes
-%endif
 
 %package doc
 Summary: Documentation for pyOpenSSL
@@ -71,41 +73,44 @@ Documentation for pyOpenSSL
 %autosetup -p1 -n pyOpenSSL-%{version}
 
 %build
-%py2_build
-
-%if 0%{?with_python3}
 %py3_build
+
+%if %{with python2}
+%py2_build
 %endif
 
-%{__make} -C doc html
+%{__make} -C doc html SPHINXBUILD=sphinx-build-3
 
 %install
-%py2_install
-
-%if 0%{?with_python3}
 %py3_install
+
+%if %{with python2}
+%py2_install
 %endif
 
 # Cleanup sphinx .buildinfo file before packaging
 rm doc/_build/html/.buildinfo
 
+%if %{with python2}
 %files -n python2-pyOpenSSL
 %license LICENSE
 %{python_sitelib}/OpenSSL/
 %{python_sitelib}/pyOpenSSL-*.egg-info
+%endif
 
-%if 0%{?with_python3}
 %files -n python3-pyOpenSSL
 %license LICENSE
 %{python3_sitelib}/OpenSSL/
 %{python3_sitelib}/pyOpenSSL-*.egg-info
-%endif
 
 %files doc
 %license LICENSE
 %doc CHANGELOG.rst examples doc/_build/html
 
 %changelog
+* Mon Jun 11 2018 Tomáš Mráz <tmraz@redhat.com> - 18.0.0-1
+- New upstream release 18.0.0
+
 * Wed Feb 21 2018 Iryna Shcherbina <ishcherb@redhat.com> - 17.3.0-4
 - Update Python 2 dependency declarations to new packaging standards
   (See https://fedoraproject.org/wiki/FinalizingFedoraSwitchtoPython3)
diff --git a/sources b/sources
index 94d494e..39fe395 100644
--- a/sources
+++ b/sources
@@ -1,2 +1 @@
-SHA512 (pyOpenSSL-17.3.0.tar.gz) = 2b58a652b8d6e2adadbc620a6b3411cd44169940ef1839fd3365cd343ebe1e630ddbb580d8d4dc79e738e0b4f91db0bdbbaecf18aea74204499c737eebb3fae8
-SHA512 (pyOpenSSL-17.3.0.tar.gz.asc) = 7110cac9393437d78f4d153c586275a95289cf41c8b7a262ea9170b5f7c1c21b4b60a2e87dede8f1b4572a91e2ec7d2fdeec82f5ca032f77b608a2ce14317284
+SHA512 (pyOpenSSL-18.0.0.tar.gz) = 7106d4116243a164c1f458ad495564c2cf3a46b4b0fbb1d452b4174ead4409bc9c783c3a4674231ed3c26ecf588077b01dadbdefe033d5e7251a61531c6f6c15