diff options
| author | Balasubramanian Kandasamy <balasubramanian.kandasamy@oracle.com> | 2015-09-30 10:27:26 +0530 |
|---|---|---|
| committer | Balasubramanian Kandasamy <balasubramanian.kandasamy@oracle.com> | 2015-09-30 10:27:26 +0530 |
| commit | 8ea58c474fbbcd79e9716379d226b8a46062b350 (patch) | |
| tree | f69028883623d6224fa7a9f157aad483f0bf5fb5 /packaging | |
| parent | ea9dbef661efdf5079b1b0e33679a863408e3166 (diff) | |
| download | mariadb-git-8ea58c474fbbcd79e9716379d226b8a46062b350.tar.gz | |
BUG 21900800 - ADD OBSOLETE ON MYSQL-CONNECTOR-C-SHARED AND MYSQL-CONNECTOR-C-DEVEL
As MySQL Connector C 6.1 is end of life, added conflict with mysql-connector-c-shared dependencies
Diffstat (limited to 'packaging')
| -rw-r--r-- | packaging/rpm-oel/mysql.spec.in | 5 | ||||
| -rw-r--r-- | packaging/rpm-sles/mysql.spec.in | 5 |
2 files changed, 10 insertions, 0 deletions
diff --git a/packaging/rpm-oel/mysql.spec.in b/packaging/rpm-oel/mysql.spec.in index bb232fb404d..2d91975f56c 100644 --- a/packaging/rpm-oel/mysql.spec.in +++ b/packaging/rpm-oel/mysql.spec.in @@ -301,6 +301,7 @@ Obsoletes: mysql-devel < %{version}-%{release} Obsoletes: mariadb-devel Provides: mysql-devel = %{version}-%{release} Provides: mysql-devel%{?_isa} = %{version}-%{release} +Conflicts: mysql-connector-c-shared-devel < 6.2 %description devel This package contains the development header files and libraries necessary @@ -323,6 +324,7 @@ Obsoletes: mysql-libs < %{version}-%{release} Obsoletes: mariadb-libs Provides: mysql-libs = %{version}-%{release} Provides: mysql-libs%{?_isa} = %{version}-%{release} +Conflicts: mysql-connector-c-shared < 6.2 %description libs This package contains the shared libraries for MySQL client @@ -913,6 +915,9 @@ fi %endif %changelog +* Tue Sep 29 2015 Balasubramanian Kandasamy <balasubramanian.kandasamy@oracle.com> - 5.5.47-1 +- Added conflicts to mysql-connector-c-shared dependencies + * Tue Jul 22 2014 Balasubramanian Kandasamy <balasubramanian.kandasamy@oracle.com> - 5.5.39-5 - Provide mysql-compat-server dependencies diff --git a/packaging/rpm-sles/mysql.spec.in b/packaging/rpm-sles/mysql.spec.in index 23c076332b0..b5fb5b77642 100644 --- a/packaging/rpm-sles/mysql.spec.in +++ b/packaging/rpm-sles/mysql.spec.in @@ -268,6 +268,7 @@ Obsoletes: mariadb-devel Obsoletes: libmysqlclient-devel Provides: mysql-devel = %{version}-%{release} Provides: libmysqlclient-devel = %{version}-%{release} +Conflicts: mysql-connector-c-shared-devel < 6.2 %description devel This package contains the development header files and libraries necessary @@ -293,6 +294,7 @@ Obsoletes: libmysqlclient_r18 < %{version}-%{release} Provides: mysql-libs = %{version}-%{release} Provides: libmysqlclient18 = %{version}-%{release} Provides: libmysqlclient_r18 = %{version}-%{release} +Conflicts: mysql-connector-c-shared < 6.2 %description libs This package contains the shared libraries for MySQL client @@ -779,6 +781,9 @@ fi %attr(755, root, root) %{_libdir}/mysql/libmysqld.so %changelog +* Tue Sep 29 2015 Balasubramanian Kandasamy <balasubramanian.kandasamy@oracle.com> - 5.5.47-1 +- Added conflicts to mysql-connector-c-shared dependencies + * Mon Oct 06 2014 Balasubramanian Kandasamy <balasubramanian.kandasamy@oracle.com> - 5.5.41-1 - Backport to 5.5.41 |