Merge branch 'mysql-5.5' into mysql-5.6

Author: bkandasa

packaging/rpm-oel/mysql.spec.in

@@ -302,6 +302,7 @@ Requires:       mysql-community-libs%{?_isa} = %{version}-%{release}
 Obsoletes:      MySQL-devel < %{version}-%{release}
 Obsoletes:      mysql-devel < %{version}-%{release}
 Obsoletes:      mariadb-devel
+Conflicts:      mysql-connector-c-shared-devel < 6.2
 Provides:       mysql-devel = %{version}-%{release}
 Provides:       mysql-devel%{?_isa} = %{version}-%{release}
 
@@ -324,6 +325,7 @@ Requires:       mysql-community-common%{?_isa} = %{version}-%{release}
 Obsoletes:      MySQL-shared < %{version}-%{release}
 Obsoletes:      mysql-libs < %{version}-%{release}
 Obsoletes:      mariadb-libs
+Conflicts:      mysql-connector-c-shared < 6.2
 Provides:       mysql-libs = %{version}-%{release}
 Provides:       mysql-libs%{?_isa} = %{version}-%{release}
 
@@ -947,6 +949,9 @@ fi
 %endif
 
 %changelog
+* Tue Sep 29 2015 Balasubramanian Kandasamy <[email protected]> - 5.6.28-1
+- Added conflicts to mysql-connector-c-shared dependencies
+
 * Wed Jan 14 2015 Balasubramanian Kandasamy <[email protected]> - 5.6.24-1
 - Add mysql_no_login.so plugin
 

packaging/rpm-sles/mysql.spec.in

@@ -277,6 +277,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
@@ -302,6 +303,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
@@ -816,6 +818,9 @@ fi
 %attr(755, root, root) %{_libdir}/mysql/libmysqld.so
 
 %changelog
+* Tue Sep 29 2015 Balasubramanian Kandasamy <[email protected]> - 5.6.28-1
+- Added conflicts to mysql-connector-c-shared dependencies
+
 * Wed Jan 14 2015 Balasubramanian Kandasamy <[email protected]> - 5.6.24-1
 - Add mysql_no_login.so plugin