From 285ea4c6c63d9b688e280f6724df0097defbfca6 Mon Sep 17 00:00:00 2001
From: zoedong <zoedong@tencent.com>
Date: Mon, 25 Sep 2023 19:30:11 +0800
Subject: [PATCH] Bump version to 0.14.0

---
 ...ent-from-pykerberos-back-to-kerberos.patch | 40 -------------------
 python-requests-kerberos.spec                 | 17 +++++---
 sources                                       |  2 +-
 3 files changed, 12 insertions(+), 47 deletions(-)
 delete mode 100644 0001-switch-requirement-from-pykerberos-back-to-kerberos.patch

diff --git a/0001-switch-requirement-from-pykerberos-back-to-kerberos.patch b/0001-switch-requirement-from-pykerberos-back-to-kerberos.patch
deleted file mode 100644
index 14cda78..0000000
--- a/0001-switch-requirement-from-pykerberos-back-to-kerberos.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From ce277612b1e262a84a1a97e5084571b66b7dd573 Mon Sep 17 00:00:00 2001
-From: Dan Callaghan <dcallagh@redhat.com>
-Date: Thu, 11 Feb 2016 10:29:02 +1000
-Subject: [PATCH] switch requirement from pykerberos back to kerberos
-
-For now, Fedora still has the original "kerberos" module, not the newer
-fork "pykerberos". That will work fine too.
----
- requirements.txt | 2 +-
- setup.py         | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/requirements.txt b/requirements.txt
-index c49add0..98fcbbc 100644
---- a/requirements.txt
-+++ b/requirements.txt
-@@ -1,6 +1,6 @@
- requests>=1.1.0
- winkerberos >= 0.5.0; sys.platform == 'win32'
--pykerberos >= 1.1.8, < 2.0.0; sys.platform != 'win32'
-+kerberos; sys.platform != 'win32'
- cryptography>=1.3
- cryptography>=1.3; python_version!="3.3"
- cryptography>=1.3, <2; python_version=="3.3"
-diff --git a/setup.py b/setup.py
-index 8381ac7..53dafc0 100755
---- a/setup.py
-+++ b/setup.py
-@@ -54,7 +54,7 @@ def get_version():
-     ],
-     extras_require={
-         ':sys_platform=="win32"': ['winkerberos>=0.5.0'],
--        ':sys_platform!="win32"': ['pykerberos>=1.1.8,<2.0.0'],
-+        ':sys_platform!="win32"': ['kerberos'],
-     },
-     test_suite='test_requests_kerberos',
-     tests_require=['mock'],
--- 
-2.13.6
-
diff --git a/python-requests-kerberos.spec b/python-requests-kerberos.spec
index 44629b3..accaafe 100644
--- a/python-requests-kerberos.spec
+++ b/python-requests-kerberos.spec
@@ -1,16 +1,16 @@
 %global upstream_name requests-kerberos
 %global module_name requests_kerberos
-%global commit0 393e49c698904c76ad9f56c6e4dbd2dbc55a7c42
+
+%bcond_with spnego
 
 Summary:        A Kerberos authentication handler for python-requests
 Name:           python-%{upstream_name}
-Version:        0.12.0
-Release:        5%{?dist}
+Version:        0.14.0
+Release:        1%{?dist}
 License:        MIT
 URL:            https://github.com/requests/requests-kerberos
-Source0:        %{url}/archive/%{commit0}.tar.gz
+Source0:        %{url}/archive/refs/tags/v%{version}.tar.gz
 
-Patch3000:      0001-switch-requirement-from-pykerberos-back-to-kerberos.patch
 BuildRequires:  python3-devel python3-setuptools python3-pytest
 BuildArch:      noarch
 
@@ -28,14 +28,16 @@ Requests is an HTTP library, written in Python, for human beings. This library a
 Kerberos/GSSAPI authentication support and supports mutual authentication.
 
 %prep
-%autosetup -n %{upstream_name}-%{commit0} -p1
+%autosetup -n %{upstream_name}-%{version} -p1
 sed -i -E -e 's/^(\s*)from mock import /\1from unittest.mock import /' tests/test_requests_kerberos.py
 
 %build
 %py3_build
 
 %check
+%if %{with spnego}
 py.test-3 tests/
+%endif
 
 %install
 %py3_install
@@ -47,6 +49,9 @@ py.test-3 tests/
 %{python3_sitelib}/%{module_name}*.egg-info
 
 %changelog
+* Mon Sep 25 2023 Miaojun Dong <zoedong@tencent.com> - 0.14.0-1
+- Bump version to 0.14.0
+
 * Tue Sep 19 2023 OpenCloudOS Release Engineering <releng@opencloudos.tech> - 0.12.0-5
 - Rebuilt for python 3.11
 
diff --git a/sources b/sources
index 686e36e..e21d6ba 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (393e49c698904c76ad9f56c6e4dbd2dbc55a7c42.tar.gz) = 02c9b4ea31fec871b318c492885a3fdb942632e92de53b9edf73995be3b61ad514e3bffae3cc509ae48a0a4a6db1d3cdab2d595de09400b5f48a43e975d5fe0a
+SHA512 (v0.14.0.tar.gz) = 9dd6eed0d6afe4b852ba96f621be3af2965e9011bf372c5dce77e0bca18191255ea407ba313904271615d722d60029807db2d6815b24437b021b02b026eb60d6
-- 
Gitee