From d3ce94f4c0f5ed57bae4d7354278383474a577fe Mon Sep 17 00:00:00 2001
From: Carl George <carlwgeorge@fedoraproject.org>
Date: Sep 13 2023 22:54:12 +0000
Subject: Update to version 0.14.0


Resolves: rhbz#2018834

---

diff --git a/.gitignore b/.gitignore
index 680187c..62dc623 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,3 +6,4 @@
 /requests-kerberos-0.8.0.tar.gz
 /requests-kerberos-75d2958.tar.gz
 /requests-kerberos-393e49c.tar.gz
+/requests-kerberos-0.14.0.tar.gz
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 9c876ad..1ca3dcc 100644
--- a/python-requests-kerberos.spec
+++ b/python-requests-kerberos.spec
@@ -1,21 +1,15 @@
 %global upstream_name requests-kerberos
 %global module_name requests_kerberos
-%global commit0 393e49c698904c76ad9f56c6e4dbd2dbc55a7c42
-%global gittag0 v0.12.0
-%global shortcommit0 %(c=%{commit0}; echo ${c:0:7})
 
 Name:           python-%{upstream_name}
-Version:        0.12.0
-Release:        21%{?dist}
+Version:        0.14.0
+Release:        1%{?dist}
 Summary:        A Kerberos authentication handler for python-requests
-License:        MIT
+License:        ISC
 URL:            https://github.com/requests/requests-kerberos
 # Upstream considers Github not PyPI to be the authoritative source tarballs:
 # https://github.com/requests/requests-kerberos/pull/78
-Source0:        https://github.com/requests/requests-kerberos/archive/%{commit0}.tar.gz#/%{upstream_name}-%{shortcommit0}.tar.gz
-# Upstream has switched their requirement to the "pykerberos" fork, but for now 
-# we still have the original "kerberos" module in Fedora.
-Patch1:         0001-switch-requirement-from-pykerberos-back-to-kerberos.patch
+Source:         %{url}/archive/v%{version}/%{upstream_name}-%{version}.tar.gz
 BuildArch:      noarch
 BuildRequires:  python3-devel
 BuildRequires:  python3-setuptools
@@ -28,12 +22,9 @@ authentication.
 
 %package -n python3-%{upstream_name}
 Summary:        %{summary}
-Requires:       python3-requests >= 1.1
-Requires:       python3-kerberos
-Requires:       python3-cryptography
 # runtime requirements are needed for tests also
 BuildRequires:  python3-requests >= 1.1
-BuildRequires:  python3-kerberos
+BuildRequires:  python3-spnego+kerberos
 BuildRequires:  python3-cryptography
 %{?python_provide:%python_provide python3-%{upstream_name}}
 
@@ -43,11 +34,7 @@ adds optional Kerberos/GSSAPI authentication support and supports mutual
 authentication.
 
 %prep
-%setup -q -n %{upstream_name}-%{commit0}
-%patch1 -p1
-
-# https://fedoraproject.org/wiki/Changes/DeprecatePythonMock
-sed -i -E -e 's/^(\s*)from mock import /\1from unittest.mock import /' tests/test_requests_kerberos.py
+%autosetup -n %{upstream_name}-%{version}
 
 %build
 %py3_build
@@ -65,6 +52,9 @@ py.test-3 tests/
 %{python3_sitelib}/%{module_name}*.egg-info
 
 %changelog
+* Wed Sep 13 2023 Carl George <carlwgeorge@fedoraproject.org> - 0.14.0-1
+- Update to version 0.14.0, resolves rhbz#2018834
+
 * Fri Jul 21 2023 Fedora Release Engineering <releng@fedoraproject.org> - 0.12.0-21
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
 
diff --git a/sources b/sources
index 8974a56..aca012d 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (requests-kerberos-393e49c.tar.gz) = 02c9b4ea31fec871b318c492885a3fdb942632e92de53b9edf73995be3b61ad514e3bffae3cc509ae48a0a4a6db1d3cdab2d595de09400b5f48a43e975d5fe0a
+SHA512 (requests-kerberos-0.14.0.tar.gz) = 9dd6eed0d6afe4b852ba96f621be3af2965e9011bf372c5dce77e0bca18191255ea407ba313904271615d722d60029807db2d6815b24437b021b02b026eb60d6