Bug#19063012 fix embedded-devel conflict issue

e774350a · Balasubramanian Kandasamy · dd31a2c2 · e774350a
Commit e774350a authored Jun 26, 2014 by Balasubramanian Kandasamy
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 0 deletions

packaging/rpm-oel/mysql.spec.in packaging/rpm-oel/mysql.spec.in +5 -0

No files found.
--- a/packaging/rpm-oel/mysql.spec.in
+++ b/packaging/rpm-oel/mysql.spec.in
@@ -364,6 +364,7 @@ Requires:       mysql-enterprise-common%{?_isa} = %{version}-%{release}
 Provides:       MySQL-embedded%{?_isa} = %{version}-%{release}
 Requires:       mysql-community-common%{?_isa} = %{version}-%{release}
 %endif
+Obsoletes:      mariadb-embedded
 Obsoletes:      MySQL-embedded < %{version}-%{release}
 Obsoletes:      mysql-embedded < %{version}-%{release}
 Provides:       mysql-embedded = %{version}-%{release}
@@ -392,6 +393,7 @@ Requires:       mysql-enterprise-embedded%{?_isa} = %{version}-%{release}
 Requires:       mysql-community-devel%{?_isa} = %{version}-%{release}
 Requires:       mysql-community-embedded%{?_isa} = %{version}-%{release}
 %endif
+Obsoletes:      mariadb-embedded-devel
 Obsoletes:      mysql-embedded-devel < %{version}-%{release}
 Provides:       mysql-embedded-devel = %{version}-%{release}
 Provides:       mysql-embedded-devel%{?_isa} = %{version}-%{release}
@@ -907,6 +909,9 @@ fi
 %endif

 %changelog
+* Thu Jun 26 2014 Balasubramanian Kandasamy <balasubramanian.kandasamy@oracle.com> - 5.5.39-2
+- Resolve embedded-devel conflict issue
+
 * Wed Jun 25 2014 Balasubramanian Kandasamy <balasubramanian.kandasamy@oracle.com> - 5.5.39-1
 - Add bench package
 - Enable dtrace