summaryrefslogtreecommitdiff
path: root/support-files
diff options
context:
space:
mode:
authorBalasubramanian Kandasamy <balasubramanian.kandasamy@oracle.com>2013-01-16 08:09:26 +0100
committerBalasubramanian Kandasamy <balasubramanian.kandasamy@oracle.com>2013-01-16 08:09:26 +0100
commit31c06437c970d4d0f4ec0301acac9c56e0ed29b5 (patch)
treebc4f2f2d63a3995d9cfd4c24872731197975b58a /support-files
parent817f2ab90e891b90dbaaf0ce0c41c1df4b9a7daa (diff)
downloadmariadb-git-31c06437c970d4d0f4ec0301acac9c56e0ed29b5.tar.gz
Removed Conflicts: mysql-libs mysql-libs-advanced from spec file
Diffstat (limited to 'support-files')
-rw-r--r--support-files/mysql.spec.sh1
1 files changed, 0 insertions, 1 deletions
diff --git a/support-files/mysql.spec.sh b/support-files/mysql.spec.sh
index 2d629c766e8..bac22fc96a9 100644
--- a/support-files/mysql.spec.sh
+++ b/support-files/mysql.spec.sh
@@ -370,7 +370,6 @@ For a description of MySQL see the base MySQL RPM or http://www.mysql.com/
Summary: MySQL - Shared libraries
Group: Applications/Databases
Provides: MySQL-shared
-Conflicts: mysql-libs mysql-libs-advanced
Obsoletes: MySQL-shared-standard MySQL-shared-pro
Obsoletes: MySQL-shared-pro-cert MySQL-shared-pro-gpl
Obsoletes: MySQL-shared-pro-gpl-cert MySQL-shared