From c95fd9856171b62efd9744c8aa6248b982d1e29a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Sloup?= <osloup@redhat.com>
Date: Thu, 28 Sep 2023 00:40:05 +0200
Subject: [PATCH] Rebase to the newest version, test the beta (Relates:
 rhbz#2235401) Remove the hotfix (move of pyodbc.py) as it is fixed in
 upstream

---
 .gitignore  |  1 +
 pyodbc.spec | 13 ++++++-------
 sources     |  2 +-
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/.gitignore b/.gitignore
index 3826e0a..4608b11 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,3 +6,4 @@ pyodbc-2.1.5.zip
 /pyodbc-4.0.30.tar.gz
 /pyodbc-4.0.39.tar.gz
 /pyodbc-5.0.0b1.tar.gz
+/pyodbc-5.0.0b4.tar.gz
diff --git a/pyodbc.spec b/pyodbc.spec
index b8d3ca3..dede784 100644
--- a/pyodbc.spec
+++ b/pyodbc.spec
@@ -1,6 +1,6 @@
 Name:           pyodbc
-Version:        5.0.0~b1
-%global uversion 5.0.0b1
+Version:        5.0.0~b4
+%global uversion 5.0.0b4
 Release:        2%{?dist}
 Summary:        Python DB API 2.0 Module for ODBC
 License:        MIT
@@ -44,11 +44,6 @@ decimal.
 %install
 %pyproject_install
 
-# Hotfix - move pyodbc.pyi from %%{_usr} dir to %%{python3_sitearch}
-# Upstream changes of setup.py:
-# https://github.com/mkleehammer/pyodbc/blob/5.0.0b1/setup.py#L55
-mv %{buildroot}%{_usr}/pyodbc.pyi %{buildroot}%{python3_sitearch}/pyodbc.pyi
-
 %files -n python3-%{name}
 %license LICENSE.txt
 %doc README.md notes.txt
@@ -57,6 +52,10 @@ mv %{buildroot}%{_usr}/pyodbc.pyi %{buildroot}%{python3_sitearch}/pyodbc.pyi
 %{python3_sitearch}/%{name}.pyi
 
 %changelog
+* Thu Sep 28 2023 Ondrej Sloup <osloup@redhat.com> - 5.0.0~b4-1
+- Rebase to the newest version, test the beta (Relates: rhbz#2235401)
+- Remove the hotfix (move of pyodbc.py) as it is fixed in upstream
+
 * Mon Aug 28 2023 Ondřej Sloup <osloup@redhat.com> - 5.0.0~b1-2
 - Move /usr/pyodbc.pyi to /usr/lib64/python3.X/site-packages/pyodbc.pyi as originally intended
 
diff --git a/sources b/sources
index 7b07298..027ffc9 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (pyodbc-5.0.0b1.tar.gz) = 4a3bd3f01152bf3b94d049244a735e557948067f6a251054202a843c4276491f9f76e554341b7ff43d452ad2f3d9e886d0e1f31f5cf5c9e33bfd627cea37750b
+SHA512 (pyodbc-5.0.0b4.tar.gz) = 89cc74f3b33a30e6535ded6b12415cf3ebe46e55061e40570ea8ff9d3c20470a56ff581162c684a4f9f26d93443eab73cad92b4133f88675fdfb05f49d2762d1