Merge from mysql-5.5.37-release

1 files changed, 52 insertions, 4 deletions

diff --git a/packaging/rpm-oel/mysql.spec.in b/packaging/rpm-oel/mysql.spec.in
index 47e0b35bb15..d9e29317ff5 100644
--- a/packaging/rpm-oel/mysql.spec.in
+++ b/packaging/rpm-oel/mysql.spec.in
@@ -81,12 +81,11 @@
 %global license_type          GPLv2
 %endif
 
-
 Name:           mysql-%{product_suffix}
 Summary:        A very fast and reliable SQL database server
 Group:          Applications/Databases
 Version:        @VERSION@
-Release:        1%{?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/
@@ -205,10 +204,12 @@ Requires:       mysql-enterprise-libs%{?_isa} = %{version}-%{release}
 %else
 Requires:       mysql-community-libs%{?_isa} = %{version}-%{release}
 %endif
-Obsoletes:      mysql < %{version}-%{release}
 Obsoletes:      mariadb
+%if 0%{?rhel} > 5
+Obsoletes:      mysql < %{version}-%{release}
 Provides:       mysql = %{version}-%{release}
 Provides:       mysql%{?_isa} = %{version}-%{release}
+%endif
 
 %description    client
 This package contains the standard MySQL clients and administration
@@ -222,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,
@@ -291,6 +293,15 @@ 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}
+%else
+Requires:       mysql-community-libs%{?_isa} = %{version}-%{release}
+%endif
+%if 0%{?rhel} > 5
+Obsoletes:      mysql-libs < %{version}-%{release}
+%endif
 
 %description    libs-compat
 This package contains the shared compat libraries for MySQL %{compatver} client
@@ -338,9 +349,31 @@ Provides:       mysql-embedded-devel = %{version}-%{release}
 Provides:       mysql-embedded-devel%{?_isa} = %{version}-%{release}
 
 %description    embedded-devel
-This package contains files needed for developing applicatison using
+This package contains files needed for developing applications using
 the embedded version of the MySQL server.
 
+%if 0%{?rhel} == 5
+%package -n     mysql
+Summary:        Convenience package for easy upgrades of MySQL package set
+Group:          Applications/Databases
+%if 0%{?commercial}
+Requires:       mysql-enterprise-client%{?_isa} = %{version}-%{release}
+Requires:       mysql-enterprise-libs%{?_isa} = %{version}-%{release}
+Requires:       mysql-enterprise-libs-compat%{?_isa} = %{version}-%{release}
+%else
+Requires:       mysql-community-client%{?_isa} = %{version}-%{release}
+Requires:       mysql-community-libs%{?_isa} = %{version}-%{release}
+Requires:       mysql-community-libs-compat%{?_isa} = %{version}-%{release}
+%endif
+
+%description -n mysql
+This package has as sole purpose to require other MySQL packages such
+that upgrades will be more convenient.
+
+Technical background: this is done to reflect the fact that mysql
+package has been split into several subpackages.
+%endif
+
 %prep
 %if 0%{?compatlib}
 %setup -q -T -a 0 -a 7 -c -n %{src_dir}
@@ -779,7 +812,22 @@ fi
 %attr(644, root, root) %{_libdir}/mysql/libmysqld-debug.a
 %attr(755, root, root) %{_libdir}/mysql/libmysqld.so
 
+%if 0%{?rhel} == 5
+%files -n mysql
+%defattr(-, root, root, -)
+%doc %{?license_files_server}
+%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
+
+* Thu Mar 06 2014 Balasubramanian Kandasamy <balasubramanian.kandasamy@oracle.com> - 5.5.37-2
+- Resolve conflict issues during upgrade
+
 * Mon Feb 10 2014 Balasubramanian Kandasamy <balasubramanian.kandasamy@oracle.com> - 5.5.37-1
 - Add support for el7 (with systemd enabled)
 - Enable shared libmysqld by cmake option