.gitignore

@@ -1 +1 @@
-SOURCES/PyMySQL-0.10.1.tar.gz
+SOURCES/PyMySQL-0.8.0.tar.gz

.python-PyMySQL.metadata

@@ -1 +1 @@
-723f04ee8864c7b4eac41e48690fd73bf82c147c SOURCES/PyMySQL-0.10.1.tar.gz
+0935f91b1c3a6c366410aa5a1a44f92c5b3144b3 SOURCES/PyMySQL-0.8.0.tar.gz

SOURCES/default_charset_revert.patch

@@ -1,14 +0,0 @@
-# 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

@@ -1,21 +1,40 @@
+%bcond_with python36_module
+%bcond_without python3
+
 %global pypi_name PyMySQL
 
+# python2X and python3X are built form the same module, so we need a conditional for python2 bits
+# the state of the conditional is not important in the spec, it is set in modulemd
+%bcond_with python2
+
+
 Name:           python-%{pypi_name}
-Version:        0.10.1
-Release:        2%{?dist}
+Version:        0.8.0
+Release:        10%{?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
+Source0:        https://files.pythonhosted.org/packages/a8/b4/3544c8e6ed9b1c6a00e5b302e3d5a646e43a8a0ac5216f5ae8706688706e/PyMySQL-0.8.0.tar.gz
 
 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
+
+# for python2
+%if %{with python2}
+BuildRequires:  python2-devel
+BuildRequires:  python2-setuptools
+%endif
+
+# for python3
+%if %{with python3}
+%if %{with python36_module}
+BuildRequires:  python36-devel
+BuildRequires:  python36-rpm-macros
+%else
+BuildRequires:  python3-devel
+%endif
+BuildRequires:  python%{python3_pkgversion}-setuptools
+%endif
 
 %description
 This package contains a pure-Python MySQL client library. The goal of PyMySQL is
@@ -23,102 +42,99 @@ to be a drop-in replacement for MySQLdb and work on CPython, PyPy, IronPython
 and Jython.
 
 
-%package -n     python%{python3_pkgversion}-%{pypi_name}
-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}}
+%if %{with python2}
+%package -n     python2-%{pypi_name}
+Summary:        Pure-Python MySQL client library
+%{?python_provide:%python_provide python2-%{pypi_name}}
 
-%description -n python%{python3_pkgversion}-%{pypi_name}
+%description -n python2-%{pypi_name}
 This package contains a pure-Python MySQL client library. The goal of PyMySQL is
 to be a drop-in replacement for MySQLdb and work on CPython, PyPy, IronPython
 and Jython.
+%endif
+
+%if %{with python3}
+%package -n     python3-%{pypi_name}
+Summary:        Pure-Python MySQL client library
+%{?python_provide:%python_provide python%{python3_pkgversion}-%{pypi_name}}
+
+%description -n python3-%{pypi_name}
+This package contains a pure-Python MySQL client library. The goal of PyMySQL is
+to be a drop-in replacement for MySQLdb and work on CPython, PyPy, IronPython
+and Jython.
+%endif
 
 
 %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
 
 
 %build
+%{?with_python2:%py2_build}
+%if %{with python3}
 %py3_build
+%endif
 
 
 %install
+%if %{with python2}
+%py2_install
+# Remove shebang
+for lib in %{buildroot}%{python2_sitelib}/pymysql/tests/thirdparty/test_MySQLdb/*.py; do
+  sed -i '1{\@^#!/usr/bin/env python@d}' $lib
+done
+%endif
+
+%if %{with python3}
 %py3_install
+# Remove shebang
+for lib in %{buildroot}%{python3_sitelib}/pymysql/tests/thirdparty/test_MySQLdb/*.py; do
+  sed -i '1{\@^#!/usr/bin/env python@d}' $lib
+done
+%endif
 
 
 %check
 # Tests cannot be launch on koji, they require a mysqldb running.
 
 
-%files -n python%{python3_pkgversion}-%{pypi_name}
+%if %{with python2}
+%files -n python2-%{pypi_name}
+%license LICENSE
+%doc README.rst
+%{python2_sitelib}/%{pypi_name}-%{version}-py%{python2_version}.egg-info/
+%{python2_sitelib}/pymysql/
+%endif
+
+%if %{with python3}
+%files -n python3-%{pypi_name}
 %license LICENSE
 %doc README.rst
 %{python3_sitelib}/%{pypi_name}-%{version}-py%{python3_version}.egg-info/
 %{python3_sitelib}/pymysql/
+%endif
 
 %changelog
-* 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
+* Thu Apr 25 2019 Tomas Orsava <torsava@redhat.com> - 0.8.0-10
+- Bumping due to problems with modular RPM upgrade path
+- Resolves: rhbz#1695587
 
-* 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 Jul 31 2018 Lumír Balhar <lbalhar@redhat.com> - 0.8.0-9
+- Make possible to disable python3 subpackage
 
-* Fri Dec 13 2019 Tomas Orsava <torsava@redhat.com> - 0.9.3-3
-- Exclude unsupported i686 arch
+* Tue Jul 17 2018 Tomas Orsava <torsava@redhat.com> - 0.8.0-8
+- BuildRequire also python36-rpm-macros as part of the python36 module build
 
-* Thu Nov 21 2019 Lumír Balhar <lbalhar@redhat.com> - 0.9.3-2
-- Adjusted for Python 3.8 module in RHEL 8
+* Wed Jul 04 2018 Miro Hrončok <mhroncok@redhat.com> - 0.8.0-7
+- Add a bcond for python2
 
-* Mon Nov 18 2019 Lumír Balhar <lbalhar@redhat.com> - 0.9.3-1
-- New upstream version 0.9.3
+* Wed Apr 25 2018 Tomas Orsava <torsava@redhat.com> - 0.8.0-6
+- Make requires on python36-devel dependant on a python36_module bcond
 
-* Thu Oct 03 2019 Miro Hrončok <mhroncok@redhat.com> - 0.9.2-7
-- Rebuilt for Python 3.8.0rc1 (#1748018)
-
-* Mon Aug 19 2019 Miro Hrončok <mhroncok@redhat.com> - 0.9.2-6
-- Rebuilt for Python 3.8
-
-* Fri Jul 26 2019 Fedora Release Engineering <releng@fedoraproject.org> - 0.9.2-5
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
-
-* Sat Feb 02 2019 Fedora Release Engineering <releng@fedoraproject.org> - 0.9.2-4
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
-
-* Sun Dec 02 2018 Julien Enselme <jujens@jujens.eu> - 0.9.2-3
-- Remove Python 2 subpackage.
-
-* Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 0.9.2-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
-
-* Fri Jul 06 2018 Itamar Reis Peixoto <itamar@ispbrasil.com.br> - 0.9.2-1
-- Update to 0.9.2
-
-* Tue Jul 03 2018 Itamar Reis Peixoto <itamar@ispbrasil.com.br> - 0.9.1-1
-- Update to 0.9.1
-
-* Mon Jul 02 2018 Miro Hrončok <mhroncok@redhat.com> - 0.9.0-2
-- Rebuilt for Python 3.7
-
-* Sat Jun 30 2018 Julien Enselme <jujens@jujens.eu> - 0.9.0-1
-- Update to 0.9.0
-
-* Tue Jun 19 2018 Miro Hrončok <mhroncok@redhat.com> - 0.8.1-2
-- Rebuilt for Python 3.7
-
-* Mon May 07 2018 Julien Enselme <jujens@jujens.eu> - 0.8.1-1
-- Update to 0.8.1
-
-* Mon Mar 19 2018 Carl George <carl@george.computer> - 0.8.0-5
-- Rename python3 subpackage to python34
+* Tue Apr 24 2018 Tomas Orsava <torsava@redhat.com> - 0.8.0-5
+- Hardcode requires on python36-devel for the python36 module. This will have
+  to be modified when python37 is added.
 
 * Thu Feb 15 2018 Itamar Reis Peixoto <itamar@ispbrasil.com.br> - 0.8.0-4
 - make spec file compatible with epel7