summaryrefslogtreecommitdiff
path: root/packaging
diff options
context:
space:
mode:
authorBalasubramanian Kandasamy <balasubramanian.kandasamy@oracle.com>2014-08-06 09:56:37 +0200
committerBalasubramanian Kandasamy <balasubramanian.kandasamy@oracle.com>2014-08-06 09:56:37 +0200
commitb9bc2bd434a402c15fc0e833a3da6e558524eb8e (patch)
tree4ccf300c617145e4e920f092630ccfdb053ce401 /packaging
parentd345978d27a512a6adf5307cf60f7b0353fcad35 (diff)
parent1a1e9040044c63580ffc9ac5a9cae7c495d92df4 (diff)
downloadmariadb-git-b9bc2bd434a402c15fc0e833a3da6e558524eb8e.tar.gz
- Merge from mysql-5.5.39-ol7-release branch
- Reverted version variable
Diffstat (limited to 'packaging')
-rw-r--r--packaging/rpm-oel/mysql.spec.in7
1 files changed, 6 insertions, 1 deletions
diff --git a/packaging/rpm-oel/mysql.spec.in b/packaging/rpm-oel/mysql.spec.in
index ba57515678c..e6fc6cd634d 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: 4%{?commercial:.1}%{?dist}
+Release: 2%{?commercial:.1}%{?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/
@@ -169,6 +169,8 @@ Obsoletes: mariadb-server
Obsoletes: mariadb-galera-server
Provides: mysql-server = %{version}-%{release}
Provides: mysql-server%{?_isa} = %{version}-%{release}
+Provides: mysql-compat-server = %{version}-%{release}
+Provides: mysql-compat-server%{?_isa} = %{version}-%{release}
%if 0%{?systemd}
Requires(post): systemd
Requires(preun): systemd
@@ -911,6 +913,9 @@ fi
%endif
%changelog
+* Tue Jul 22 2014 Balasubramanian Kandasamy <balasubramanian.kandasamy@oracle.com> - 5.5.39-5
+- Provide mysql-compat-server dependencies
+
* Tue Jul 08 2014 Balasubramanian Kandasamy <balasubramanian.kandasamy@oracle.com> - 5.5.39-4
- Remove perl(GD) and dtrace dependencies