From b9b47a295a07d5314b8780481775912f467f3b70e0d951369cb632b0ccae9cdf Mon Sep 17 00:00:00 2001 From: Alexei Podvalsky Date: Sat, 30 Jun 2018 11:54:46 +0000 Subject: [PATCH] Accepting request 619916 from home:awissu:branches:devel:languages:python - Add obsoletes/provides with "python-" prefix (oldpython macro) - Fix build on openSUSE 42.3 (rename: libmariadb-devel to libmysqlclient-devel) OBS-URL: https://build.opensuse.org/request/show/619916 OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-mysqlclient?expand=0&rev=2 --- python-mysqlclient.changes | 7 +++++++ python-mysqlclient.spec | 10 +++++++++- 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/python-mysqlclient.changes b/python-mysqlclient.changes index 04c4178..4d11723 100644 --- a/python-mysqlclient.changes +++ b/python-mysqlclient.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Sat Jun 30 11:35:55 UTC 2018 - avvissu@yandex.by + +- Add obsoletes/provides with "python-" prefix (oldpython macro) +- Fix build on openSUSE 42.3 (rename: libmariadb-devel to + libmysqlclient-devel) + ------------------------------------------------------------------- Wed Jun 27 22:44:56 UTC 2018 - avvissu@yandex.by diff --git a/python-mysqlclient.spec b/python-mysqlclient.spec index f41585c..6f12775 100644 --- a/python-mysqlclient.spec +++ b/python-mysqlclient.spec @@ -17,6 +17,7 @@ %{?!python_module:%define python_module() python-%{**} python3-%{**}} +%define oldpython python Name: python-mysqlclient Version: 1.3.13 Release: 0 @@ -30,7 +31,7 @@ BuildRequires: %{python_module Sphinx} BuildRequires: %{python_module devel} BuildRequires: %{python_module setuptools} BuildRequires: fdupes -BuildRequires: libmariadb-devel +BuildRequires: libmysqlclient-devel BuildRequires: python-rpm-macros BuildRequires: unzip Recommends: mariadb @@ -38,6 +39,13 @@ Provides: python-mysql = %{version} Obsoletes: python-mysql < %{version} Provides: python-MySQL-python = %{version} Obsoletes: python-MySQL-python < %{version} +%ifpython2 +Provides: %{oldpython}-mysql = %{version} +Obsoletes: %{oldpython}-mysql < %{version} +Provides: %{oldpython}-MySQL-python = %{version} +Obsoletes: %{oldpython}-MySQL-python < %{version} +%endif + %python_subpackages %description