From f64f4aa066297707d9b0c6bee960a12135e8ebb2 Mon Sep 17 00:00:00 2001
From: wangxiyuan <wangxiyuan1007@gmail.com>
Date: Thu, 22 Jul 2021 08:12:24 +0000
Subject: [PATCH] Drop python2 support

---
 fix-pytest-error-py3.patch   |  9 +++++++++
 python-service-identity.spec | 31 ++++---------------------------
 2 files changed, 13 insertions(+), 27 deletions(-)
 create mode 100644 fix-pytest-error-py3.patch

diff --git a/fix-pytest-error-py3.patch b/fix-pytest-error-py3.patch
new file mode 100644
index 0000000..ee923ba
--- /dev/null
+++ b/fix-pytest-error-py3.patch
@@ -0,0 +1,9 @@
+diff -urN service-identity-16.0.0/setup.cfg service-identity-16.0.0-new/setup.cfg
+--- service-identity-16.0.0/setup.cfg	2016-02-18 19:26:33.000000000 +0800
++++ service-identity-16.0.0-new/setup.cfg	2021-07-22 18:08:01.670140214 +0800
+@@ -1,4 +1,4 @@
+-[pytest]
++[tool:pytest]
+ minversion = 2.8.2
+ strict = true
+ addopts = -ra
diff --git a/python-service-identity.spec b/python-service-identity.spec
index b68b117..a9d9761 100644
--- a/python-service-identity.spec
+++ b/python-service-identity.spec
@@ -1,10 +1,11 @@
 Name:           python-service-identity
 Version:        16.0.0
-Release:        12
+Release:        13
 Summary:        Service Identity Verification for pyOpenSSL & cryptography
 License:        MIT
 URL:            https://github.com/pyca/service_identity
 Source0:        https://github.com/pyca/service_identity/archive/%{version}/service-identity-%{version}.tar.gz
+Patch0:         fix-pytest-error-py3.patch
 BuildArch:      noarch
 
 %description
@@ -15,24 +16,6 @@ In the simplest case, this means host name verification. However,
 service_identity implements RFC 6125 fully and plans to add other
 relevant RFCs too.
 
-%package -n python2-service-identity
-Summary:          Service Identity Verification for pyOpenSSL & cryptography
-%{?python_provide:%python_provide python2-service-identity}
-BuildRequires:    python2-pytest python2-attrs python2-pyasn1 python2-pyasn1-modules
-BuildRequires:    python2-pyOpenSSL python2-idna python2-setuptools python2-devel
-Requires:         python2-attrs python2-pyasn1 python2-pyasn1-modules python2-pyOpenSSL
-Recommends:       python2-idna
-
-%description -n python2-service-identity
-Service_identity aspires to give you all the tools you need for
-verifying whether a certificate is valid for the intended purposes.
-
-In the simplest case, this means host name verification. However,
-service_identity implements RFC 6125 fully and plans to add other
-relevant RFCs too.
-
-Python 2 version.
-
 %package -n python3-service-identity
 Summary:          Service Identity Verification for pyOpenSSL & cryptography
 %{?python_provide:%python_provide python3-service-identity}
@@ -54,27 +37,21 @@ Python 3 version.
 %autosetup -n service-identity-%{version}
 
 %build
-%py2_build
 %py3_build
 
 %install
-%py2_install
 %py3_install
 
 %check
-PYTHONPATH=%{buildroot}%{python2_sitelib} py.test-%{python2_version} -v
 PYTHONPATH=%{buildroot}%{python3_sitelib} py.test-%{python3_version} -v
 
-%files -n python2-service-identity
-%license LICENSE
-%doc README.rst
-%{python2_sitelib}/{service_identity-*.egg-info/,service_identity/}
-
 %files -n python3-service-identity
 %license LICENSE
 %doc README.rst
 %{python3_sitelib}/{service_identity-*.egg-info/,service_identity/}
 
 %changelog
+* Thu Jul 22 2021 wangxiyuan <wangxiyuan1007@gmail.com> - 16.0.0-13
+- Drop python2 support
 * Thu Feb 27 2020 duyeyu <duyeyu@huawei.com> - 16.0.0-12
 - Initial package.