diff options
| author | Balasubramanian Kandasamy <balasubramanian.kandasamy@oracle.com> | 2015-11-04 16:12:27 +0530 |
|---|---|---|
| committer | Balasubramanian Kandasamy <balasubramanian.kandasamy@oracle.com> | 2015-11-04 16:12:27 +0530 |
| commit | 5f2d3479ffed18e28435c9ad130d400e7290e0bb (patch) | |
| tree | 9ec64dffb2e170d0e855123c7e19175cf16dac3b /packaging | |
| parent | 75bfdea40f9c2954d8eadccbadc795231e310ab7 (diff) | |
| download | mariadb-git-5f2d3479ffed18e28435c9ad130d400e7290e0bb.tar.gz | |
BUG 22005375 - DEVEL PACKAGES INSTALL FAILS IF MYSQL-CONNECTOR-C-DEVEL-6.1.6 IS INSTALLED
As MySQL Connector C 6.1 is end of life, added conflict with mysql-connector-c-devel dependencies
Diffstat (limited to 'packaging')
| -rw-r--r-- | packaging/rpm-oel/mysql.spec.in | 2 | ||||
| -rw-r--r-- | packaging/rpm-sles/mysql.spec.in | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/packaging/rpm-oel/mysql.spec.in b/packaging/rpm-oel/mysql.spec.in index 2d91975f56c..3136e47230b 100644 --- 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 index b5fb5b77642..cb42dfacf71 100644 --- 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 |