diff options
| author | Balasubramanian Kandasamy <balasubramanian.kandasamy@oracle.com> | 2014-03-12 14:30:20 +0100 |
|---|---|---|
| committer | Balasubramanian Kandasamy <balasubramanian.kandasamy@oracle.com> | 2014-03-12 14:30:20 +0100 |
| commit | 47c3f23c067d4f2558b199cca6eb882f4196e911 (patch) | |
| tree | 4542a78791bcffe19d51e651096480e327c8c474 /packaging | |
| parent | 22bec1c2db3148770c16b369d453c1933aec7894 (diff) | |
| download | mariadb-git-47c3f23c067d4f2558b199cca6eb882f4196e911.tar.gz | |
Bug#18389088 - Resolve conflict with mysql-libs-compat
Diffstat (limited to 'packaging')
| -rw-r--r-- | packaging/rpm-oel/mysql.spec.in | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/packaging/rpm-oel/mysql.spec.in b/packaging/rpm-oel/mysql.spec.in index 232f70fe809..923027e92c8 100644 --- a/packaging/rpm-oel/mysql.spec.in +++ b/packaging/rpm-oel/mysql.spec.in @@ -85,7 +85,7 @@ Name: mysql-%{product_suffix} Summary: A very fast and reliable SQL database server Group: Applications/Databases Version: @VERSION@ -Release: 2%{?dist} +Release: 3%{?dist} License: Copyright (c) 2000, @MYSQL_COPYRIGHT_YEAR@, %{mysql_vendor}. All rights reserved. Under %{?license_type} license as shown in the Description field. Source0: https://cdn.mysql.com/Downloads/MySQL-@MYSQL_BASE_VERSION@/%{src_dir}.tar.gz URL: http://www.mysql.com/ @@ -289,6 +289,9 @@ applications. %package libs-compat Summary: Shared compat libraries for MySQL %{compatver} database client applications Group: Applications/Databases +Obsoletes: mysql-libs-compat < %{version}-%{release} +Provides: mysql-libs-compat = %{version}-%{release} +Provides: mysql-libs-compat%{?_isa} = %{version}-%{release} %if 0%{?commercial} Obsoletes: mysql-community-libs-compat < %{version}-%{release} Requires: mysql-enterprise-libs%{?_isa} = %{version}-%{release} @@ -815,6 +818,9 @@ fi %endif %changelog +* Wed Mar 12 2014 Balasubramanian Kandasamy <balasubramanian.kandasamy@oracle.com> - 5.5.37-3 +- Resolve conflict with mysql-libs-compat + * Thu Mar 06 2014 Balasubramanian Kandasamy <balasubramanian.kandasamy@oracle.com> - 5.5.37-2 - Resolve conflict issues during upgrade |