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