From 0ffaa763cf5ab103154e72d911d7b8765dcabbda Mon Sep 17 00:00:00 2001 From: James Antill Date: Thu, 23 Feb 2023 13:16:24 -0500 Subject: [PATCH] Import rpm: dc5bc3753d271278f5da87a774ce58e924ed66b8 --- default_charset_revert.patch | 14 ++++++++++++++ python-PyMySQL.spec | 29 +++++++++++++---------------- sources | 2 +- 3 files changed, 28 insertions(+), 17 deletions(-) create mode 100644 default_charset_revert.patch diff --git a/default_charset_revert.patch b/default_charset_revert.patch new file mode 100644 index 0000000..4baffe9 --- /dev/null +++ b/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 + + diff --git a/python-PyMySQL.spec b/python-PyMySQL.spec index 85c093f..0626b23 100644 --- a/python-PyMySQL.spec +++ b/python-PyMySQL.spec @@ -9,6 +9,8 @@ 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. @@ -24,9 +26,9 @@ and Jython. %package -n python%{python3_pkgversion}-%{pypi_name} Summary: %{summary} BuildRequires: python%{python3_pkgversion}-devel -BuildRequires: python%{python3_pkgversion}-rpm-macros 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}} @@ -38,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 @@ -62,24 +65,18 @@ rm -rf tests %{python3_sitelib}/pymysql/ %changelog -* Mon Jan 18 2021 Tomas Orsava - 0.10.1-2 -- Convert from Fedora to the python39 module in RHEL8 -- Resolves: rhbz#1877430 +* Wed Jan 20 2021 Lukas Javorsky - 0.10.1-2 +- Revert upstream change of default charset (from utf8mb4 to latin1) +- Resolves BZ#1885641 -* Thu Sep 10 2020 Fedora Release Monitoring - 0.10.1-1 -- Update to 0.10.1 (#1877703) +* Tue Oct 06 2020 Michal Schorm - 0.10.1-1 +- Rebase to 0.10 version to add support for MariaDB ed25519 authentication mechanism -* Tue Jul 28 2020 Fedora Release Engineering - 0.10.0-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild +* Fri Dec 13 2019 Tomas Orsava - 0.9.3-3 +- Exclude unsupported i686 arch -* Sat Jul 18 2020 Julien Enselme - 0.10.0-1 -- Update to 0.10.0 - -* Tue May 26 2020 Miro Hrončok - 0.9.3-3 -- Rebuilt for Python 3.9 - -* Thu Jan 30 2020 Fedora Release Engineering - 0.9.3-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild +* Thu Nov 21 2019 Lumír Balhar - 0.9.3-2 +- Adjusted for Python 3.8 module in RHEL 8 * Mon Nov 18 2019 Lumír Balhar - 0.9.3-1 - New upstream version 0.9.3 diff --git a/sources b/sources index 2023240..9f8188e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (PyMySQL-0.10.1.tar.gz) = 33dba505fd937ddece7b4c52a1db64084656bccc0b3e98ecee1227732fe03f4e8c3f4bcb64bcf67db54f3407f3ce8a706a08d3f992450755267b0e6c5b123b99 +SHA1 (PyMySQL-0.10.1.tar.gz) = 723f04ee8864c7b4eac41e48690fd73bf82c147c