BUG 22005375 - DEVEL PACKAGES INSTALL FAILS IF MYSQL-CONNECTOR-C-DEVEL-6.1.6 IS INSTALLED

bkandasa · bkandasa · commit 5f2d3479ffed · 2015-11-04T16:12:27.000+05:30
As MySQL Connector C 6.1 is end of life, added conflict with mysql-connector-c-devel dependencies
diff --git a/packaging/rpm-oel/mysql.spec.in b/packaging/rpm-oel/mysql.spec.in
@@ -301,7 +301,7 @@ Obsoletes:      mysql-devel < %{version}-%{release}
 Obsoletes:      mariadb-devel
 Provides:       mysql-devel = %{version}-%{release}
 Provides:       mysql-devel%{?_isa} = %{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
diff --git a/packaging/rpm-sles/mysql.spec.in b/packaging/rpm-sles/mysql.spec.in
@@ -268,7 +268,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
