Merge branch 'mysql-5.5' into mysql-5.6

Author: bkandasa

packaging/rpm-oel/mysql.spec.in

@@ -302,9 +302,9 @@ 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}
+Conflicts:      mysql-connector-c-devel < 6.2
 
 %description    devel
 This package contains the development header files and libraries necessary

packaging/rpm-sles/mysql.spec.in

@@ -277,7 +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
+Conflicts:      mysql-connector-c-devel < 6.2
 
 %description    devel
 This package contains the development header files and libraries necessary