diff options
| author | Balasubramanian Kandasamy <balasubramanian.kandasamy@oracle.com> | 2014-03-14 19:46:27 +0100 |
|---|---|---|
| committer | Balasubramanian Kandasamy <balasubramanian.kandasamy@oracle.com> | 2014-03-14 19:46:27 +0100 |
| commit | c7d3fd135c6ed27ba6d7c9e03fb5bc353dda779a (patch) | |
| tree | 89a00a2ec9c002136ca51adf60fbf3b0051973cb /packaging | |
| parent | 39710f883c582165d568529e9b96384772b3f0fd (diff) | |
| download | mariadb-git-c7d3fd135c6ed27ba6d7c9e03fb5bc353dda779a.tar.gz | |
Bug#18402229 - Resolve mysql conflict with mysql-community-client
Diffstat (limited to 'packaging')
| -rw-r--r-- | packaging/rpm-oel/mysql.spec.in | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/packaging/rpm-oel/mysql.spec.in b/packaging/rpm-oel/mysql.spec.in index 923027e92c8..d9e29317ff5 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: 3%{?dist} +Release: 4%{?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/ @@ -223,6 +223,7 @@ Obsoletes: mysql-community-common < %{version}-%{release} %endif Provides: mysql-common = %{version}-%{release} Provides: mysql-common%{?_isa} = %{version}-%{release} +%{?el5:Requires: mysql%{?_isa} = %{version}-%{release}} %description common This packages contains common files needed by MySQL client library, @@ -818,6 +819,9 @@ fi %endif %changelog +* Fri Mar 14 2014 Balasubramanian Kandasamy <balasubramanian.kandasamy@oracle.com> - 5.5.37-4 +- Resolve mysql conflict with mysql-community-client + * Wed Mar 12 2014 Balasubramanian Kandasamy <balasubramanian.kandasamy@oracle.com> - 5.5.37-3 - Resolve conflict with mysql-libs-compat |