SOURCES/default_charset_revert.patch

@@ -0,0 +1,14 @@
+# This default charset revert is discussed in BZ#1885641
+
+--- PyMySQL-0.10.1/pymysql/connections.py.old	2021-01-20 16:52:27.393165771 +0100
++++ PyMySQL-0.10.1/pymysql/connections.py	2021-01-20 16:52:53.876589478 +0100
+@@ -88,7 +88,7 @@
+ }
+
+
+-DEFAULT_CHARSET = 'utf8mb4'
++DEFAULT_CHARSET = 'latin1'
+
+ MAX_PACKET_LEN = 2**24-1
+
+

SPECS/python-PyMySQL.spec

@@ -2,14 +2,20 @@
 
 Name:           python-%{pypi_name}
 Version:        0.10.1
-Release:        6%{?dist}
+Release:        2%{?dist}
 Summary:        Pure-Python MySQL client library
 
 License:        MIT
 URL:            https://pypi.python.org/pypi/%{pypi_name}/
 Source0:        https://files.pythonhosted.org/packages/source/P/PyMySQL/PyMySQL-%{version}.tar.gz
 
+Patch0:         default_charset_revert.patch
+
 BuildArch:      noarch
+# Exclude i686 arch. Due to a modularity issue it's being added to the
+# x86_64 compose of CRB, but we don't want to ship it at all.
+# See: https://projects.engineering.redhat.com/browse/RCM-72605
+ExcludeArch:    i686
 
 %description
 This package contains a pure-Python MySQL client library. The goal of PyMySQL is
@@ -22,6 +28,7 @@ Summary:        %{summary}
 BuildRequires:  python%{python3_pkgversion}-devel
 BuildRequires:  python%{python3_pkgversion}-setuptools
 BuildRequires:  python%{python3_pkgversion}-cryptography
+BuildRequires:  python%{python3_pkgversion}-rpm-macros
 Requires:       python%{python3_pkgversion}-cryptography
 %{?python_provide:%python_provide python%{python3_pkgversion}-%{pypi_name}}
 
@@ -33,6 +40,7 @@ and Jython.
 
 %prep
 %setup -qn %{pypi_name}-%{version}
+%patch0 -p1
 rm -rf %{pypi_name}.egg-info
 # Remove tests files so they are not installed globally.
 rm -rf tests
@@ -57,39 +65,18 @@ rm -rf tests
 %{python3_sitelib}/pymysql/
 
 %changelog
-* Mon Feb 21 2022 Tomas Orsava <torsava@redhat.com> - 0.10.1-6
-- Add gating configuration and a simple smoke test
-- Related: rhbz#1950291
-
-* Tue Feb 08 2022 Tomas Orsava <torsava@redhat.com> - 0.10.1-5
-- Add automatically generated Obsoletes tag with the python39- prefix
-  for smoother upgrade from RHEL8
-- Related: rhbz#1990421
-
-* Tue Aug 10 2021 Mohan Boddu <mboddu@redhat.com> - 0.10.1-4
-- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
-  Related: rhbz#1991688
-
-* Fri Apr 16 2021 Mohan Boddu <mboddu@redhat.com> - 0.10.1-3
-- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
-
-* Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 0.10.1-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
-
-* Thu Sep 10 2020 Fedora Release Monitoring <release-monitoring@fedoraproject.org> - 0.10.1-1
-- Update to 0.10.1 (#1877703)
-
-* Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 0.10.0-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
+* Wed Jan 20 2021 Lukas Javorsky <ljavorsk@redhat.com> - 0.10.1-2
+- Revert upstream change of default charset (from utf8mb4 to latin1)
+- Resolves BZ#1885641
 
-* Sat Jul 18 2020 Julien Enselme <jujens@jujens.eu> - 0.10.0-1
-- Update to 0.10.0
+* Tue Oct 06 2020 Michal Schorm <mschorm@redhat.com> - 0.10.1-1
+- Rebase to 0.10 version to add support for MariaDB ed25519 authentication mechanism
 
-* Tue May 26 2020 Miro Hrončok <mhroncok@redhat.com> - 0.9.3-3
-- Rebuilt for Python 3.9
+* Fri Dec 13 2019 Tomas Orsava <torsava@redhat.com> - 0.9.3-3
+- Exclude unsupported i686 arch
 
-* Thu Jan 30 2020 Fedora Release Engineering <releng@fedoraproject.org> - 0.9.3-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
+* Thu Nov 21 2019 Lumír Balhar <lbalhar@redhat.com> - 0.9.3-2
+- Adjusted for Python 3.8 module in RHEL 8
 
 * Mon Nov 18 2019 Lumír Balhar <lbalhar@redhat.com> - 0.9.3-1
 - New upstream version 0.9.3