From 84884699db1a3861d074aa5b5ed87aae80fb453e Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Fri, 13 Jan 2012 04:40:32 -0600 Subject: [PATCH 01/81] - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild --- mysql-connector-python.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/mysql-connector-python.spec b/mysql-connector-python.spec index 40ada50..a711441 100644 --- a/mysql-connector-python.spec +++ b/mysql-connector-python.spec @@ -8,7 +8,7 @@ Name: mysql-connector-python Version: 0.3.2 -Release: 2%{?dist} +Release: 3%{?dist} Summary: MySQL Connector for Python 2 Group: Development/Languages @@ -90,6 +90,9 @@ is necessary to run this Python DB API v2.0 compliant driver. %endif %changelog +* Fri Jan 13 2012 Fedora Release Engineering - 0.3.2-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild + * Sun Mar 20 2011 Remi Collet 0.3.2-2 - run unittest during %%check - fix License From acba7172e43dd5dab192a89f0c862dece812fb43 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Thu, 19 Jul 2012 22:30:30 -0500 Subject: [PATCH 02/81] - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild --- mysql-connector-python.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/mysql-connector-python.spec b/mysql-connector-python.spec index a711441..7d72a6f 100644 --- a/mysql-connector-python.spec +++ b/mysql-connector-python.spec @@ -8,7 +8,7 @@ Name: mysql-connector-python Version: 0.3.2 -Release: 3%{?dist} +Release: 4%{?dist} Summary: MySQL Connector for Python 2 Group: Development/Languages @@ -90,6 +90,9 @@ is necessary to run this Python DB API v2.0 compliant driver. %endif %changelog +* Fri Jul 20 2012 Fedora Release Engineering - 0.3.2-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild + * Fri Jan 13 2012 Fedora Release Engineering - 0.3.2-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild From 1a4501ea3688f26b94d349add40f582162c92705 Mon Sep 17 00:00:00 2001 From: David Malcolm Date: Fri, 3 Aug 2012 22:00:28 -0400 Subject: [PATCH 03/81] rebuild for https://fedoraproject.org/wiki/Features/Python_3.3 --- mysql-connector-python.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/mysql-connector-python.spec b/mysql-connector-python.spec index 7d72a6f..5895194 100644 --- a/mysql-connector-python.spec +++ b/mysql-connector-python.spec @@ -8,7 +8,7 @@ Name: mysql-connector-python Version: 0.3.2 -Release: 4%{?dist} +Release: 5%{?dist} Summary: MySQL Connector for Python 2 Group: Development/Languages @@ -90,6 +90,9 @@ is necessary to run this Python DB API v2.0 compliant driver. %endif %changelog +* Fri Aug 03 2012 David Malcolm - 0.3.2-5 +- rebuild for https://fedoraproject.org/wiki/Features/Python_3.3 + * Fri Jul 20 2012 Fedora Release Engineering - 0.3.2-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild From 007e48990cabf05ae80407bfffbed44e055f9a98 Mon Sep 17 00:00:00 2001 From: remi Date: Wed, 8 Aug 2012 18:09:34 +0200 Subject: [PATCH 04/81] update to 1.0.5 (beta) --- .gitignore | 2 ++ mysql-connector-python.spec | 32 ++++++++++++++++++++------------ sources | 2 +- 3 files changed, 23 insertions(+), 13 deletions(-) diff --git a/.gitignore b/.gitignore index fd80d34..af95c6d 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,3 @@ +*spec~ /mysql-connector-python-0.3.2-devel.tar.gz +/mysql-connector-python-1.0.5.tar.gz diff --git a/mysql-connector-python.spec b/mysql-connector-python.spec index 5895194..e8e6a3e 100644 --- a/mysql-connector-python.spec +++ b/mysql-connector-python.spec @@ -7,14 +7,17 @@ %endif Name: mysql-connector-python -Version: 0.3.2 -Release: 5%{?dist} +Version: 1.0.5 +Release: 1%{?dist} Summary: MySQL Connector for Python 2 Group: Development/Languages License: GPLv2 with exceptions -URL: https://launchpad.net/myconnpy -Source0: http://launchpad.net/myconnpy/0.3/%{version}/+download/%{name}-%{version}-devel.tar.gz +URL: http://dev.mysql.com/usingmysql/python/ +# Upstream has a mirror redirector for downloads, so the URL is hard to +# represent statically. You can get the tarball by following a link from +# http://dev.mysql.com/downloads/connector/python/ +Source0: %{name}-%{version}.tar.gz BuildArch: noarch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -44,9 +47,8 @@ is necessary to run this Python DB API v2.0 compliant driver. %prep -%setup -q -n %{name}-%{version}-devel - -%{__chmod} -x python?/examples/*py +%setup -q +chmod -x python?/examples/*py %build @@ -54,12 +56,12 @@ is necessary to run this Python DB API v2.0 compliant driver. %install -%{__rm} -rf $RPM_BUILD_ROOT +rm -rf $RPM_BUILD_ROOT %if 0%{?with_python3} # Python 3 build %{__python3} setup.py install --root $RPM_BUILD_ROOT -%{__rm} -rf build +rm -rf build %endif # Python 2 build (end with this for tests) @@ -71,25 +73,31 @@ is necessary to run this Python DB API v2.0 compliant driver. %clean -%{__rm} -rf $RPM_BUILD_ROOT +rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) -%doc ChangeLog COPYING EXCEPTIONS-CLIENT README +%doc ChangeLog COPYING README %doc python2/examples +%doc docs %{python_sitelib}/* %if 0%{?with_python3} %files -n mysql-connector-python3 %defattr(-,root,root,-) -%doc ChangeLog COPYING EXCEPTIONS-CLIENT README +%doc ChangeLog COPYING README %doc python3/examples +%doc docs %{python3_sitelib}/* %endif %changelog +* Wed Aug 8 2012 Remi Collet - 1.0.5-1 +- version 1.0.5 (beta) +- move from launchpad (devel) to dev.mysql.com + * Fri Aug 03 2012 David Malcolm - 0.3.2-5 - rebuild for https://fedoraproject.org/wiki/Features/Python_3.3 diff --git a/sources b/sources index ec99825..2755b3a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -2ffdfa21c0a870cc7080f9f9a5ee3d87 mysql-connector-python-0.3.2-devel.tar.gz +5c3c0b1ad696610a4df944cb82651c10 mysql-connector-python-1.0.5.tar.gz From 3dac866679f95134657588f77f4ea7239c3f15f4 Mon Sep 17 00:00:00 2001 From: remi Date: Fri, 10 Aug 2012 10:01:38 +0200 Subject: [PATCH 05/81] increase test verbosity --- mysql-connector-python.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/mysql-connector-python.spec b/mysql-connector-python.spec index e8e6a3e..7df0f4a 100644 --- a/mysql-connector-python.spec +++ b/mysql-connector-python.spec @@ -69,7 +69,10 @@ rm -rf build %check -%{__python} unittests.py --mysql-basedir=%{_prefix} +%{__python} unittests.py \ + --mysql-basedir=%{_prefix} \ + --verbosity=1 \ + --log=tests.log %clean From 2d6e8799a3640d364db43d5d8cfa90281b1fb48f Mon Sep 17 00:00:00 2001 From: remi Date: Fri, 10 Aug 2012 11:19:29 +0200 Subject: [PATCH 06/81] disable test_bugs with MySQL 5.1 (EL-6) --- mysql-connector-python.spec | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/mysql-connector-python.spec b/mysql-connector-python.spec index 7df0f4a..58fb9b1 100644 --- a/mysql-connector-python.spec +++ b/mysql-connector-python.spec @@ -8,7 +8,7 @@ Name: mysql-connector-python Version: 1.0.5 -Release: 1%{?dist} +Release: 2%{?dist} Summary: MySQL Connector for Python 2 Group: Development/Languages @@ -69,11 +69,15 @@ rm -rf build %check +ver=$(mysql_config --version 2>/dev/null || echo 0) +if [ "$ver" \< "5.5" ] +then + ## Test 809033 fails with mysql 5.1 + sed -i -e '/test_bugs/d' python2/tests/__init__.py +fi %{__python} unittests.py \ --mysql-basedir=%{_prefix} \ - --verbosity=1 \ - --log=tests.log - + --verbosity=1 %clean rm -rf $RPM_BUILD_ROOT @@ -97,6 +101,9 @@ rm -rf $RPM_BUILD_ROOT %endif %changelog +* Fri Aug 10 2012 Remi Collet - 1.0.5-2 +- disable test_bugs with MySQL 5.1 (EL-6) + * Wed Aug 8 2012 Remi Collet - 1.0.5-1 - version 1.0.5 (beta) - move from launchpad (devel) to dev.mysql.com From 8db8c5b5478f47293e90ae602bbb26471ed87d65 Mon Sep 17 00:00:00 2001 From: remi Date: Fri, 7 Sep 2012 08:10:40 +0200 Subject: [PATCH 07/81] version 1.0.6 (beta), remove non GPL documentation --- .gitignore | 1 + mysql-connector-python.spec | 29 +++++++++++++++++------------ sources | 2 +- stripdocs.sh | 33 +++++++++++++++++++++++++++++++++ 4 files changed, 52 insertions(+), 13 deletions(-) create mode 100755 stripdocs.sh diff --git a/.gitignore b/.gitignore index af95c6d..0da12b3 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ *spec~ /mysql-connector-python-0.3.2-devel.tar.gz /mysql-connector-python-1.0.5.tar.gz +/mysql-connector-python-1.0.6b1-nodocs.tar.bz2 diff --git a/mysql-connector-python.spec b/mysql-connector-python.spec index 58fb9b1..116cc70 100644 --- a/mysql-connector-python.spec +++ b/mysql-connector-python.spec @@ -5,19 +5,19 @@ %else %global with_python3 0 %endif +%global versuffix b1 Name: mysql-connector-python -Version: 1.0.5 -Release: 2%{?dist} +Version: 1.0.6 +Release: 1%{?versuffix:.%{versuffix}}%{?dist} Summary: MySQL Connector for Python 2 Group: Development/Languages License: GPLv2 with exceptions URL: http://dev.mysql.com/usingmysql/python/ -# Upstream has a mirror redirector for downloads, so the URL is hard to -# represent statically. You can get the tarball by following a link from -# http://dev.mysql.com/downloads/connector/python/ -Source0: %{name}-%{version}.tar.gz +# Launch stripdocs.sh to remove non GPL documentation +Source0: %{name}-%{version}%{?versuffix}-nodocs.tar.bz2 +Source1: stripdocs.sh BuildArch: noarch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -47,12 +47,15 @@ is necessary to run this Python DB API v2.0 compliant driver. %prep -%setup -q +%setup -q -n %{name}-%{version}%{?versuffix} chmod -x python?/examples/*py +mv docs/README.txt README-docs +sed -e '/raise$/d' \ + -i metasetupinfo.py %build -# nothin to build +# nothing to build %install @@ -85,22 +88,24 @@ rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) -%doc ChangeLog COPYING README +%doc ChangeLog COPYING README* %doc python2/examples -%doc docs %{python_sitelib}/* %if 0%{?with_python3} %files -n mysql-connector-python3 %defattr(-,root,root,-) -%doc ChangeLog COPYING README +%doc ChangeLog COPYING README* %doc python3/examples -%doc docs %{python3_sitelib}/* %endif %changelog +* Fri Sep 7 2012 Remi Collet - 1.0.6-1.b1 +- version 1.0.6 (beta) +- remove non GPL documentation + * Fri Aug 10 2012 Remi Collet - 1.0.5-2 - disable test_bugs with MySQL 5.1 (EL-6) diff --git a/sources b/sources index 2755b3a..e05fc33 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -5c3c0b1ad696610a4df944cb82651c10 mysql-connector-python-1.0.5.tar.gz +bc2a2cc86930a01de6d1245800843e27 mysql-connector-python-1.0.6b1-nodocs.tar.bz2 diff --git a/stripdocs.sh b/stripdocs.sh new file mode 100755 index 0000000..b28fb7a --- /dev/null +++ b/stripdocs.sh @@ -0,0 +1,33 @@ +#!/bin/bash + +if [ "$1" = "" ]; then + echo usage $0 version + exit 1 +fi + +if [ ! -f mysql-connector-python-$1.tar.gz ]; then + echo please download mysql-connector-python-$1.tar.gz + echo http://dev.mysql.com/downloads/connector/python/ + exit 1 +fi + +tdir=`mktemp -d tmpXXXXXX` +pushd $tdir + +echo -n "unpacking..." +tar xzf ../mysql-connector-python-$1.tar.gz && echo " done" +rm -rf mysql-connector-python-$1/docs/my* +echo -n "packing..." +tar cjf ../mysql-connector-python-$1-nodocs.tar.bz2 mysql-connector-python-$1 && echo " done" + +echo -n "diffing..." +tar tzf ../mysql-connector-python-$1.tar.gz | sort >before +echo -n "..." +tar tjf ../mysql-connector-python-$1-nodocs.tar.bz2 | sort >after + +diff before after + +popd +echo "cleaning..." +rm -rf $tdir + From 630d7aa03873579196366477efa2b1c31cb3aa65 Mon Sep 17 00:00:00 2001 From: remi Date: Fri, 7 Sep 2012 08:21:40 +0200 Subject: [PATCH 08/81] disable test_network and test_connection on EL-5 --- mysql-connector-python.spec | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/mysql-connector-python.spec b/mysql-connector-python.spec index 116cc70..58ac456 100644 --- a/mysql-connector-python.spec +++ b/mysql-connector-python.spec @@ -76,8 +76,14 @@ ver=$(mysql_config --version 2>/dev/null || echo 0) if [ "$ver" \< "5.5" ] then ## Test 809033 fails with mysql 5.1 - sed -i -e '/test_bugs/d' python2/tests/__init__.py + sed -e '/test_bugs/d' \ + -i python2/tests/__init__.py fi +%if 0%{?rhel} == 5 + sed -e '/test_network/d' \ + -e '/test_connection/d' \ + -i python2/tests/__init__.py +%endif %{__python} unittests.py \ --mysql-basedir=%{_prefix} \ --verbosity=1 @@ -105,6 +111,7 @@ rm -rf $RPM_BUILD_ROOT * Fri Sep 7 2012 Remi Collet - 1.0.6-1.b1 - version 1.0.6 (beta) - remove non GPL documentation +- disable test_network and test_connection on EL-5 * Fri Aug 10 2012 Remi Collet - 1.0.5-2 - disable test_bugs with MySQL 5.1 (EL-6) From 6a34e9f5a27af76f27d0f70fbb35c5d741f2e74b Mon Sep 17 00:00:00 2001 From: remi Date: Sat, 15 Sep 2012 09:17:35 +0200 Subject: [PATCH 09/81] update to 1.0.6b2 (no change in code) --- .gitignore | 1 + mysql-connector-python.spec | 9 +++++---- sources | 2 +- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index 0da12b3..72b0fc3 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ /mysql-connector-python-0.3.2-devel.tar.gz /mysql-connector-python-1.0.5.tar.gz /mysql-connector-python-1.0.6b1-nodocs.tar.bz2 +/mysql-connector-python-1.0.6b2-nodocs.tar.bz2 diff --git a/mysql-connector-python.spec b/mysql-connector-python.spec index 58ac456..84ba7d5 100644 --- a/mysql-connector-python.spec +++ b/mysql-connector-python.spec @@ -5,11 +5,11 @@ %else %global with_python3 0 %endif -%global versuffix b1 +%global versuffix b2 Name: mysql-connector-python Version: 1.0.6 -Release: 1%{?versuffix:.%{versuffix}}%{?dist} +Release: 2%{?versuffix:.%{versuffix}}%{?dist} Summary: MySQL Connector for Python 2 Group: Development/Languages @@ -51,8 +51,6 @@ is necessary to run this Python DB API v2.0 compliant driver. chmod -x python?/examples/*py mv docs/README.txt README-docs -sed -e '/raise$/d' \ - -i metasetupinfo.py %build # nothing to build @@ -108,6 +106,9 @@ rm -rf $RPM_BUILD_ROOT %endif %changelog +* Sat Sep 15 2012 Remi Collet - 1.0.6-2.b2 +- version 1.0.6b2 + * Fri Sep 7 2012 Remi Collet - 1.0.6-1.b1 - version 1.0.6 (beta) - remove non GPL documentation diff --git a/sources b/sources index e05fc33..2078dd7 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -bc2a2cc86930a01de6d1245800843e27 mysql-connector-python-1.0.6b1-nodocs.tar.bz2 +aae3dc1c15b7f5ec981cb11f5ce07b15 mysql-connector-python-1.0.6b2-nodocs.tar.bz2 From b5b60f74966489bbb336633df495a63cbd875665 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Wed, 3 Oct 2012 17:25:27 +0200 Subject: [PATCH 10/81] update to 1.0.7 --- .gitignore | 1 + mysql-connector-python.spec | 9 ++++++--- sources | 2 +- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 72b0fc3..df6868a 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ /mysql-connector-python-1.0.5.tar.gz /mysql-connector-python-1.0.6b1-nodocs.tar.bz2 /mysql-connector-python-1.0.6b2-nodocs.tar.bz2 +/mysql-connector-python-1.0.7-nodocs.tar.bz2 diff --git a/mysql-connector-python.spec b/mysql-connector-python.spec index 84ba7d5..d0f60f3 100644 --- a/mysql-connector-python.spec +++ b/mysql-connector-python.spec @@ -5,11 +5,11 @@ %else %global with_python3 0 %endif -%global versuffix b2 +#global versuffix b2 Name: mysql-connector-python -Version: 1.0.6 -Release: 2%{?versuffix:.%{versuffix}}%{?dist} +Version: 1.0.7 +Release: 1%{?versuffix:.%{versuffix}}%{?dist} Summary: MySQL Connector for Python 2 Group: Development/Languages @@ -106,6 +106,9 @@ rm -rf $RPM_BUILD_ROOT %endif %changelog +* Wed Oct 3 2012 Remi Collet - 1.0.7-1 +- version 1.0.7 GA + * Sat Sep 15 2012 Remi Collet - 1.0.6-2.b2 - version 1.0.6b2 diff --git a/sources b/sources index 2078dd7..5acdc18 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -aae3dc1c15b7f5ec981cb11f5ce07b15 mysql-connector-python-1.0.6b2-nodocs.tar.bz2 +9421b654a41f15239db4d4959c01eb6f mysql-connector-python-1.0.7-nodocs.tar.bz2 From 843583334eefe95f58e6cf69c7551375ad21563b Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Sat, 29 Dec 2012 10:22:24 +0100 Subject: [PATCH 11/81] update to 1.0.8 GA --- .gitignore | 1 + mysql-connector-python.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index df6868a..a3bae76 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,4 @@ /mysql-connector-python-1.0.6b1-nodocs.tar.bz2 /mysql-connector-python-1.0.6b2-nodocs.tar.bz2 /mysql-connector-python-1.0.7-nodocs.tar.bz2 +/mysql-connector-python-1.0.8-nodocs.tar.bz2 diff --git a/mysql-connector-python.spec b/mysql-connector-python.spec index d0f60f3..2f927ef 100644 --- a/mysql-connector-python.spec +++ b/mysql-connector-python.spec @@ -8,7 +8,7 @@ #global versuffix b2 Name: mysql-connector-python -Version: 1.0.7 +Version: 1.0.8 Release: 1%{?versuffix:.%{versuffix}}%{?dist} Summary: MySQL Connector for Python 2 @@ -106,6 +106,9 @@ rm -rf $RPM_BUILD_ROOT %endif %changelog +* Sat Dec 29 2012 Remi Collet - 1.0.8-1 +- version 1.0.8 GA + * Wed Oct 3 2012 Remi Collet - 1.0.7-1 - version 1.0.7 GA diff --git a/sources b/sources index 5acdc18..2041f84 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -9421b654a41f15239db4d4959c01eb6f mysql-connector-python-1.0.7-nodocs.tar.bz2 +38655dade1b06d18ba1085ac6f00018f mysql-connector-python-1.0.8-nodocs.tar.bz2 From 5ec62a54d63bf272243cef2aed0cec8312aa025b Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Thu, 14 Feb 2013 01:47:39 -0600 Subject: [PATCH 12/81] - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild --- mysql-connector-python.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/mysql-connector-python.spec b/mysql-connector-python.spec index 2f927ef..ed84dcc 100644 --- a/mysql-connector-python.spec +++ b/mysql-connector-python.spec @@ -9,7 +9,7 @@ Name: mysql-connector-python Version: 1.0.8 -Release: 1%{?versuffix:.%{versuffix}}%{?dist} +Release: 2%{?versuffix:.%{versuffix}}%{?dist} Summary: MySQL Connector for Python 2 Group: Development/Languages @@ -106,6 +106,9 @@ rm -rf $RPM_BUILD_ROOT %endif %changelog +* Thu Feb 14 2013 Fedora Release Engineering - 1.0.8-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild + * Sat Dec 29 2012 Remi Collet - 1.0.8-1 - version 1.0.8 GA From f076e91f87a31d91f9333a22311291dfbd9f3294 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Wed, 27 Feb 2013 08:52:46 +0100 Subject: [PATCH 13/81] version 1.0.9 GA, disable test suite in mock, fix FTBFS #914203 --- .gitignore | 1 + mysql-connector-python.spec | 30 +++++++++++++++--------------- sources | 2 +- 3 files changed, 17 insertions(+), 16 deletions(-) diff --git a/.gitignore b/.gitignore index a3bae76..68fb7a6 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,4 @@ /mysql-connector-python-1.0.6b2-nodocs.tar.bz2 /mysql-connector-python-1.0.7-nodocs.tar.bz2 /mysql-connector-python-1.0.8-nodocs.tar.bz2 +/mysql-connector-python-1.0.9-nodocs.tar.bz2 diff --git a/mysql-connector-python.spec b/mysql-connector-python.spec index ed84dcc..b5a964d 100644 --- a/mysql-connector-python.spec +++ b/mysql-connector-python.spec @@ -5,11 +5,14 @@ %else %global with_python3 0 %endif -#global versuffix b2 + +# Tests only run on manual build --with tests +# Tests rely on MySQL version 5.6 +%global with_tests %{?_with_tests:1}%{!?_with_tests:0} Name: mysql-connector-python -Version: 1.0.8 -Release: 2%{?versuffix:.%{versuffix}}%{?dist} +Version: 1.0.9 +Release: 1%{?versuffix:.%{versuffix}}%{?dist} Summary: MySQL Connector for Python 2 Group: Development/Languages @@ -70,21 +73,14 @@ rm -rf build %check -ver=$(mysql_config --version 2>/dev/null || echo 0) -if [ "$ver" \< "5.5" ] -then - ## Test 809033 fails with mysql 5.1 - sed -e '/test_bugs/d' \ - -i python2/tests/__init__.py -fi -%if 0%{?rhel} == 5 - sed -e '/test_network/d' \ - -e '/test_connection/d' \ - -i python2/tests/__init__.py -%endif +%if %{with_tests} %{__python} unittests.py \ --mysql-basedir=%{_prefix} \ --verbosity=1 +%else +: echo test suite disabled, need '--with tests' option +%endif + %clean rm -rf $RPM_BUILD_ROOT @@ -106,6 +102,10 @@ rm -rf $RPM_BUILD_ROOT %endif %changelog +* Wed Feb 27 2013 Remi Collet - 1.0.9-1 +- version 1.0.9 GA +- disable test suite in mock, fix FTBFS #914203 + * Thu Feb 14 2013 Fedora Release Engineering - 1.0.8-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild diff --git a/sources b/sources index 2041f84..c20d42a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -38655dade1b06d18ba1085ac6f00018f mysql-connector-python-1.0.8-nodocs.tar.bz2 +4dcae4f24576958bfb6f02a1554f1dfe mysql-connector-python-1.0.9-nodocs.tar.bz2 From ba51b5e83772230938b1edd3c10acbb8489c996a Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Wed, 27 Feb 2013 09:14:49 +0100 Subject: [PATCH 14/81] add link to upstream bug about non-free documentation --- mysql-connector-python.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/mysql-connector-python.spec b/mysql-connector-python.spec index b5a964d..914aff7 100644 --- a/mysql-connector-python.spec +++ b/mysql-connector-python.spec @@ -19,6 +19,7 @@ Group: Development/Languages License: GPLv2 with exceptions URL: http://dev.mysql.com/usingmysql/python/ # Launch stripdocs.sh to remove non GPL documentation +# http://bugs.mysql.com/68509 Source0: %{name}-%{version}%{?versuffix}-nodocs.tar.bz2 Source1: stripdocs.sh From 23810ed6dc6936357dbcb050ce960b315d565585 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Wed, 8 May 2013 15:21:58 +0200 Subject: [PATCH 15/81] update to 1.0.10 --- .gitignore | 1 + mysql-connector-python.spec | 33 ++++++++++++++++++--------------- sources | 2 +- stripdocs.sh | 33 --------------------------------- 4 files changed, 20 insertions(+), 49 deletions(-) delete mode 100755 stripdocs.sh diff --git a/.gitignore b/.gitignore index 68fb7a6..4f1db38 100644 --- a/.gitignore +++ b/.gitignore @@ -6,3 +6,4 @@ /mysql-connector-python-1.0.7-nodocs.tar.bz2 /mysql-connector-python-1.0.8-nodocs.tar.bz2 /mysql-connector-python-1.0.9-nodocs.tar.bz2 +/mysql-connector-python-1.0.10.tar.gz diff --git a/mysql-connector-python.spec b/mysql-connector-python.spec index 914aff7..275485a 100644 --- a/mysql-connector-python.spec +++ b/mysql-connector-python.spec @@ -11,17 +11,17 @@ %global with_tests %{?_with_tests:1}%{!?_with_tests:0} Name: mysql-connector-python -Version: 1.0.9 -Release: 1%{?versuffix:.%{versuffix}}%{?dist} +Version: 1.0.10 +Release: 1%{?dist} Summary: MySQL Connector for Python 2 Group: Development/Languages License: GPLv2 with exceptions -URL: http://dev.mysql.com/usingmysql/python/ -# Launch stripdocs.sh to remove non GPL documentation -# http://bugs.mysql.com/68509 -Source0: %{name}-%{version}%{?versuffix}-nodocs.tar.bz2 -Source1: stripdocs.sh +URL: http://dev.mysql.com/doc/connector-python/en/index.html +# Upstream has a mirror redirector for downloads, so the URL is hard to +# represent statically. You can get the tarball by following a link from +# http://dev.mysql.com/downloads/connector/python/ +Source0: %{name}-%{version}.tar.gz BuildArch: noarch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -51,9 +51,8 @@ is necessary to run this Python DB API v2.0 compliant driver. %prep -%setup -q -n %{name}-%{version}%{?versuffix} +%setup -q -n %{name}-%{version} chmod -x python?/examples/*py -mv docs/README.txt README-docs %build @@ -61,16 +60,16 @@ mv docs/README.txt README-docs %install -rm -rf $RPM_BUILD_ROOT +rm -rf %{buildroot} %if 0%{?with_python3} # Python 3 build -%{__python3} setup.py install --root $RPM_BUILD_ROOT +%{__python3} setup.py install --root %{buildroot} rm -rf build %endif # Python 2 build (end with this for tests) -%{__python} setup.py install --root $RPM_BUILD_ROOT +%{__python} setup.py install --root %{buildroot} %check @@ -84,12 +83,12 @@ rm -rf build %clean -rm -rf $RPM_BUILD_ROOT +rm -rf %{buildroot} %files %defattr(-,root,root,-) -%doc ChangeLog COPYING README* +%doc ChangeLog COPYING README* docs/README_DOCS.txt %doc python2/examples %{python_sitelib}/* @@ -97,12 +96,16 @@ rm -rf $RPM_BUILD_ROOT %if 0%{?with_python3} %files -n mysql-connector-python3 %defattr(-,root,root,-) -%doc ChangeLog COPYING README* +%doc ChangeLog COPYING README* docs/README_DOCS.txt %doc python3/examples %{python3_sitelib}/* %endif %changelog +* Wed May 8 2013 Remi Collet - 1.0.10-1 +- version 1.0.10 GA +- archive is now free (no more doc to strip) + * Wed Feb 27 2013 Remi Collet - 1.0.9-1 - version 1.0.9 GA - disable test suite in mock, fix FTBFS #914203 diff --git a/sources b/sources index c20d42a..3cfc38c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -4dcae4f24576958bfb6f02a1554f1dfe mysql-connector-python-1.0.9-nodocs.tar.bz2 +439c769f9121d4cf24f4f8590c5a9c00 mysql-connector-python-1.0.10.tar.gz diff --git a/stripdocs.sh b/stripdocs.sh deleted file mode 100755 index b28fb7a..0000000 --- a/stripdocs.sh +++ /dev/null @@ -1,33 +0,0 @@ -#!/bin/bash - -if [ "$1" = "" ]; then - echo usage $0 version - exit 1 -fi - -if [ ! -f mysql-connector-python-$1.tar.gz ]; then - echo please download mysql-connector-python-$1.tar.gz - echo http://dev.mysql.com/downloads/connector/python/ - exit 1 -fi - -tdir=`mktemp -d tmpXXXXXX` -pushd $tdir - -echo -n "unpacking..." -tar xzf ../mysql-connector-python-$1.tar.gz && echo " done" -rm -rf mysql-connector-python-$1/docs/my* -echo -n "packing..." -tar cjf ../mysql-connector-python-$1-nodocs.tar.bz2 mysql-connector-python-$1 && echo " done" - -echo -n "diffing..." -tar tzf ../mysql-connector-python-$1.tar.gz | sort >before -echo -n "..." -tar tjf ../mysql-connector-python-$1-nodocs.tar.bz2 | sort >after - -diff before after - -popd -echo "cleaning..." -rm -rf $tdir - From 22bb5af7c4a5a6d27743a9cc2f837cb32fd0d5aa Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Wed, 3 Jul 2013 14:29:38 +0200 Subject: [PATCH 16/81] 1.0.11 GA --- .gitignore | 1 + mysql-connector-python.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 4f1db38..69d0fca 100644 --- a/.gitignore +++ b/.gitignore @@ -7,3 +7,4 @@ /mysql-connector-python-1.0.8-nodocs.tar.bz2 /mysql-connector-python-1.0.9-nodocs.tar.bz2 /mysql-connector-python-1.0.10.tar.gz +/mysql-connector-python-1.0.11.tar.gz diff --git a/mysql-connector-python.spec b/mysql-connector-python.spec index 275485a..3090014 100644 --- a/mysql-connector-python.spec +++ b/mysql-connector-python.spec @@ -11,7 +11,7 @@ %global with_tests %{?_with_tests:1}%{!?_with_tests:0} Name: mysql-connector-python -Version: 1.0.10 +Version: 1.0.11 Release: 1%{?dist} Summary: MySQL Connector for Python 2 @@ -102,6 +102,9 @@ rm -rf %{buildroot} %endif %changelog +* Wed Jul 3 2013 Remi Collet - 1.0.11-1 +- version 1.0.11 GA + * Wed May 8 2013 Remi Collet - 1.0.10-1 - version 1.0.10 GA - archive is now free (no more doc to strip) diff --git a/sources b/sources index 3cfc38c..e699b0c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -439c769f9121d4cf24f4f8590c5a9c00 mysql-connector-python-1.0.10.tar.gz +40cdf649696aa461458b741a07756f4a mysql-connector-python-1.0.11.tar.gz From 53da8781ee8c2204b26ac8a17715d0da2fabaf0e Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Sat, 3 Aug 2013 07:23:15 -0500 Subject: [PATCH 17/81] - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild --- mysql-connector-python.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/mysql-connector-python.spec b/mysql-connector-python.spec index 3090014..187df1a 100644 --- a/mysql-connector-python.spec +++ b/mysql-connector-python.spec @@ -12,7 +12,7 @@ Name: mysql-connector-python Version: 1.0.11 -Release: 1%{?dist} +Release: 2%{?dist} Summary: MySQL Connector for Python 2 Group: Development/Languages @@ -102,6 +102,9 @@ rm -rf %{buildroot} %endif %changelog +* Sat Aug 03 2013 Fedora Release Engineering - 1.0.11-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild + * Wed Jul 3 2013 Remi Collet - 1.0.11-1 - version 1.0.11 GA From 29ac90fb34af0382d51a5e57f0956770daf3a512 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Mon, 26 Aug 2013 18:02:09 +0200 Subject: [PATCH 18/81] udpate to 1.0.12 --- .gitignore | 1 + mysql-connector-python.spec | 23 ++++++++++++++--------- sources | 2 +- 3 files changed, 16 insertions(+), 10 deletions(-) diff --git a/.gitignore b/.gitignore index 69d0fca..949e6f7 100644 --- a/.gitignore +++ b/.gitignore @@ -8,3 +8,4 @@ /mysql-connector-python-1.0.9-nodocs.tar.bz2 /mysql-connector-python-1.0.10.tar.gz /mysql-connector-python-1.0.11.tar.gz +/mysql-connector-python-1.0.12.tar.gz diff --git a/mysql-connector-python.spec b/mysql-connector-python.spec index 187df1a..fc97a01 100644 --- a/mysql-connector-python.spec +++ b/mysql-connector-python.spec @@ -1,4 +1,5 @@ -%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} +%{!?__python2: %global __python2 %{__python}} +%{!?python2_sitelib: %global python2_sitelib %(%{__python2} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} %if 0%{?fedora} >= 13 %global with_python3 1 @@ -11,8 +12,8 @@ %global with_tests %{?_with_tests:1}%{!?_with_tests:0} Name: mysql-connector-python -Version: 1.0.11 -Release: 2%{?dist} +Version: 1.0.12 +Release: 1%{?dist} Summary: MySQL Connector for Python 2 Group: Development/Languages @@ -25,12 +26,14 @@ Source0: %{name}-%{version}.tar.gz BuildArch: noarch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: python-devel +BuildRequires: python2-devel %if 0%{?with_python3} BuildRequires: python3-devel %endif +%if %{with_tests} # for unittest BuildRequires: mysql-server +%endif %description @@ -40,8 +43,7 @@ is necessary to run this Python DB API v2.0 compliant driver. %if 0%{?with_python3} %package -n mysql-connector-python3 - -Summary: MySQL Connector for Python 3 +Summary: MySQL Connector for Python 3 %description -n mysql-connector-python3 MySQL Connector/Python is implementing the MySQL Client/Server protocol @@ -69,12 +71,12 @@ rm -rf build %endif # Python 2 build (end with this for tests) -%{__python} setup.py install --root %{buildroot} +%{__python2} setup.py install --root %{buildroot} %check %if %{with_tests} -%{__python} unittests.py \ +%{__python2} unittests.py \ --mysql-basedir=%{_prefix} \ --verbosity=1 %else @@ -90,7 +92,7 @@ rm -rf %{buildroot} %defattr(-,root,root,-) %doc ChangeLog COPYING README* docs/README_DOCS.txt %doc python2/examples -%{python_sitelib}/* +%{python2_sitelib}/* %if 0%{?with_python3} @@ -102,6 +104,9 @@ rm -rf %{buildroot} %endif %changelog +* Mon Aug 26 2013 Remi Collet - 1.0.12-1 +- version 1.0.12 GA + * Sat Aug 03 2013 Fedora Release Engineering - 1.0.11-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild diff --git a/sources b/sources index e699b0c..e0ae4d0 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -40cdf649696aa461458b741a07756f4a mysql-connector-python-1.0.11.tar.gz +caac07dc8fa08d1f55ad0c51491d2ba7 mysql-connector-python-1.0.12.tar.gz From 7a1e2bbb95fc6d74c7e5a4688d244731773621d3 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Mon, 26 Aug 2013 18:07:44 +0200 Subject: [PATCH 19/81] add spec file license --- mysql-connector-python.spec | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/mysql-connector-python.spec b/mysql-connector-python.spec index fc97a01..26f3d9d 100644 --- a/mysql-connector-python.spec +++ b/mysql-connector-python.spec @@ -1,3 +1,11 @@ +# spec file for mysql-connector-python +# +# Copyright (c) 2011-2013 Remi Collet +# License: CC-BY-SA +# http://creativecommons.org/licenses/by-sa/3.0/ +# +# Please, preserve the changelog entries +# %{!?__python2: %global __python2 %{__python}} %{!?python2_sitelib: %global python2_sitelib %(%{__python2} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} From 1a6cd639c14c055c24bf2820adddabead96278f8 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Tue, 17 Dec 2013 15:55:14 +0100 Subject: [PATCH 20/81] - version 1.1.4 GA http://dev.mysql.com/doc/relnotes/connector-python/en/news-1-1.html - add link to documentation in package description - raise dependency on python 2.6 --- .gitignore | 4 +++- mysql-connector-python.spec | 26 ++++++++++++++++++++++---- sources | 2 +- 3 files changed, 26 insertions(+), 6 deletions(-) diff --git a/.gitignore b/.gitignore index 949e6f7..81cb596 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,5 @@ -*spec~ +mysql-connector-python.spec~ +clog /mysql-connector-python-0.3.2-devel.tar.gz /mysql-connector-python-1.0.5.tar.gz /mysql-connector-python-1.0.6b1-nodocs.tar.bz2 @@ -9,3 +10,4 @@ /mysql-connector-python-1.0.10.tar.gz /mysql-connector-python-1.0.11.tar.gz /mysql-connector-python-1.0.12.tar.gz +/mysql-connector-python-1.1.4.tar.gz diff --git a/mysql-connector-python.spec b/mysql-connector-python.spec index 26f3d9d..7b84ec4 100644 --- a/mysql-connector-python.spec +++ b/mysql-connector-python.spec @@ -20,7 +20,7 @@ %global with_tests %{?_with_tests:1}%{!?_with_tests:0} Name: mysql-connector-python -Version: 1.0.12 +Version: 1.1.4 Release: 1%{?dist} Summary: MySQL Connector for Python 2 @@ -34,9 +34,9 @@ Source0: %{name}-%{version}.tar.gz BuildArch: noarch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: python2-devel +BuildRequires: python2-devel >= 2.6 %if 0%{?with_python3} -BuildRequires: python3-devel +BuildRequires: python3-devel >= 3 %endif %if %{with_tests} # for unittest @@ -49,6 +49,9 @@ MySQL Connector/Python is implementing the MySQL Client/Server protocol completely in Python. No MySQL libraries are needed, and no compilation is necessary to run this Python DB API v2.0 compliant driver. +Documentation: http://dev.mysql.com/doc/connector-python/en/index.html + + %if 0%{?with_python3} %package -n mysql-connector-python3 Summary: MySQL Connector for Python 3 @@ -57,6 +60,8 @@ Summary: MySQL Connector for Python 3 MySQL Connector/Python is implementing the MySQL Client/Server protocol completely in Python. No MySQL libraries are needed, and no compilation is necessary to run this Python DB API v2.0 compliant driver. + +Documentation: http://dev.mysql.com/doc/connector-python/en/index.html %endif @@ -84,8 +89,15 @@ rm -rf build %check %if %{with_tests} +# known failed tests +# bugs.BugOra14201459.test_error1426 + %{__python2} unittests.py \ - --mysql-basedir=%{_prefix} \ + --with-mysql=%{_prefix} \ + --verbosity=1 + +%{__python3} unittests.py \ + --with-mysql=%{_prefix} \ --verbosity=1 %else : echo test suite disabled, need '--with tests' option @@ -112,6 +124,12 @@ rm -rf %{buildroot} %endif %changelog +* Tue Dec 17 2013 Remi Collet - 1.1.4-1 +- version 1.1.4 GA + http://dev.mysql.com/doc/relnotes/connector-python/en/news-1-1.html +- add link to documentation in package description +- raise dependency on python 2.6 + * Mon Aug 26 2013 Remi Collet - 1.0.12-1 - version 1.0.12 GA diff --git a/sources b/sources index e0ae4d0..59fd6c4 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -caac07dc8fa08d1f55ad0c51491d2ba7 mysql-connector-python-1.0.12.tar.gz +1b5885a0ab65fd996ff49a303bca5ce7 mysql-connector-python-1.1.4.tar.gz From 6cdcbae025b22994d20b9dd8ebe93b1dad1b5486 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Tue, 4 Feb 2014 08:34:29 +0100 Subject: [PATCH 21/81] Update to 1.1.5 GA --- .gitignore | 1 + mysql-connector-python.spec | 8 ++++++-- sources | 2 +- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 81cb596..d5631ec 100644 --- a/.gitignore +++ b/.gitignore @@ -11,3 +11,4 @@ clog /mysql-connector-python-1.0.11.tar.gz /mysql-connector-python-1.0.12.tar.gz /mysql-connector-python-1.1.4.tar.gz +/mysql-connector-python-1.1.5.tar.gz diff --git a/mysql-connector-python.spec b/mysql-connector-python.spec index 7b84ec4..6297738 100644 --- a/mysql-connector-python.spec +++ b/mysql-connector-python.spec @@ -1,6 +1,6 @@ # spec file for mysql-connector-python # -# Copyright (c) 2011-2013 Remi Collet +# Copyright (c) 2011-2014 Remi Collet # License: CC-BY-SA # http://creativecommons.org/licenses/by-sa/3.0/ # @@ -20,7 +20,7 @@ %global with_tests %{?_with_tests:1}%{!?_with_tests:0} Name: mysql-connector-python -Version: 1.1.4 +Version: 1.1.5 Release: 1%{?dist} Summary: MySQL Connector for Python 2 @@ -124,6 +124,10 @@ rm -rf %{buildroot} %endif %changelog +* Tue Feb 4 2014 Remi Collet - 1.1.5-1 +- version 1.1.5 GA + http://dev.mysql.com/doc/relnotes/connector-python/en/news-1-1-5.html + * Tue Dec 17 2013 Remi Collet - 1.1.4-1 - version 1.1.4 GA http://dev.mysql.com/doc/relnotes/connector-python/en/news-1-1.html diff --git a/sources b/sources index 59fd6c4..342a5fa 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -1b5885a0ab65fd996ff49a303bca5ce7 mysql-connector-python-1.1.4.tar.gz +011c80ad921ceba36e07a1b24297621c mysql-connector-python-1.1.5.tar.gz From 5ba8e0b75f505afcf4e118c525a605707135a5f4 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Wed, 16 Apr 2014 17:54:14 +0200 Subject: [PATCH 22/81] update to 1.1.6 --- .gitignore | 1 + mysql-connector-python.spec | 6 +++++- sources | 2 +- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index d5631ec..fe70d78 100644 --- a/.gitignore +++ b/.gitignore @@ -12,3 +12,4 @@ clog /mysql-connector-python-1.0.12.tar.gz /mysql-connector-python-1.1.4.tar.gz /mysql-connector-python-1.1.5.tar.gz +/mysql-connector-python-1.1.6.tar.gz diff --git a/mysql-connector-python.spec b/mysql-connector-python.spec index 6297738..4b3c569 100644 --- a/mysql-connector-python.spec +++ b/mysql-connector-python.spec @@ -20,7 +20,7 @@ %global with_tests %{?_with_tests:1}%{!?_with_tests:0} Name: mysql-connector-python -Version: 1.1.5 +Version: 1.1.6 Release: 1%{?dist} Summary: MySQL Connector for Python 2 @@ -124,6 +124,10 @@ rm -rf %{buildroot} %endif %changelog +* Wed Apr 16 2014 Remi Collet - 1.1.6-1 +- version 1.1.6 GA + http://dev.mysql.com/doc/relnotes/connector-python/en/news-1-1-6.html + * Tue Feb 4 2014 Remi Collet - 1.1.5-1 - version 1.1.5 GA http://dev.mysql.com/doc/relnotes/connector-python/en/news-1-1-5.html diff --git a/sources b/sources index 342a5fa..8d39781 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -011c80ad921ceba36e07a1b24297621c mysql-connector-python-1.1.5.tar.gz +99e1b5d8bd4d5d4ff4b20683305988d7 mysql-connector-python-1.1.6.tar.gz From 4b73282e2ccf11357b2e6013ad345c29d7d47cf4 Mon Sep 17 00:00:00 2001 From: Kalev Lember Date: Tue, 27 May 2014 23:42:37 +0200 Subject: [PATCH 23/81] Rebuilt for https://fedoraproject.org/wiki/Changes/Python_3.4 --- mysql-connector-python.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/mysql-connector-python.spec b/mysql-connector-python.spec index 4b3c569..149e51d 100644 --- a/mysql-connector-python.spec +++ b/mysql-connector-python.spec @@ -21,7 +21,7 @@ Name: mysql-connector-python Version: 1.1.6 -Release: 1%{?dist} +Release: 2%{?dist} Summary: MySQL Connector for Python 2 Group: Development/Languages @@ -124,6 +124,9 @@ rm -rf %{buildroot} %endif %changelog +* Tue May 27 2014 Kalev Lember - 1.1.6-2 +- Rebuilt for https://fedoraproject.org/wiki/Changes/Python_3.4 + * Wed Apr 16 2014 Remi Collet - 1.1.6-1 - version 1.1.6 GA http://dev.mysql.com/doc/relnotes/connector-python/en/news-1-1-6.html From b241aaf876d7c8e659fb3b84c2a4f67756e4244d Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Sat, 7 Jun 2014 06:42:30 -0500 Subject: [PATCH 24/81] - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild --- mysql-connector-python.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/mysql-connector-python.spec b/mysql-connector-python.spec index 149e51d..8e64bb8 100644 --- a/mysql-connector-python.spec +++ b/mysql-connector-python.spec @@ -21,7 +21,7 @@ Name: mysql-connector-python Version: 1.1.6 -Release: 2%{?dist} +Release: 3%{?dist} Summary: MySQL Connector for Python 2 Group: Development/Languages @@ -124,6 +124,9 @@ rm -rf %{buildroot} %endif %changelog +* Sat Jun 07 2014 Fedora Release Engineering - 1.1.6-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild + * Tue May 27 2014 Kalev Lember - 1.1.6-2 - Rebuilt for https://fedoraproject.org/wiki/Changes/Python_3.4 From b483d444d3c30a810699ce177c9bf6bc32bdb266 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Wed, 17 Jun 2015 21:19:43 +0000 Subject: [PATCH 25/81] - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild --- mysql-connector-python.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/mysql-connector-python.spec b/mysql-connector-python.spec index 8e64bb8..c5e0e3d 100644 --- a/mysql-connector-python.spec +++ b/mysql-connector-python.spec @@ -21,7 +21,7 @@ Name: mysql-connector-python Version: 1.1.6 -Release: 3%{?dist} +Release: 4%{?dist} Summary: MySQL Connector for Python 2 Group: Development/Languages @@ -124,6 +124,9 @@ rm -rf %{buildroot} %endif %changelog +* Wed Jun 17 2015 Fedora Release Engineering - 1.1.6-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + * Sat Jun 07 2014 Fedora Release Engineering - 1.1.6-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild From 1e0ad5d2f51fbcacce7259eb5dbd58334836021a Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Tue, 10 Nov 2015 14:48:29 +0000 Subject: [PATCH 26/81] - Rebuilt for https://fedoraproject.org/wiki/Changes/python3.5 --- mysql-connector-python.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/mysql-connector-python.spec b/mysql-connector-python.spec index c5e0e3d..f9fc19e 100644 --- a/mysql-connector-python.spec +++ b/mysql-connector-python.spec @@ -21,7 +21,7 @@ Name: mysql-connector-python Version: 1.1.6 -Release: 4%{?dist} +Release: 5%{?dist} Summary: MySQL Connector for Python 2 Group: Development/Languages @@ -124,6 +124,9 @@ rm -rf %{buildroot} %endif %changelog +* Tue Nov 10 2015 Fedora Release Engineering - 1.1.6-5 +- Rebuilt for https://fedoraproject.org/wiki/Changes/python3.5 + * Wed Jun 17 2015 Fedora Release Engineering - 1.1.6-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild From dfc96191ebbdf150e62a77401433a272a231669e Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 4 Feb 2016 08:58:28 +0000 Subject: [PATCH 27/81] - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild --- mysql-connector-python.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/mysql-connector-python.spec b/mysql-connector-python.spec index f9fc19e..bc66860 100644 --- a/mysql-connector-python.spec +++ b/mysql-connector-python.spec @@ -21,7 +21,7 @@ Name: mysql-connector-python Version: 1.1.6 -Release: 5%{?dist} +Release: 6%{?dist} Summary: MySQL Connector for Python 2 Group: Development/Languages @@ -124,6 +124,9 @@ rm -rf %{buildroot} %endif %changelog +* Thu Feb 04 2016 Fedora Release Engineering - 1.1.6-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + * Tue Nov 10 2015 Fedora Release Engineering - 1.1.6-5 - Rebuilt for https://fedoraproject.org/wiki/Changes/python3.5 From a72f262ad9547315b0a50f0291ec390ef2462817 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Tue, 19 Jul 2016 08:00:33 +0000 Subject: [PATCH 28/81] - https://fedoraproject.org/wiki/Changes/Automatic_Provides_for_Python_RPM_Packages --- mysql-connector-python.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/mysql-connector-python.spec b/mysql-connector-python.spec index bc66860..77c66b9 100644 --- a/mysql-connector-python.spec +++ b/mysql-connector-python.spec @@ -21,7 +21,7 @@ Name: mysql-connector-python Version: 1.1.6 -Release: 6%{?dist} +Release: 7%{?dist} Summary: MySQL Connector for Python 2 Group: Development/Languages @@ -124,6 +124,9 @@ rm -rf %{buildroot} %endif %changelog +* Tue Jul 19 2016 Fedora Release Engineering - 1.1.6-7 +- https://fedoraproject.org/wiki/Changes/Automatic_Provides_for_Python_RPM_Packages + * Thu Feb 04 2016 Fedora Release Engineering - 1.1.6-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild From 0c2c05391a196496ff893218615c3745e0da34ec Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Mon, 19 Dec 2016 18:20:36 +0100 Subject: [PATCH 29/81] Rebuild for Python 3.6 --- mysql-connector-python.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/mysql-connector-python.spec b/mysql-connector-python.spec index 77c66b9..d33b059 100644 --- a/mysql-connector-python.spec +++ b/mysql-connector-python.spec @@ -21,7 +21,7 @@ Name: mysql-connector-python Version: 1.1.6 -Release: 7%{?dist} +Release: 8%{?dist} Summary: MySQL Connector for Python 2 Group: Development/Languages @@ -124,6 +124,9 @@ rm -rf %{buildroot} %endif %changelog +* Mon Dec 19 2016 Miro Hrončok - 1.1.6-8 +- Rebuild for Python 3.6 + * Tue Jul 19 2016 Fedora Release Engineering - 1.1.6-7 - https://fedoraproject.org/wiki/Changes/Automatic_Provides_for_Python_RPM_Packages From 807ad527d8f4bea3b3184aa52a4b10d175b5c89f Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 10 Feb 2017 21:56:56 +0000 Subject: [PATCH 30/81] - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild --- mysql-connector-python.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/mysql-connector-python.spec b/mysql-connector-python.spec index d33b059..fb23bfd 100644 --- a/mysql-connector-python.spec +++ b/mysql-connector-python.spec @@ -21,7 +21,7 @@ Name: mysql-connector-python Version: 1.1.6 -Release: 8%{?dist} +Release: 9%{?dist} Summary: MySQL Connector for Python 2 Group: Development/Languages @@ -124,6 +124,9 @@ rm -rf %{buildroot} %endif %changelog +* Fri Feb 10 2017 Fedora Release Engineering - 1.1.6-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + * Mon Dec 19 2016 Miro Hrončok - 1.1.6-8 - Rebuild for Python 3.6 From 0ef60babb0fe79aa0df7e7232d1bb85649bc88d3 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 26 Jul 2017 22:32:44 +0000 Subject: [PATCH 31/81] - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild --- mysql-connector-python.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/mysql-connector-python.spec b/mysql-connector-python.spec index fb23bfd..6b92349 100644 --- a/mysql-connector-python.spec +++ b/mysql-connector-python.spec @@ -21,7 +21,7 @@ Name: mysql-connector-python Version: 1.1.6 -Release: 9%{?dist} +Release: 10%{?dist} Summary: MySQL Connector for Python 2 Group: Development/Languages @@ -124,6 +124,9 @@ rm -rf %{buildroot} %endif %changelog +* Wed Jul 26 2017 Fedora Release Engineering - 1.1.6-10 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + * Fri Feb 10 2017 Fedora Release Engineering - 1.1.6-9 - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild From 52a787c4ced02decd0d90b17ece2ea0a1da7dba5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Sat, 19 Aug 2017 09:38:59 -0400 Subject: [PATCH 32/81] Python 2 binary package renamed to python2-mysql-connector --- mysql-connector-python.spec | 29 ++++++++++++++++++++++------- 1 file changed, 22 insertions(+), 7 deletions(-) diff --git a/mysql-connector-python.spec b/mysql-connector-python.spec index 6b92349..8de99ea 100644 --- a/mysql-connector-python.spec +++ b/mysql-connector-python.spec @@ -21,7 +21,7 @@ Name: mysql-connector-python Version: 1.1.6 -Release: 10%{?dist} +Release: 11%{?dist} Summary: MySQL Connector for Python 2 Group: Development/Languages @@ -44,13 +44,24 @@ BuildRequires: mysql-server %endif -%description -MySQL Connector/Python is implementing the MySQL Client/Server protocol -completely in Python. No MySQL libraries are needed, and no compilation -is necessary to run this Python DB API v2.0 compliant driver. +%global _description\ +MySQL Connector/Python is implementing the MySQL Client/Server protocol\ +completely in Python. No MySQL libraries are needed, and no compilation\ +is necessary to run this Python DB API v2.0 compliant driver.\ +\ +Documentation: http://dev.mysql.com/doc/connector-python/en/index.html\ -Documentation: http://dev.mysql.com/doc/connector-python/en/index.html +%description %_description + +%package -n python2-mysql-connector +Summary: %summary +%{?python_provide:%python_provide python2-mysql-connector} +# Remove before F30 +Provides: mysql-connector-python%{?_isa} = %{version}-%{release} +Obsoletes: mysql-connector-python < %{version}-%{release} + +%description -n python2-mysql-connector %_description %if 0%{?with_python3} %package -n mysql-connector-python3 @@ -108,7 +119,7 @@ rm -rf build rm -rf %{buildroot} -%files +%files -n python2-mysql-connector %defattr(-,root,root,-) %doc ChangeLog COPYING README* docs/README_DOCS.txt %doc python2/examples @@ -124,6 +135,10 @@ rm -rf %{buildroot} %endif %changelog +* Sat Aug 19 2017 Zbigniew Jędrzejewski-Szmek - 1.1.6-11 +- Python 2 binary package renamed to python2-mysql-connector + See https://fedoraproject.org/wiki/FinalizingFedoraSwitchtoPython3 + * Wed Jul 26 2017 Fedora Release Engineering - 1.1.6-10 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild From 9642ab95d77beb075a4852cce0c251181d13bd76 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 8 Feb 2018 03:38:11 +0000 Subject: [PATCH 33/81] - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- mysql-connector-python.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/mysql-connector-python.spec b/mysql-connector-python.spec index 8de99ea..742082f 100644 --- a/mysql-connector-python.spec +++ b/mysql-connector-python.spec @@ -21,7 +21,7 @@ Name: mysql-connector-python Version: 1.1.6 -Release: 11%{?dist} +Release: 12%{?dist} Summary: MySQL Connector for Python 2 Group: Development/Languages @@ -135,6 +135,9 @@ rm -rf %{buildroot} %endif %changelog +* Thu Feb 08 2018 Fedora Release Engineering - 1.1.6-12 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + * Sat Aug 19 2017 Zbigniew Jędrzejewski-Szmek - 1.1.6-11 - Python 2 binary package renamed to python2-mysql-connector See https://fedoraproject.org/wiki/FinalizingFedoraSwitchtoPython3 From 753d51a0643ac8670b8223426a6a1d43d46c4587 Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Tue, 13 Feb 2018 23:52:33 +0100 Subject: [PATCH 34/81] Remove BuildRoot definition None of currently supported distributions need that. It was needed last for EL5 which is EOL now Signed-off-by: Igor Gnatenko --- mysql-connector-python.spec | 1 - 1 file changed, 1 deletion(-) diff --git a/mysql-connector-python.spec b/mysql-connector-python.spec index 742082f..0d4588d 100644 --- a/mysql-connector-python.spec +++ b/mysql-connector-python.spec @@ -33,7 +33,6 @@ URL: http://dev.mysql.com/doc/connector-python/en/index.html Source0: %{name}-%{version}.tar.gz BuildArch: noarch -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: python2-devel >= 2.6 %if 0%{?with_python3} BuildRequires: python3-devel >= 3 From 2f20d3b5fa265f7a37f18d21148524c4672bb0b3 Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Wed, 14 Feb 2018 07:22:17 +0100 Subject: [PATCH 35/81] Remove %clean section None of currently supported distributions need that. Last one was EL5 which is EOL for a while. Signed-off-by: Igor Gnatenko --- mysql-connector-python.spec | 3 --- 1 file changed, 3 deletions(-) diff --git a/mysql-connector-python.spec b/mysql-connector-python.spec index 0d4588d..448c883 100644 --- a/mysql-connector-python.spec +++ b/mysql-connector-python.spec @@ -114,9 +114,6 @@ rm -rf build %endif -%clean -rm -rf %{buildroot} - %files -n python2-mysql-connector %defattr(-,root,root,-) From ca835cb2268b8bf8eea80a6920f2d798045d404e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Tue, 19 Jun 2018 10:48:17 +0200 Subject: [PATCH 36/81] Rebuilt for Python 3.7 --- mysql-connector-python.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/mysql-connector-python.spec b/mysql-connector-python.spec index 448c883..4014fd6 100644 --- a/mysql-connector-python.spec +++ b/mysql-connector-python.spec @@ -21,7 +21,7 @@ Name: mysql-connector-python Version: 1.1.6 -Release: 12%{?dist} +Release: 13%{?dist} Summary: MySQL Connector for Python 2 Group: Development/Languages @@ -131,6 +131,9 @@ rm -rf build %endif %changelog +* Tue Jun 19 2018 Miro Hrončok - 1.1.6-13 +- Rebuilt for Python 3.7 + * Thu Feb 08 2018 Fedora Release Engineering - 1.1.6-12 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild From f67b39049bf86d2bd04dbf7b609aea601f5da61c Mon Sep 17 00:00:00 2001 From: Jason Tibbitts Date: Tue, 10 Jul 2018 02:07:10 -0500 Subject: [PATCH 37/81] Remove needless use of %defattr --- mysql-connector-python.spec | 2 -- 1 file changed, 2 deletions(-) diff --git a/mysql-connector-python.spec b/mysql-connector-python.spec index 4014fd6..1be880f 100644 --- a/mysql-connector-python.spec +++ b/mysql-connector-python.spec @@ -116,7 +116,6 @@ rm -rf build %files -n python2-mysql-connector -%defattr(-,root,root,-) %doc ChangeLog COPYING README* docs/README_DOCS.txt %doc python2/examples %{python2_sitelib}/* @@ -124,7 +123,6 @@ rm -rf build %if 0%{?with_python3} %files -n mysql-connector-python3 -%defattr(-,root,root,-) %doc ChangeLog COPYING README* docs/README_DOCS.txt %doc python3/examples %{python3_sitelib}/* From 77fe9d15ee51a16350008c6d544678da3c3fa63b Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 13 Jul 2018 11:15:47 +0000 Subject: [PATCH 38/81] - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- mysql-connector-python.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/mysql-connector-python.spec b/mysql-connector-python.spec index 1be880f..2347cf0 100644 --- a/mysql-connector-python.spec +++ b/mysql-connector-python.spec @@ -21,7 +21,7 @@ Name: mysql-connector-python Version: 1.1.6 -Release: 13%{?dist} +Release: 14%{?dist} Summary: MySQL Connector for Python 2 Group: Development/Languages @@ -129,6 +129,9 @@ rm -rf build %endif %changelog +* Fri Jul 13 2018 Fedora Release Engineering - 1.1.6-14 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + * Tue Jun 19 2018 Miro Hrončok - 1.1.6-13 - Rebuilt for Python 3.7 From 06cfec460b825647e12660aece36203537ba90cd Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Mon, 28 Jan 2019 20:17:55 +0100 Subject: [PATCH 39/81] Remove obsolete Group tag References: https://fedoraproject.org/wiki/Changes/Remove_Group_Tag --- mysql-connector-python.spec | 1 - 1 file changed, 1 deletion(-) diff --git a/mysql-connector-python.spec b/mysql-connector-python.spec index 2347cf0..d228d62 100644 --- a/mysql-connector-python.spec +++ b/mysql-connector-python.spec @@ -24,7 +24,6 @@ Version: 1.1.6 Release: 14%{?dist} Summary: MySQL Connector for Python 2 -Group: Development/Languages License: GPLv2 with exceptions URL: http://dev.mysql.com/doc/connector-python/en/index.html # Upstream has a mirror redirector for downloads, so the URL is hard to From 66abe82066cbf24c46081788027ab4bc17fef0ed Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 1 Feb 2019 11:49:12 +0000 Subject: [PATCH 40/81] - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- mysql-connector-python.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/mysql-connector-python.spec b/mysql-connector-python.spec index d228d62..6347184 100644 --- a/mysql-connector-python.spec +++ b/mysql-connector-python.spec @@ -21,7 +21,7 @@ Name: mysql-connector-python Version: 1.1.6 -Release: 14%{?dist} +Release: 15%{?dist} Summary: MySQL Connector for Python 2 License: GPLv2 with exceptions @@ -128,6 +128,9 @@ rm -rf build %endif %changelog +* Fri Feb 01 2019 Fedora Release Engineering - 1.1.6-15 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + * Fri Jul 13 2018 Fedora Release Engineering - 1.1.6-14 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild From 32c5c1556ad56809a082e928572419d86215134f Mon Sep 17 00:00:00 2001 From: Honza Horak Date: Thu, 18 Jul 2019 19:22:53 +0200 Subject: [PATCH 41/81] Rebase to 8.0.16 Resolves: #1390718 --- mysql-connector-python.spec | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/mysql-connector-python.spec b/mysql-connector-python.spec index 6347184..9cf7837 100644 --- a/mysql-connector-python.spec +++ b/mysql-connector-python.spec @@ -20,8 +20,8 @@ %global with_tests %{?_with_tests:1}%{!?_with_tests:0} Name: mysql-connector-python -Version: 1.1.6 -Release: 15%{?dist} +Version: 8.0.16 +Release: 1%{?dist} Summary: MySQL Connector for Python 2 License: GPLv2 with exceptions @@ -76,7 +76,7 @@ Documentation: http://dev.mysql.com/doc/connector-python/en/index.html %prep %setup -q -n %{name}-%{version} -chmod -x python?/examples/*py +chmod -x examples/*py %build @@ -115,19 +115,25 @@ rm -rf build %files -n python2-mysql-connector -%doc ChangeLog COPYING README* docs/README_DOCS.txt -%doc python2/examples +%doc CHANGES.txt README* docs +%doc examples +%license LICENSE.txt %{python2_sitelib}/* %if 0%{?with_python3} %files -n mysql-connector-python3 -%doc ChangeLog COPYING README* docs/README_DOCS.txt -%doc python3/examples +%doc CHANGES.txt README* docs +%doc examples +%license LICENSE.txt %{python3_sitelib}/* %endif %changelog +* Thu Jul 18 2019 Honza Horak - 8.0.16-1 +- Rebase to 8.0.16 + Resolves: #1390718 + * Fri Feb 01 2019 Fedora Release Engineering - 1.1.6-15 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild From ff60377a9ca2e2f98dd6c053aa5b5c000a62c5c3 Mon Sep 17 00:00:00 2001 From: Honza Horak Date: Thu, 18 Jul 2019 19:27:36 +0200 Subject: [PATCH 42/81] Adding the sources Related: #1390718 --- .gitignore | 1 + sources | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index fe70d78..82a460a 100644 --- a/.gitignore +++ b/.gitignore @@ -13,3 +13,4 @@ clog /mysql-connector-python-1.1.4.tar.gz /mysql-connector-python-1.1.5.tar.gz /mysql-connector-python-1.1.6.tar.gz +/mysql-connector-python-8.0.16.tar.gz diff --git a/sources b/sources index 8d39781..eba387b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -99e1b5d8bd4d5d4ff4b20683305988d7 mysql-connector-python-1.1.6.tar.gz +SHA512 (mysql-connector-python-8.0.16.tar.gz) = 5dd28b49343995a40a185c04bf46db7acc26d1371394af57b8110990e5cc8dc53397c6dd5b011851c9f0359f033c897114c756bc7d480860b4eb625c1ac06234 From 69157e5d0e9c82b8d86a89977a3f8b564896d0bb Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 25 Jul 2019 18:07:20 +0000 Subject: [PATCH 43/81] - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- mysql-connector-python.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/mysql-connector-python.spec b/mysql-connector-python.spec index 9cf7837..6bf5373 100644 --- a/mysql-connector-python.spec +++ b/mysql-connector-python.spec @@ -21,7 +21,7 @@ Name: mysql-connector-python Version: 8.0.16 -Release: 1%{?dist} +Release: 2%{?dist} Summary: MySQL Connector for Python 2 License: GPLv2 with exceptions @@ -130,6 +130,9 @@ rm -rf build %endif %changelog +* Thu Jul 25 2019 Fedora Release Engineering - 8.0.16-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + * Thu Jul 18 2019 Honza Horak - 8.0.16-1 - Rebase to 8.0.16 Resolves: #1390718 From 9db4e5daf2f29d37e7a6019dcb92a36d6aceb18e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Mon, 29 Jul 2019 11:39:11 +0200 Subject: [PATCH 44/81] Drop python2-mysql-connector (#1731660) --- mysql-connector-python.spec | 51 +++++-------------------------------- 1 file changed, 6 insertions(+), 45 deletions(-) diff --git a/mysql-connector-python.spec b/mysql-connector-python.spec index 6bf5373..aaa1db3 100644 --- a/mysql-connector-python.spec +++ b/mysql-connector-python.spec @@ -6,14 +6,6 @@ # # Please, preserve the changelog entries # -%{!?__python2: %global __python2 %{__python}} -%{!?python2_sitelib: %global python2_sitelib %(%{__python2} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} - -%if 0%{?fedora} >= 13 -%global with_python3 1 -%else -%global with_python3 0 -%endif # Tests only run on manual build --with tests # Tests rely on MySQL version 5.6 @@ -21,7 +13,7 @@ Name: mysql-connector-python Version: 8.0.16 -Release: 2%{?dist} +Release: 3%{?dist} Summary: MySQL Connector for Python 2 License: GPLv2 with exceptions @@ -32,10 +24,7 @@ URL: http://dev.mysql.com/doc/connector-python/en/index.html Source0: %{name}-%{version}.tar.gz BuildArch: noarch -BuildRequires: python2-devel >= 2.6 -%if 0%{?with_python3} BuildRequires: python3-devel >= 3 -%endif %if %{with_tests} # for unittest BuildRequires: mysql-server @@ -52,18 +41,9 @@ Documentation: http://dev.mysql.com/doc/connector-python/en/index.html\ %description %_description -%package -n python2-mysql-connector -Summary: %summary -%{?python_provide:%python_provide python2-mysql-connector} -# Remove before F30 -Provides: mysql-connector-python%{?_isa} = %{version}-%{release} -Obsoletes: mysql-connector-python < %{version}-%{release} - -%description -n python2-mysql-connector %_description - -%if 0%{?with_python3} %package -n mysql-connector-python3 Summary: MySQL Connector for Python 3 +%{?python_provide:%python_provide python3-mysql-connector} %description -n mysql-connector-python3 MySQL Connector/Python is implementing the MySQL Client/Server protocol @@ -71,7 +51,6 @@ completely in Python. No MySQL libraries are needed, and no compilation is necessary to run this Python DB API v2.0 compliant driver. Documentation: http://dev.mysql.com/doc/connector-python/en/index.html -%endif %prep @@ -84,16 +63,8 @@ chmod -x examples/*py %install -rm -rf %{buildroot} - -%if 0%{?with_python3} -# Python 3 build %{__python3} setup.py install --root %{buildroot} -rm -rf build -%endif -# Python 2 build (end with this for tests) -%{__python2} setup.py install --root %{buildroot} %check @@ -101,10 +72,6 @@ rm -rf build # known failed tests # bugs.BugOra14201459.test_error1426 -%{__python2} unittests.py \ - --with-mysql=%{_prefix} \ - --verbosity=1 - %{__python3} unittests.py \ --with-mysql=%{_prefix} \ --verbosity=1 @@ -113,23 +80,17 @@ rm -rf build %endif - -%files -n python2-mysql-connector -%doc CHANGES.txt README* docs -%doc examples -%license LICENSE.txt -%{python2_sitelib}/* - - -%if 0%{?with_python3} %files -n mysql-connector-python3 %doc CHANGES.txt README* docs %doc examples %license LICENSE.txt %{python3_sitelib}/* -%endif + %changelog +* Mon Jul 29 2019 Miro Hrončok - 8.0.16-3 +- Drop python2-mysql-connector (#1731660) + * Thu Jul 25 2019 Fedora Release Engineering - 8.0.16-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild From 17a507b6d9221de713c4b7ca41f1e436bed6412e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Mon, 19 Aug 2019 10:20:21 +0200 Subject: [PATCH 45/81] Rebuilt for Python 3.8 --- mysql-connector-python.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/mysql-connector-python.spec b/mysql-connector-python.spec index aaa1db3..c5704ea 100644 --- a/mysql-connector-python.spec +++ b/mysql-connector-python.spec @@ -13,7 +13,7 @@ Name: mysql-connector-python Version: 8.0.16 -Release: 3%{?dist} +Release: 4%{?dist} Summary: MySQL Connector for Python 2 License: GPLv2 with exceptions @@ -88,6 +88,9 @@ chmod -x examples/*py %changelog +* Mon Aug 19 2019 Miro Hrončok - 8.0.16-4 +- Rebuilt for Python 3.8 + * Mon Jul 29 2019 Miro Hrončok - 8.0.16-3 - Drop python2-mysql-connector (#1731660) From 05d5172372ae28d237b8459534ce8a252b3703f1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Thu, 3 Oct 2019 13:57:05 +0200 Subject: [PATCH 46/81] Rebuilt for Python 3.8.0rc1 (#1748018) --- mysql-connector-python.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/mysql-connector-python.spec b/mysql-connector-python.spec index c5704ea..d459071 100644 --- a/mysql-connector-python.spec +++ b/mysql-connector-python.spec @@ -13,7 +13,7 @@ Name: mysql-connector-python Version: 8.0.16 -Release: 4%{?dist} +Release: 5%{?dist} Summary: MySQL Connector for Python 2 License: GPLv2 with exceptions @@ -88,6 +88,9 @@ chmod -x examples/*py %changelog +* Thu Oct 03 2019 Miro Hrončok - 8.0.16-5 +- Rebuilt for Python 3.8.0rc1 (#1748018) + * Mon Aug 19 2019 Miro Hrončok - 8.0.16-4 - Rebuilt for Python 3.8 From 424ec2d95aa7fa06d381c0973e5b3f8fe3a3bd98 Mon Sep 17 00:00:00 2001 From: Michal Schorm Date: Mon, 20 Jan 2020 01:38:55 +0100 Subject: [PATCH 47/81] Rebase to 8.0.19 --- .gitignore | 1 + mysql-connector-python.spec | 9 ++++++--- sources | 2 +- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 82a460a..378c520 100644 --- a/.gitignore +++ b/.gitignore @@ -14,3 +14,4 @@ clog /mysql-connector-python-1.1.5.tar.gz /mysql-connector-python-1.1.6.tar.gz /mysql-connector-python-8.0.16.tar.gz +/mysql-connector-python-8.0.19.tar.gz diff --git a/mysql-connector-python.spec b/mysql-connector-python.spec index d459071..a6b5da5 100644 --- a/mysql-connector-python.spec +++ b/mysql-connector-python.spec @@ -12,9 +12,9 @@ %global with_tests %{?_with_tests:1}%{!?_with_tests:0} Name: mysql-connector-python -Version: 8.0.16 -Release: 5%{?dist} -Summary: MySQL Connector for Python 2 +Version: 8.0.19 +Release: 1%{?dist} +Summary: MySQL Connector for Python 3 License: GPLv2 with exceptions URL: http://dev.mysql.com/doc/connector-python/en/index.html @@ -88,6 +88,9 @@ chmod -x examples/*py %changelog +* Mon Jan 20 2020 Michal Schorm - 8.0.19-1 +- Rebase to 8.0.19 + * Thu Oct 03 2019 Miro Hrončok - 8.0.16-5 - Rebuilt for Python 3.8.0rc1 (#1748018) diff --git a/sources b/sources index eba387b..7d99dd2 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (mysql-connector-python-8.0.16.tar.gz) = 5dd28b49343995a40a185c04bf46db7acc26d1371394af57b8110990e5cc8dc53397c6dd5b011851c9f0359f033c897114c756bc7d480860b4eb625c1ac06234 +SHA512 (mysql-connector-python-8.0.19.tar.gz) = 878504437a8756013cbb7a072a47f9fa22fe89379746f76e06f20eea22db237e674a9f51c268a5b37fd7f26a0407c3263f2b9fa78b70200807047bf22b335797 From 0bba22961db27dc16f752ddf6b03c848e029b5eb Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 29 Jan 2020 14:25:27 +0000 Subject: [PATCH 48/81] - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- mysql-connector-python.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/mysql-connector-python.spec b/mysql-connector-python.spec index a6b5da5..b252477 100644 --- a/mysql-connector-python.spec +++ b/mysql-connector-python.spec @@ -13,7 +13,7 @@ Name: mysql-connector-python Version: 8.0.19 -Release: 1%{?dist} +Release: 2%{?dist} Summary: MySQL Connector for Python 3 License: GPLv2 with exceptions @@ -88,6 +88,9 @@ chmod -x examples/*py %changelog +* Wed Jan 29 2020 Fedora Release Engineering - 8.0.19-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + * Mon Jan 20 2020 Michal Schorm - 8.0.19-1 - Rebase to 8.0.19 From c3c03b2045941b4e772c86f4b548bb9be7d8854d Mon Sep 17 00:00:00 2001 From: Michal Schorm Date: Fri, 7 Feb 2020 14:41:03 +0100 Subject: [PATCH 49/81] Rebuilt for newer protobuf version Resolves: #1797297 --- mysql-connector-python.spec | 9 ++++++++- protobuf_version.patch | 10 ++++++++++ 2 files changed, 18 insertions(+), 1 deletion(-) create mode 100644 protobuf_version.patch diff --git a/mysql-connector-python.spec b/mysql-connector-python.spec index b252477..dad7e87 100644 --- a/mysql-connector-python.spec +++ b/mysql-connector-python.spec @@ -13,7 +13,7 @@ Name: mysql-connector-python Version: 8.0.19 -Release: 2%{?dist} +Release: 3%{?dist} Summary: MySQL Connector for Python 3 License: GPLv2 with exceptions @@ -23,6 +23,8 @@ URL: http://dev.mysql.com/doc/connector-python/en/index.html # http://dev.mysql.com/downloads/connector/python/ Source0: %{name}-%{version}.tar.gz +Patch0: protobuf_version.patch + BuildArch: noarch BuildRequires: python3-devel >= 3 %if %{with_tests} @@ -57,6 +59,7 @@ Documentation: http://dev.mysql.com/doc/connector-python/en/index.html %setup -q -n %{name}-%{version} chmod -x examples/*py +%patch0 -p1 %build # nothing to build @@ -88,6 +91,10 @@ chmod -x examples/*py %changelog +* Fri Feb 07 2020 Michal Schorm - 8.0.19-3 +- Rebuilt for newer protobuf version + Resolves: #1797297 + * Wed Jan 29 2020 Fedora Release Engineering - 8.0.19-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild diff --git a/protobuf_version.patch b/protobuf_version.patch new file mode 100644 index 0000000..c9d9160 --- /dev/null +++ b/protobuf_version.patch @@ -0,0 +1,10 @@ +https://bugzilla.redhat.com/show_bug.cgi?id=1797297 + +--- mysql-connector-python-8.0.19/setupinfo.py 2019-12-17 13:31:58.000000000 +0100 ++++ mysql-connector-python-8.0.19/setupinfo.py_patched 2020-02-07 14:36:28.976789500 +0100 +@@ -139,4 +139,4 @@ classifiers = [ + 'Topic :: Software Development :: Libraries :: Application Frameworks', + 'Topic :: Software Development :: Libraries :: Python Modules' + ] +-install_requires = ["protobuf==3.6.1", "dnspython==1.16.0"] ++install_requires = ["protobuf==3.11.2", "dnspython==1.16.0"] From a40cb7c53fc2d9526b12bd3d4f284fc47904d687 Mon Sep 17 00:00:00 2001 From: Michal Schorm Date: Tue, 5 May 2020 14:20:37 +0200 Subject: [PATCH 50/81] Rebase to 8.0.20 Upstream stopped to hardcode required protobuf version, patch can be removed Resolves: #1830662 --- .gitignore | 1 + mysql-connector-python.spec | 13 +++++++------ protobuf_version.patch | 10 ---------- sources | 2 +- 4 files changed, 9 insertions(+), 17 deletions(-) delete mode 100644 protobuf_version.patch diff --git a/.gitignore b/.gitignore index 378c520..92267ba 100644 --- a/.gitignore +++ b/.gitignore @@ -15,3 +15,4 @@ clog /mysql-connector-python-1.1.6.tar.gz /mysql-connector-python-8.0.16.tar.gz /mysql-connector-python-8.0.19.tar.gz +/mysql-connector-python-8.0.20.tar.gz diff --git a/mysql-connector-python.spec b/mysql-connector-python.spec index dad7e87..00a6219 100644 --- a/mysql-connector-python.spec +++ b/mysql-connector-python.spec @@ -12,8 +12,8 @@ %global with_tests %{?_with_tests:1}%{!?_with_tests:0} Name: mysql-connector-python -Version: 8.0.19 -Release: 3%{?dist} +Version: 8.0.20 +Release: 1%{?dist} Summary: MySQL Connector for Python 3 License: GPLv2 with exceptions @@ -23,8 +23,6 @@ URL: http://dev.mysql.com/doc/connector-python/en/index.html # http://dev.mysql.com/downloads/connector/python/ Source0: %{name}-%{version}.tar.gz -Patch0: protobuf_version.patch - BuildArch: noarch BuildRequires: python3-devel >= 3 %if %{with_tests} @@ -59,8 +57,6 @@ Documentation: http://dev.mysql.com/doc/connector-python/en/index.html %setup -q -n %{name}-%{version} chmod -x examples/*py -%patch0 -p1 - %build # nothing to build @@ -91,6 +87,11 @@ chmod -x examples/*py %changelog +* Tue May 05 2020 Michal Schorm - 8.0.20-1 +- Rebase to 8.0.20 +- Upstream stopped to hardcode required protobuf version, patch can be removed + Resolves: #1830662 + * Fri Feb 07 2020 Michal Schorm - 8.0.19-3 - Rebuilt for newer protobuf version Resolves: #1797297 diff --git a/protobuf_version.patch b/protobuf_version.patch deleted file mode 100644 index c9d9160..0000000 --- a/protobuf_version.patch +++ /dev/null @@ -1,10 +0,0 @@ -https://bugzilla.redhat.com/show_bug.cgi?id=1797297 - ---- mysql-connector-python-8.0.19/setupinfo.py 2019-12-17 13:31:58.000000000 +0100 -+++ mysql-connector-python-8.0.19/setupinfo.py_patched 2020-02-07 14:36:28.976789500 +0100 -@@ -139,4 +139,4 @@ classifiers = [ - 'Topic :: Software Development :: Libraries :: Application Frameworks', - 'Topic :: Software Development :: Libraries :: Python Modules' - ] --install_requires = ["protobuf==3.6.1", "dnspython==1.16.0"] -+install_requires = ["protobuf==3.11.2", "dnspython==1.16.0"] diff --git a/sources b/sources index 7d99dd2..a27e074 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (mysql-connector-python-8.0.19.tar.gz) = 878504437a8756013cbb7a072a47f9fa22fe89379746f76e06f20eea22db237e674a9f51c268a5b37fd7f26a0407c3263f2b9fa78b70200807047bf22b335797 +SHA512 (mysql-connector-python-8.0.20.tar.gz) = 3b7298036f1b28eed98ca05ebc52619dbdf65393b4a01bf6eccea87d298da430ecfd19a3b327050ebc48b2c237698c7545c0196949d84cb79117f4d767d736aa From 26b0e09e3fae4b680736b13b0f7358d918714bca Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Tue, 26 May 2020 02:53:41 +0200 Subject: [PATCH 51/81] Rebuilt for Python 3.9 --- mysql-connector-python.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/mysql-connector-python.spec b/mysql-connector-python.spec index 00a6219..b5834dc 100644 --- a/mysql-connector-python.spec +++ b/mysql-connector-python.spec @@ -13,7 +13,7 @@ Name: mysql-connector-python Version: 8.0.20 -Release: 1%{?dist} +Release: 2%{?dist} Summary: MySQL Connector for Python 3 License: GPLv2 with exceptions @@ -87,6 +87,9 @@ chmod -x examples/*py %changelog +* Tue May 26 2020 Miro Hrončok - 8.0.20-2 +- Rebuilt for Python 3.9 + * Tue May 05 2020 Michal Schorm - 8.0.20-1 - Rebase to 8.0.20 - Upstream stopped to hardcode required protobuf version, patch can be removed From 194f2db09a6a4053ec64af55a98e91ac1d60d88e Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Tue, 28 Jul 2020 08:43:41 +0000 Subject: [PATCH 52/81] - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- mysql-connector-python.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/mysql-connector-python.spec b/mysql-connector-python.spec index b5834dc..d4225d4 100644 --- a/mysql-connector-python.spec +++ b/mysql-connector-python.spec @@ -13,7 +13,7 @@ Name: mysql-connector-python Version: 8.0.20 -Release: 2%{?dist} +Release: 3%{?dist} Summary: MySQL Connector for Python 3 License: GPLv2 with exceptions @@ -87,6 +87,9 @@ chmod -x examples/*py %changelog +* Tue Jul 28 2020 Fedora Release Engineering - 8.0.20-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + * Tue May 26 2020 Miro Hrončok - 8.0.20-2 - Rebuilt for Python 3.9 From f88c87d6ea8134d7f25a514a3d9b70e2111d8b5c Mon Sep 17 00:00:00 2001 From: Michal Schorm Date: Wed, 19 Aug 2020 00:06:09 +0200 Subject: [PATCH 53/81] Rebase to 8.0.21 --- .gitignore | 1 + mysql-connector-python.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 92267ba..d3b0d23 100644 --- a/.gitignore +++ b/.gitignore @@ -16,3 +16,4 @@ clog /mysql-connector-python-8.0.16.tar.gz /mysql-connector-python-8.0.19.tar.gz /mysql-connector-python-8.0.20.tar.gz +/mysql-connector-python-8.0.21.tar.gz diff --git a/mysql-connector-python.spec b/mysql-connector-python.spec index d4225d4..151b456 100644 --- a/mysql-connector-python.spec +++ b/mysql-connector-python.spec @@ -12,8 +12,8 @@ %global with_tests %{?_with_tests:1}%{!?_with_tests:0} Name: mysql-connector-python -Version: 8.0.20 -Release: 3%{?dist} +Version: 8.0.21 +Release: 1%{?dist} Summary: MySQL Connector for Python 3 License: GPLv2 with exceptions @@ -87,6 +87,9 @@ chmod -x examples/*py %changelog +* Wed Aug 19 2020 Michal Schorm - 8.0.21-1 +- Rebase to 8.0.21 + * Tue Jul 28 2020 Fedora Release Engineering - 8.0.20-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild diff --git a/sources b/sources index a27e074..0e60d0e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (mysql-connector-python-8.0.20.tar.gz) = 3b7298036f1b28eed98ca05ebc52619dbdf65393b4a01bf6eccea87d298da430ecfd19a3b327050ebc48b2c237698c7545c0196949d84cb79117f4d767d736aa +SHA512 (mysql-connector-python-8.0.21.tar.gz) = d73efd99774450bbf729ddbb19b80d09b8db151715d12b76e40497bf1d9ff658e0ad1e22dc9a73dd5f6736f7c075f94808a2f28b1c975aaa380bbb92cf4e7184 From 92b4dfc194d7334015905ede8a919d1926ab643b Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Tue, 26 Jan 2021 21:06:11 +0000 Subject: [PATCH 54/81] - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- mysql-connector-python.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/mysql-connector-python.spec b/mysql-connector-python.spec index 151b456..ae81d2d 100644 --- a/mysql-connector-python.spec +++ b/mysql-connector-python.spec @@ -13,7 +13,7 @@ Name: mysql-connector-python Version: 8.0.21 -Release: 1%{?dist} +Release: 2%{?dist} Summary: MySQL Connector for Python 3 License: GPLv2 with exceptions @@ -87,6 +87,9 @@ chmod -x examples/*py %changelog +* Tue Jan 26 2021 Fedora Release Engineering - 8.0.21-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + * Wed Aug 19 2020 Michal Schorm - 8.0.21-1 - Rebase to 8.0.21 From 9d2a669130ac1a9010b54f31564ea46427f95f17 Mon Sep 17 00:00:00 2001 From: Tomas Hrnciar Date: Mon, 19 Apr 2021 13:18:31 +0200 Subject: [PATCH 55/81] BuildRequire setuptools explicitly See https://fedoraproject.org/wiki/Changes/Reduce_dependencies_on_python3-setuptools --- mysql-connector-python.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/mysql-connector-python.spec b/mysql-connector-python.spec index ae81d2d..5b59aaa 100644 --- a/mysql-connector-python.spec +++ b/mysql-connector-python.spec @@ -25,6 +25,7 @@ Source0: %{name}-%{version}.tar.gz BuildArch: noarch BuildRequires: python3-devel >= 3 +BuildRequires: python3-setuptools %if %{with_tests} # for unittest BuildRequires: mysql-server From e2be5c6d8fe6d89b033c5c0d492a816242893360 Mon Sep 17 00:00:00 2001 From: Python Maint Date: Fri, 4 Jun 2021 20:12:24 +0200 Subject: [PATCH 56/81] Rebuilt for Python 3.10 --- mysql-connector-python.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/mysql-connector-python.spec b/mysql-connector-python.spec index 5b59aaa..7dadc76 100644 --- a/mysql-connector-python.spec +++ b/mysql-connector-python.spec @@ -13,7 +13,7 @@ Name: mysql-connector-python Version: 8.0.21 -Release: 2%{?dist} +Release: 3%{?dist} Summary: MySQL Connector for Python 3 License: GPLv2 with exceptions @@ -88,6 +88,9 @@ chmod -x examples/*py %changelog +* Fri Jun 04 2021 Python Maint - 8.0.21-3 +- Rebuilt for Python 3.10 + * Tue Jan 26 2021 Fedora Release Engineering - 8.0.21-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild From 9e872cc075b9741925d869ad5a95cb85b23156b9 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 22 Jul 2021 15:41:31 +0000 Subject: [PATCH 57/81] - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- mysql-connector-python.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/mysql-connector-python.spec b/mysql-connector-python.spec index 7dadc76..27b2a9f 100644 --- a/mysql-connector-python.spec +++ b/mysql-connector-python.spec @@ -13,7 +13,7 @@ Name: mysql-connector-python Version: 8.0.21 -Release: 3%{?dist} +Release: 4%{?dist} Summary: MySQL Connector for Python 3 License: GPLv2 with exceptions @@ -88,6 +88,9 @@ chmod -x examples/*py %changelog +* Thu Jul 22 2021 Fedora Release Engineering - 8.0.21-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + * Fri Jun 04 2021 Python Maint - 8.0.21-3 - Rebuilt for Python 3.10 From b043f255940157e3272785b46eedaa770ff65c57 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 20 Jan 2022 20:44:25 +0000 Subject: [PATCH 58/81] - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- mysql-connector-python.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/mysql-connector-python.spec b/mysql-connector-python.spec index 27b2a9f..fd96fd1 100644 --- a/mysql-connector-python.spec +++ b/mysql-connector-python.spec @@ -13,7 +13,7 @@ Name: mysql-connector-python Version: 8.0.21 -Release: 4%{?dist} +Release: 5%{?dist} Summary: MySQL Connector for Python 3 License: GPLv2 with exceptions @@ -88,6 +88,9 @@ chmod -x examples/*py %changelog +* Thu Jan 20 2022 Fedora Release Engineering - 8.0.21-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + * Thu Jul 22 2021 Fedora Release Engineering - 8.0.21-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild From 1bea3522377855c976bf0b025325e544aff18db9 Mon Sep 17 00:00:00 2001 From: Python Maint Date: Mon, 13 Jun 2022 14:51:32 +0200 Subject: [PATCH 59/81] Rebuilt for Python 3.11 --- mysql-connector-python.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/mysql-connector-python.spec b/mysql-connector-python.spec index fd96fd1..810ad16 100644 --- a/mysql-connector-python.spec +++ b/mysql-connector-python.spec @@ -13,7 +13,7 @@ Name: mysql-connector-python Version: 8.0.21 -Release: 5%{?dist} +Release: 6%{?dist} Summary: MySQL Connector for Python 3 License: GPLv2 with exceptions @@ -88,6 +88,9 @@ chmod -x examples/*py %changelog +* Mon Jun 13 2022 Python Maint - 8.0.21-6 +- Rebuilt for Python 3.11 + * Thu Jan 20 2022 Fedora Release Engineering - 8.0.21-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild From 85f96685eb4c8531b6f65fca5100e96d47372612 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 22 Jul 2022 00:04:22 +0000 Subject: [PATCH 60/81] Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- mysql-connector-python.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/mysql-connector-python.spec b/mysql-connector-python.spec index 810ad16..c75c24b 100644 --- a/mysql-connector-python.spec +++ b/mysql-connector-python.spec @@ -13,7 +13,7 @@ Name: mysql-connector-python Version: 8.0.21 -Release: 6%{?dist} +Release: 7%{?dist} Summary: MySQL Connector for Python 3 License: GPLv2 with exceptions @@ -88,6 +88,9 @@ chmod -x examples/*py %changelog +* Fri Jul 22 2022 Fedora Release Engineering - 8.0.21-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + * Mon Jun 13 2022 Python Maint - 8.0.21-6 - Rebuilt for Python 3.11 From e2403c21281d647b891c84c35da2895570deaa62 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 19 Jan 2023 21:04:34 +0000 Subject: [PATCH 61/81] Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- mysql-connector-python.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/mysql-connector-python.spec b/mysql-connector-python.spec index c75c24b..1175f17 100644 --- a/mysql-connector-python.spec +++ b/mysql-connector-python.spec @@ -13,7 +13,7 @@ Name: mysql-connector-python Version: 8.0.21 -Release: 7%{?dist} +Release: 8%{?dist} Summary: MySQL Connector for Python 3 License: GPLv2 with exceptions @@ -88,6 +88,9 @@ chmod -x examples/*py %changelog +* Thu Jan 19 2023 Fedora Release Engineering - 8.0.21-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + * Fri Jul 22 2022 Fedora Release Engineering - 8.0.21-7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild From b1bd32733b7c75f175c11f120aaf467087a7e2a1 Mon Sep 17 00:00:00 2001 From: Python Maint Date: Tue, 13 Jun 2023 20:22:57 +0200 Subject: [PATCH 62/81] Rebuilt for Python 3.12 --- mysql-connector-python.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/mysql-connector-python.spec b/mysql-connector-python.spec index 1175f17..c98be27 100644 --- a/mysql-connector-python.spec +++ b/mysql-connector-python.spec @@ -13,7 +13,7 @@ Name: mysql-connector-python Version: 8.0.21 -Release: 8%{?dist} +Release: 9%{?dist} Summary: MySQL Connector for Python 3 License: GPLv2 with exceptions @@ -88,6 +88,9 @@ chmod -x examples/*py %changelog +* Tue Jun 13 2023 Python Maint - 8.0.21-9 +- Rebuilt for Python 3.12 + * Thu Jan 19 2023 Fedora Release Engineering - 8.0.21-8 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild From 92835c8b9ff91bfe1009ef70e4dfc623c7b1befa Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 20 Jul 2023 16:09:30 +0000 Subject: [PATCH 63/81] Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- mysql-connector-python.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/mysql-connector-python.spec b/mysql-connector-python.spec index c98be27..3f59788 100644 --- a/mysql-connector-python.spec +++ b/mysql-connector-python.spec @@ -13,7 +13,7 @@ Name: mysql-connector-python Version: 8.0.21 -Release: 9%{?dist} +Release: 10%{?dist} Summary: MySQL Connector for Python 3 License: GPLv2 with exceptions @@ -88,6 +88,9 @@ chmod -x examples/*py %changelog +* Thu Jul 20 2023 Fedora Release Engineering - 8.0.21-10 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + * Tue Jun 13 2023 Python Maint - 8.0.21-9 - Rebuilt for Python 3.12 From 4a4146c7f76712b99885e7a35215ed50bfda0733 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sun, 21 Jan 2024 09:00:52 +0000 Subject: [PATCH 64/81] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- mysql-connector-python.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/mysql-connector-python.spec b/mysql-connector-python.spec index 3f59788..85211ac 100644 --- a/mysql-connector-python.spec +++ b/mysql-connector-python.spec @@ -13,7 +13,7 @@ Name: mysql-connector-python Version: 8.0.21 -Release: 10%{?dist} +Release: 11%{?dist} Summary: MySQL Connector for Python 3 License: GPLv2 with exceptions @@ -88,6 +88,9 @@ chmod -x examples/*py %changelog +* Sun Jan 21 2024 Fedora Release Engineering - 8.0.21-11 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Thu Jul 20 2023 Fedora Release Engineering - 8.0.21-10 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild From e84da12ea819470392b8273d33ef40132e428313 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 25 Jan 2024 08:28:54 +0000 Subject: [PATCH 65/81] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- mysql-connector-python.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/mysql-connector-python.spec b/mysql-connector-python.spec index 85211ac..e0c460d 100644 --- a/mysql-connector-python.spec +++ b/mysql-connector-python.spec @@ -13,7 +13,7 @@ Name: mysql-connector-python Version: 8.0.21 -Release: 11%{?dist} +Release: 12%{?dist} Summary: MySQL Connector for Python 3 License: GPLv2 with exceptions @@ -88,6 +88,9 @@ chmod -x examples/*py %changelog +* Thu Jan 25 2024 Fedora Release Engineering - 8.0.21-12 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Sun Jan 21 2024 Fedora Release Engineering - 8.0.21-11 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From 962187f8e5f1d08394c4c65841ae8ccf8c9bbe19 Mon Sep 17 00:00:00 2001 From: Python Maint Date: Fri, 7 Jun 2024 08:33:04 +0200 Subject: [PATCH 66/81] Rebuilt for Python 3.13 --- mysql-connector-python.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/mysql-connector-python.spec b/mysql-connector-python.spec index e0c460d..0e91b5c 100644 --- a/mysql-connector-python.spec +++ b/mysql-connector-python.spec @@ -13,7 +13,7 @@ Name: mysql-connector-python Version: 8.0.21 -Release: 12%{?dist} +Release: 13%{?dist} Summary: MySQL Connector for Python 3 License: GPLv2 with exceptions @@ -88,6 +88,9 @@ chmod -x examples/*py %changelog +* Fri Jun 07 2024 Python Maint - 8.0.21-13 +- Rebuilt for Python 3.13 + * Thu Jan 25 2024 Fedora Release Engineering - 8.0.21-12 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From af38e72c814217a261fa605238ac3ebc351aadf9 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 18 Jul 2024 19:00:48 +0000 Subject: [PATCH 67/81] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild --- mysql-connector-python.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/mysql-connector-python.spec b/mysql-connector-python.spec index 0e91b5c..2be0b89 100644 --- a/mysql-connector-python.spec +++ b/mysql-connector-python.spec @@ -13,7 +13,7 @@ Name: mysql-connector-python Version: 8.0.21 -Release: 13%{?dist} +Release: 14%{?dist} Summary: MySQL Connector for Python 3 License: GPLv2 with exceptions @@ -88,6 +88,9 @@ chmod -x examples/*py %changelog +* Thu Jul 18 2024 Fedora Release Engineering - 8.0.21-14 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + * Fri Jun 07 2024 Python Maint - 8.0.21-13 - Rebuilt for Python 3.13 From 5dd89a02bc402c247fd1ba768d81489a374002ce Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20Such=C3=BD?= Date: Mon, 2 Sep 2024 12:04:06 +0200 Subject: [PATCH 68/81] convert license to SPDX This is part of https://fedoraproject.org/wiki/Changes/SPDX_Licenses_Phase_4 --- mysql-connector-python.spec | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/mysql-connector-python.spec b/mysql-connector-python.spec index 2be0b89..a98a40d 100644 --- a/mysql-connector-python.spec +++ b/mysql-connector-python.spec @@ -13,10 +13,11 @@ Name: mysql-connector-python Version: 8.0.21 -Release: 14%{?dist} +Release: 15%{?dist} Summary: MySQL Connector for Python 3 -License: GPLv2 with exceptions +# Automatically converted from old format: GPLv2 with exceptions - review is highly recommended. +License: LicenseRef-Callaway-GPLv2-with-exceptions URL: http://dev.mysql.com/doc/connector-python/en/index.html # Upstream has a mirror redirector for downloads, so the URL is hard to # represent statically. You can get the tarball by following a link from @@ -88,6 +89,9 @@ chmod -x examples/*py %changelog +* Mon Sep 02 2024 Miroslav Suchý - 8.0.21-15 +- convert license to SPDX + * Thu Jul 18 2024 Fedora Release Engineering - 8.0.21-14 - Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild From 25aec7da904f9540c1a344d8f6275b6c37411d6b Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 17 Jan 2025 19:31:38 +0000 Subject: [PATCH 69/81] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild --- mysql-connector-python.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/mysql-connector-python.spec b/mysql-connector-python.spec index a98a40d..22dbcaf 100644 --- a/mysql-connector-python.spec +++ b/mysql-connector-python.spec @@ -13,7 +13,7 @@ Name: mysql-connector-python Version: 8.0.21 -Release: 15%{?dist} +Release: 16%{?dist} Summary: MySQL Connector for Python 3 # Automatically converted from old format: GPLv2 with exceptions - review is highly recommended. @@ -89,6 +89,9 @@ chmod -x examples/*py %changelog +* Fri Jan 17 2025 Fedora Release Engineering - 8.0.21-16 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + * Mon Sep 02 2024 Miroslav Suchý - 8.0.21-15 - convert license to SPDX From a9a16e975ddf49a7efba0f858388274edafef55a Mon Sep 17 00:00:00 2001 From: Python Maint Date: Mon, 2 Jun 2025 19:58:15 +0200 Subject: [PATCH 70/81] Rebuilt for Python 3.14 --- mysql-connector-python.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/mysql-connector-python.spec b/mysql-connector-python.spec index 22dbcaf..deab82e 100644 --- a/mysql-connector-python.spec +++ b/mysql-connector-python.spec @@ -13,7 +13,7 @@ Name: mysql-connector-python Version: 8.0.21 -Release: 16%{?dist} +Release: 17%{?dist} Summary: MySQL Connector for Python 3 # Automatically converted from old format: GPLv2 with exceptions - review is highly recommended. @@ -89,6 +89,9 @@ chmod -x examples/*py %changelog +* Mon Jun 02 2025 Python Maint - 8.0.21-17 +- Rebuilt for Python 3.14 + * Fri Jan 17 2025 Fedora Release Engineering - 8.0.21-16 - Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild From db4f4e5c47039972be3896dbea4a1e5142f7e309 Mon Sep 17 00:00:00 2001 From: Pavol Sloboda Date: Thu, 19 Jun 2025 11:49:01 +0200 Subject: [PATCH 71/81] Rebase to 8.0.33 This rebase reworked the documentation by adding a man page. It also moved most of the files of the package from %{python3_sitelib} to %{python3_sitearch} which expands to /usr/lib/python3.X/site-packages or /usr/lib64/python3.X/site-packages depending on the build architecture. This means that the package can no longer be noarch since most of the file locations are now architecture dependent. The source tarball also changed name from %{name}-%{version}.tar.gz to %{name}-%{version}-src.tar.gz We are only able to build the _mysql_connector C extension and not the _mysqlxpb C extension as it requires protobuf >= 4.25.3 and we only have 3.19.6 in Fedora. When protobuf gets rebased to a sufficient version we will be able to build this extension as well. More info: https://dev.mysql.com/doc/connector-python/en/connector-python-installation-source.html The skeleton of how the mysqlxpb extension will be built is present in the spec file for easier future enabling but disabled using the with_mysqlxpb condition. --- .gitignore | 1 + mysql-connector-python.spec | 69 ++++++++++++++++++++++++++++++++----- sources | 2 +- 3 files changed, 62 insertions(+), 10 deletions(-) diff --git a/.gitignore b/.gitignore index d3b0d23..361ac4e 100644 --- a/.gitignore +++ b/.gitignore @@ -17,3 +17,4 @@ clog /mysql-connector-python-8.0.19.tar.gz /mysql-connector-python-8.0.20.tar.gz /mysql-connector-python-8.0.21.tar.gz +/mysql-connector-python-8.0.33-src.tar.gz diff --git a/mysql-connector-python.spec b/mysql-connector-python.spec index deab82e..ef6d95a 100644 --- a/mysql-connector-python.spec +++ b/mysql-connector-python.spec @@ -11,9 +11,17 @@ # Tests rely on MySQL version 5.6 %global with_tests %{?_with_tests:1}%{!?_with_tests:0} +# The building of the mysqlxb C extension is +# disabled at the moment as it requires protobuf +# with version 4.25.3 or higher and we only have +# 3.19.6 in fedora at the moment, when protobuf is +# rebased to a sufficient version this condition +# should either be enabled or removed altogether +%global with_mysqlxpb 0 + Name: mysql-connector-python -Version: 8.0.21 -Release: 17%{?dist} +Version: 8.0.33 +Release: 1%{?dist} Summary: MySQL Connector for Python 3 # Automatically converted from old format: GPLv2 with exceptions - review is highly recommended. @@ -22,16 +30,26 @@ URL: http://dev.mysql.com/doc/connector-python/en/index.html # Upstream has a mirror redirector for downloads, so the URL is hard to # represent statically. You can get the tarball by following a link from # http://dev.mysql.com/downloads/connector/python/ -Source0: %{name}-%{version}.tar.gz +Source0: %{name}-%{version}-src.tar.gz -BuildArch: noarch BuildRequires: python3-devel >= 3 BuildRequires: python3-setuptools +BuildRequires: gcc-c++ +# for building the extension modules +BuildRequires: mysql-devel +# for building documentation +BuildRequires: python3-sphinx +# for import check (runtime dependency) +BuildRequires: python3-protobuf %if %{with_tests} # for unittest BuildRequires: mysql-server %endif +%if %{with_mysqlxpb} +BuildRequires: protobuf-devel >= 4.25.3 +BuildRequires: protobuf-compiler >= 4.25.3 +%endif %global _description\ MySQL Connector/Python is implementing the MySQL Client/Server protocol\ @@ -56,19 +74,41 @@ Documentation: http://dev.mysql.com/doc/connector-python/en/index.html %prep -%setup -q -n %{name}-%{version} +%setup -q -n %{name}-%{version}-src chmod -x examples/*py %build -# nothing to build +export MYSQL_CAPI=%{_prefix} # searches for bin/mysql_config in here, enables the extension module +export LDFLAGS="$LDFLAGS -L%{_libdir}/mysql" + +%if %{with_mysqlxpb} +export MYSQLXPB_PROTOBUF=%{_prefix} +export MYSQLXPB_PROTOBUF_INCLUDE_DIR=%{_includedir} +export MYSQLXPB_PROTOBUF_LIB_DIR=%{_libdir} +export MYSQLXPB_PROTOC="%{_bindir}/protoc" +%endif +%py3_build + +#building the man pages +cd docs/mysqlx +%{__python3} conf.py +make man BUILDDIR=%{_builddir} %install -%{__python3} setup.py install --root %{buildroot} +%py3_install +# create the man dir +mkdir -p %{buildroot}%{_mandir}/man1 +# install the man page into the man dir with +# a more fitting name +install -p -m 0644 %{_builddir}/man/mysqlxconnectorpythondevapireference.1 %{buildroot}%{_mandir}/man1/%{name}3.1 +# remove the source files the man page was generated from +rm -r docs/mysqlx %check +%py3_check_import mysql mysqlx %if %{with_tests} # known failed tests # bugs.BugOra14201459.test_error1426 @@ -85,10 +125,21 @@ chmod -x examples/*py %doc CHANGES.txt README* docs %doc examples %license LICENSE.txt -%{python3_sitelib}/* - +# can't just use %%{python3_sitearch}/* as the packaging +# guidelines dont' allow it +%{python3_sitearch}/mysql/ +%{python3_sitearch}/mysqlx/ +%{python3_sitearch}/_mysql_connector%{python3_ext_suffix} +%if %{with_mysqlxpb} +%{python3_sitearch}/_mysqlxpb%{python3_ext_suffix} +%endif +%{python3_sitearch}/mysql_connector_python-%{version}-py%{python3_version}.egg-info/ +%{_mandir}/man1/%{name}3.1.* %changelog +* Wed Jun 18 2025 Pavol Sloboda - 8.0.33-1 +- Rebase to 8.0.33 + * Mon Jun 02 2025 Python Maint - 8.0.21-17 - Rebuilt for Python 3.14 diff --git a/sources b/sources index 0e60d0e..450c654 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (mysql-connector-python-8.0.21.tar.gz) = d73efd99774450bbf729ddbb19b80d09b8db151715d12b76e40497bf1d9ff658e0ad1e22dc9a73dd5f6736f7c075f94808a2f28b1c975aaa380bbb92cf4e7184 +SHA512 (mysql-connector-python-8.0.33-src.tar.gz) = da78e23fca47e7be8a1a0355f037d5fc2a68e6414b7da9bbd0cb8c68e2027b041cd78aea65a922079666df2873adebfce56c30f5726c52e7176adf9a87b9ad1b From 1a92b0ad2cf47fdb95004924bdb6b303e2dca4a6 Mon Sep 17 00:00:00 2001 From: Pavol Sloboda Date: Wed, 25 Jun 2025 15:21:21 +0200 Subject: [PATCH 72/81] [SPDX] As the last rebase introduced a couple of changes in the LICENSE.txt file I have decided to look into the licensing of this package After some analysis I found the following licenses: (MIT OR GPL-2.0-only) AND GPL-2.0-only AND BSD-2-Clause Since: The main LICENSE.txt file has the GPL-2.0-only license inside it. the sphinx_rtd_theme project is licensed under MIT/GPL-2.0-only most of the project has explicit headers in the files stating to use the license of the `sphinx_rtd_theme project` namely: all the files inside docs/mysqlx/_themes/sphinx_rtd_theme/locale/ some of the files inside docs/mysqlx/_themes/sphinx_rtd_theme/static/js though some of the last mentioned ones also have GPL2 specified in them as an alternative to the MIT The search.html file is licensed under the BSD-2-Clause since it contains a link to this file: https://github.com/sphinx-doc/sphinx/blob/master/LICENSE which is an invalid link because the target file was renamed to LICENSE.rst therefore the link should be: https://github.com/sphinx-doc/sphinx/blob/master/LICENSE.rst and the target of said link contains the BSD-2-Clause license The main LICENSE.txt file also contains the: Universal FOSS Exception, Version 1.0 which can be found here: https://oss.oracle.com/licenses/universal-foss-exception/ as linked in the LICENSE.txt file I will not mention the exception in the License clause since there is an issue opened on gitlab which can be found here: https://gitlab.com/fedora/legal/fedora-license-data/-/issues/182 which states that the exception should be omitted for the time being. I will try to reach out to the people assigned to the issue as the last update to it was in 2023 and this exception is present in multiple mysql product we package. --- mysql-connector-python.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mysql-connector-python.spec b/mysql-connector-python.spec index ef6d95a..4f53fc0 100644 --- a/mysql-connector-python.spec +++ b/mysql-connector-python.spec @@ -25,7 +25,7 @@ Release: 1%{?dist} Summary: MySQL Connector for Python 3 # Automatically converted from old format: GPLv2 with exceptions - review is highly recommended. -License: LicenseRef-Callaway-GPLv2-with-exceptions +License: (MIT OR GPL-2.0-only) AND GPL-2.0-only AND BSD-2-Clause URL: http://dev.mysql.com/doc/connector-python/en/index.html # Upstream has a mirror redirector for downloads, so the URL is hard to # represent statically. You can get the tarball by following a link from From 74793183299b1b53afbb02d3e5bd71d9d2febaae Mon Sep 17 00:00:00 2001 From: Pavol Sloboda Date: Tue, 1 Jul 2025 09:12:40 +0200 Subject: [PATCH 73/81] Started modifying the source package as it contains problematic licenses for the fonts contained in it. After inspecting the fonts inside the docs/mysqlx/_themes/sphinx_rtd_theme/static/css/fonts/ using the fontforge tool I have discovered that the font families are licensed like this: * fontawesome: Copyright Dave Gandy 2016. All rights reserved. * latto: Copyright (c) 2011-2015 by tyPoland Lukasz Dziedzic (http://www.typoland.com/) with Reserved Font Name "Lato". Licensed under the SIL Open Font License, Version 1.1 (http://scripts.sil.org/OFL) * Roboto: Font data copyright Google 2013 This means the fontawesome and Roboto font families are licensed under a strict copyright which is not supported when packaging fonts in fedora and since we don't use the fonts during the build process nor do we package them in the package I have decided to remove them from the archive and rename the archive to %{name}-%{version}-src-without-fonts.tar.gz to avoid any possible confusion when packaging this package in the future. I have also added the generate-modified-sources.sh script that downloads the original sources from the mysql upstream, unpacks them, removes the aforementioned fonts and packs the sources under a new name. --- .gitignore | 1 + generate-modified-sources.sh | 49 ++++++++++++++++++++++++++++++++++++ mysql-connector-python.spec | 13 +++++++--- sources | 2 +- 4 files changed, 60 insertions(+), 5 deletions(-) create mode 100755 generate-modified-sources.sh diff --git a/.gitignore b/.gitignore index 361ac4e..afd1ae2 100644 --- a/.gitignore +++ b/.gitignore @@ -18,3 +18,4 @@ clog /mysql-connector-python-8.0.20.tar.gz /mysql-connector-python-8.0.21.tar.gz /mysql-connector-python-8.0.33-src.tar.gz +/mysql-connector-python-8.0.33-src-without-fonts.tar.gz diff --git a/generate-modified-sources.sh b/generate-modified-sources.sh new file mode 100755 index 0000000..bf9984e --- /dev/null +++ b/generate-modified-sources.sh @@ -0,0 +1,49 @@ +#!/bin/bash + +################################# +# downloads the sources of +# mysql-connector-python +# extracts them, removes the +# fonts since they have problematic +# copyright and packs the result +# under a new name +################################# + +set -ex + +NAME="mysql-connector-python" +# gets the version of the package from the spec file +VERSION=$( rpmspec -q --srpm --qf '%{VERSION}' "${NAME}.spec" ) + +# the source url of the mysql upstream tarball of the package +SOURCE_URL="http://dev.mysql.com/get/Downloads/Connector-python/8.0/${NAME}-${VERSION}-src.tar.gz" + +# original archive name +OLD_ARCHIVE_NAME="${NAME}-${VERSION}-src" +# new tarball name, chnaged to able to differentiate between +# the original and the changed tarball +NEW_ARCHIVE_NAME="${OLD_ARCHIVE_NAME}-without-fonts" + +# removes the old tarball, new tarball and the unpacked tarball +# if they are present in the current directory +rm -rf "./${OLD_ARCHIVE_NAME}.tar.gz" "./${OLD_ARCHIVE_NAME}/" "./${NEW_ARCHIVE_NAME}.tar.gz" + +# downloads the source tarball from the url +# specified above +wget "${SOURCE_URL}" + +#unpacks the original tarball +tar -xzf "${OLD_ARCHIVE_NAME}.tar.gz" + +# removes the problematic font files +rm "./${OLD_ARCHIVE_NAME}/docs/mysqlx/_themes/sphinx_rtd_theme/static/css/fonts/"* + +# compresses the modified sources under a new name +tar -czf "${NEW_ARCHIVE_NAME}.tar.gz" "${OLD_ARCHIVE_NAME}" + +# removes the unpacked sources +rm -r "${OLD_ARCHIVE_NAME}" + +# removes the original tarball so it isn't used +# by mistake +rm -f "${OLD_ARCHIVE_NAME}.tar.gz" diff --git a/mysql-connector-python.spec b/mysql-connector-python.spec index 4f53fc0..bd0a2dd 100644 --- a/mysql-connector-python.spec +++ b/mysql-connector-python.spec @@ -27,10 +27,15 @@ Summary: MySQL Connector for Python 3 # Automatically converted from old format: GPLv2 with exceptions - review is highly recommended. License: (MIT OR GPL-2.0-only) AND GPL-2.0-only AND BSD-2-Clause URL: http://dev.mysql.com/doc/connector-python/en/index.html -# Upstream has a mirror redirector for downloads, so the URL is hard to -# represent statically. You can get the tarball by following a link from -# http://dev.mysql.com/downloads/connector/python/ -Source0: %{name}-%{version}-src.tar.gz +# You can get the original tarball from: +# http://dev.mysql.com/get/Downloads/Connector-python/8.0/%%{name}-%%{version}-src.tar.gz" + +# The tarball has to be modified as the fonts are licensed under a copyright +# and therefore would clash with the allowed licenses for fonts in fedora if +# they were shipped in the src rpm +# to modify the tarball to the desired form use the +# generate-modified-sources.sh script available in this repo +Source0: %{name}-%{version}-src-without-fonts.tar.gz BuildRequires: python3-devel >= 3 BuildRequires: python3-setuptools diff --git a/sources b/sources index 450c654..679ad39 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (mysql-connector-python-8.0.33-src.tar.gz) = da78e23fca47e7be8a1a0355f037d5fc2a68e6414b7da9bbd0cb8c68e2027b041cd78aea65a922079666df2873adebfce56c30f5726c52e7176adf9a87b9ad1b +SHA512 (mysql-connector-python-8.0.33-src-without-fonts.tar.gz) = 81e0d84ab71ed83e6f2f201b1d285507fb2b0d2dae57df97246ac037bc37974477139c500bfce2e348285ef6d7943fdba1bd0fe53c61b451492e9d1b43d0e65a From 2db02910a590a5876c6854823dd7c254b641df37 Mon Sep 17 00:00:00 2001 From: Pavol Sloboda Date: Thu, 10 Jul 2025 10:27:44 +0200 Subject: [PATCH 74/81] Changed from the old python setup.py macros to the pyproject macros As mentioned here: https://fedoraproject.org/wiki/Changes/DeprecateSetuppyMacros Fedora is migrating from the old setup.py macros to the pyproject macros as the setup.py macros are planed to be deprecated in the near future. Resolves: RHBZ#2377338 --- mysql-connector-python.spec | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/mysql-connector-python.spec b/mysql-connector-python.spec index bd0a2dd..38d7a22 100644 --- a/mysql-connector-python.spec +++ b/mysql-connector-python.spec @@ -38,7 +38,6 @@ URL: http://dev.mysql.com/doc/connector-python/en/index.html Source0: %{name}-%{version}-src-without-fonts.tar.gz BuildRequires: python3-devel >= 3 -BuildRequires: python3-setuptools BuildRequires: gcc-c++ # for building the extension modules BuildRequires: mysql-devel @@ -56,6 +55,9 @@ BuildRequires: protobuf-devel >= 4.25.3 BuildRequires: protobuf-compiler >= 4.25.3 %endif +%generate_buildrequires +%pyproject_buildrequires + %global _description\ MySQL Connector/Python is implementing the MySQL Client/Server protocol\ completely in Python. No MySQL libraries are needed, and no compilation\ @@ -92,7 +94,7 @@ export MYSQLXPB_PROTOBUF_INCLUDE_DIR=%{_includedir} export MYSQLXPB_PROTOBUF_LIB_DIR=%{_libdir} export MYSQLXPB_PROTOC="%{_bindir}/protoc" %endif -%py3_build +%pyproject_wheel #building the man pages cd docs/mysqlx @@ -101,7 +103,7 @@ make man BUILDDIR=%{_builddir} %install -%py3_install +%pyproject_install # create the man dir mkdir -p %{buildroot}%{_mandir}/man1 # install the man page into the man dir with @@ -138,7 +140,7 @@ rm -r docs/mysqlx %if %{with_mysqlxpb} %{python3_sitearch}/_mysqlxpb%{python3_ext_suffix} %endif -%{python3_sitearch}/mysql_connector_python-%{version}-py%{python3_version}.egg-info/ +%{python3_sitearch}/mysql_connector_python-%{version}.dist-info/ %{_mandir}/man1/%{name}3.1.* %changelog From c48e8724fea365efe2edd400dfd04b92da785c7d Mon Sep 17 00:00:00 2001 From: Michal Schorm Date: Tue, 15 Jul 2025 14:05:27 +0200 Subject: [PATCH 75/81] Bump release for package rebuild --- mysql-connector-python.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/mysql-connector-python.spec b/mysql-connector-python.spec index 38d7a22..b1c4eb7 100644 --- a/mysql-connector-python.spec +++ b/mysql-connector-python.spec @@ -21,7 +21,7 @@ Name: mysql-connector-python Version: 8.0.33 -Release: 1%{?dist} +Release: 2%{?dist} Summary: MySQL Connector for Python 3 # Automatically converted from old format: GPLv2 with exceptions - review is highly recommended. @@ -144,6 +144,9 @@ rm -r docs/mysqlx %{_mandir}/man1/%{name}3.1.* %changelog +* Tue Jul 15 2025 Michal Schorm - 8.0.33-2 +- Bump release for package rebuild + * Wed Jun 18 2025 Pavol Sloboda - 8.0.33-1 - Rebase to 8.0.33 From a643b468a5eb3c47c5e2ade0d1b983f3b15d1729 Mon Sep 17 00:00:00 2001 From: Pavol Sloboda Date: Mon, 21 Jul 2025 13:54:05 +0200 Subject: [PATCH 76/81] Added a patch that removes the addition of RPATH to _mysql_connector.cpython-3XY-%{arch}-linux-gnu.so as it was flagged by rpminspect as an invalid looking rpath. --- mysql-connector-python-rpath.patch | 13 +++++++++++++ mysql-connector-python.spec | 3 +++ 2 files changed, 16 insertions(+) create mode 100644 mysql-connector-python-rpath.patch diff --git a/mysql-connector-python-rpath.patch b/mysql-connector-python-rpath.patch new file mode 100644 index 0000000..7f9e0d0 --- /dev/null +++ b/mysql-connector-python-rpath.patch @@ -0,0 +1,13 @@ +diff -Naur mysql-connector-python-8.0.33-src/cpydist/__init__.py mysql-connector-python_patched/cpydist/__init__.py +--- mysql-connector-python-8.0.33-src/cpydist/__init__.py 2023-03-30 12:58:04.000000000 +0200 ++++ mysql-connector-python_patched/cpydist/__init__.py 2025-07-21 09:21:19.084953101 +0200 +@@ -722,9 +722,6 @@ + # Add extra link args + if self.extra_link_args: + ext.extra_link_args.extend(self.extra_link_args.split()) +- # Add -rpath if the platform is Linux +- if platform.system() == "Linux" and not self.skip_vendor: +- ext.extra_link_args.extend(["-Wl,-rpath,$ORIGIN/mysql/vendor"]) + # Add include dirs + if self.with_openssl_include_dir: + ext.include_dirs.append(self.with_openssl_include_dir) diff --git a/mysql-connector-python.spec b/mysql-connector-python.spec index b1c4eb7..e4bd660 100644 --- a/mysql-connector-python.spec +++ b/mysql-connector-python.spec @@ -37,6 +37,8 @@ URL: http://dev.mysql.com/doc/connector-python/en/index.html # generate-modified-sources.sh script available in this repo Source0: %{name}-%{version}-src-without-fonts.tar.gz +Patch0: %{name}-rpath.patch + BuildRequires: python3-devel >= 3 BuildRequires: gcc-c++ # for building the extension modules @@ -83,6 +85,7 @@ Documentation: http://dev.mysql.com/doc/connector-python/en/index.html %prep %setup -q -n %{name}-%{version}-src chmod -x examples/*py +%patch -P0 -p1 %build export MYSQL_CAPI=%{_prefix} # searches for bin/mysql_config in here, enables the extension module From ddbcd03dca68ba34a7b317279b1c776fa34f1534 Mon Sep 17 00:00:00 2001 From: Michal Schorm Date: Mon, 21 Jul 2025 14:58:18 +0200 Subject: [PATCH 77/81] Bump release for package rebuild --- mysql-connector-python.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/mysql-connector-python.spec b/mysql-connector-python.spec index e4bd660..c85fb7e 100644 --- a/mysql-connector-python.spec +++ b/mysql-connector-python.spec @@ -21,7 +21,7 @@ Name: mysql-connector-python Version: 8.0.33 -Release: 2%{?dist} +Release: 3%{?dist} Summary: MySQL Connector for Python 3 # Automatically converted from old format: GPLv2 with exceptions - review is highly recommended. @@ -147,6 +147,9 @@ rm -r docs/mysqlx %{_mandir}/man1/%{name}3.1.* %changelog +* Mon Jul 21 2025 Michal Schorm - 8.0.33-3 +- Bump release for package rebuild + * Tue Jul 15 2025 Michal Schorm - 8.0.33-2 - Bump release for package rebuild From 12a2629160dad8f40d3ff947e3c11aa57dd909b9 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 24 Jul 2025 22:33:07 +0000 Subject: [PATCH 78/81] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild --- mysql-connector-python.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/mysql-connector-python.spec b/mysql-connector-python.spec index c85fb7e..cd005f7 100644 --- a/mysql-connector-python.spec +++ b/mysql-connector-python.spec @@ -21,7 +21,7 @@ Name: mysql-connector-python Version: 8.0.33 -Release: 3%{?dist} +Release: 4%{?dist} Summary: MySQL Connector for Python 3 # Automatically converted from old format: GPLv2 with exceptions - review is highly recommended. @@ -147,6 +147,9 @@ rm -r docs/mysqlx %{_mandir}/man1/%{name}3.1.* %changelog +* Thu Jul 24 2025 Fedora Release Engineering - 8.0.33-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild + * Mon Jul 21 2025 Michal Schorm - 8.0.33-3 - Bump release for package rebuild From fc4b2fbfd138116c918f8ac74d6570dd27a41eb8 Mon Sep 17 00:00:00 2001 From: Michal Schorm Date: Tue, 29 Jul 2025 12:51:18 +0200 Subject: [PATCH 79/81] Disable i686 on Fedora >= 43 MySQL 8.4 is not supported on 32-bit architectures This commit is part of: https://fedoraproject.org/wiki/Changes/switch_distribution_default_MySQL_from_8.0_to_8.4 --- mysql-connector-python.spec | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/mysql-connector-python.spec b/mysql-connector-python.spec index cd005f7..43aa356 100644 --- a/mysql-connector-python.spec +++ b/mysql-connector-python.spec @@ -7,6 +7,10 @@ # Please, preserve the changelog entries # +%if 0%{?fedora} >= 43 +ExcludeArch: %{ix86} +%endif + # Tests only run on manual build --with tests # Tests rely on MySQL version 5.6 %global with_tests %{?_with_tests:1}%{!?_with_tests:0} @@ -21,7 +25,7 @@ Name: mysql-connector-python Version: 8.0.33 -Release: 4%{?dist} +Release: 5%{?dist} Summary: MySQL Connector for Python 3 # Automatically converted from old format: GPLv2 with exceptions - review is highly recommended. @@ -147,6 +151,9 @@ rm -r docs/mysqlx %{_mandir}/man1/%{name}3.1.* %changelog +* Tue Jul 29 2025 Michal Schorm - 8.0.33-5 +- Rebuild without i686 architecture - MySQL 8.4 no longer supports it + * Thu Jul 24 2025 Fedora Release Engineering - 8.0.33-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild From 3806812cec31f63f527c0b48d8ce3b30e476ffc4 Mon Sep 17 00:00:00 2001 From: Python Maint Date: Fri, 15 Aug 2025 13:01:14 +0200 Subject: [PATCH 80/81] Rebuilt for Python 3.14.0rc2 bytecode --- mysql-connector-python.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/mysql-connector-python.spec b/mysql-connector-python.spec index 43aa356..d40cf9e 100644 --- a/mysql-connector-python.spec +++ b/mysql-connector-python.spec @@ -25,7 +25,7 @@ ExcludeArch: %{ix86} Name: mysql-connector-python Version: 8.0.33 -Release: 5%{?dist} +Release: 6%{?dist} Summary: MySQL Connector for Python 3 # Automatically converted from old format: GPLv2 with exceptions - review is highly recommended. @@ -151,6 +151,9 @@ rm -r docs/mysqlx %{_mandir}/man1/%{name}3.1.* %changelog +* Fri Aug 15 2025 Python Maint - 8.0.33-6 +- Rebuilt for Python 3.14.0rc2 bytecode + * Tue Jul 29 2025 Michal Schorm - 8.0.33-5 - Rebuild without i686 architecture - MySQL 8.4 no longer supports it From b076e4e1950683e4ba067036e4bdd6b553cbf474 Mon Sep 17 00:00:00 2001 From: Python Maint Date: Fri, 19 Sep 2025 12:32:03 +0200 Subject: [PATCH 81/81] Rebuilt for Python 3.14.0rc3 bytecode --- mysql-connector-python.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/mysql-connector-python.spec b/mysql-connector-python.spec index d40cf9e..9edcd5f 100644 --- a/mysql-connector-python.spec +++ b/mysql-connector-python.spec @@ -25,7 +25,7 @@ ExcludeArch: %{ix86} Name: mysql-connector-python Version: 8.0.33 -Release: 6%{?dist} +Release: 7%{?dist} Summary: MySQL Connector for Python 3 # Automatically converted from old format: GPLv2 with exceptions - review is highly recommended. @@ -151,6 +151,9 @@ rm -r docs/mysqlx %{_mandir}/man1/%{name}3.1.* %changelog +* Fri Sep 19 2025 Python Maint - 8.0.33-7 +- Rebuilt for Python 3.14.0rc3 bytecode + * Fri Aug 15 2025 Python Maint - 8.0.33-6 - Rebuilt for Python 3.14.0rc2 bytecode