1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Bug#19063012 fix embedded-devel conflict issue

Browse Source
This commit is contained in:
Balasubramanian Kandasamy 2014-06-26 09:39:29 +02:00
parent 76d3e3bccb
commit c6c2d43a60
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
packaging/rpm-oel/mysql.spec.in
View File

@ -364,6 +364,7 @@ Requires: mysql-enterprise-common%{?_isa} = %{version}-%{release}
Provides: MySQL-embedded%{?_isa} = %{version}-%{release} Provides: MySQL-embedded%{?_isa} = %{version}-%{release}
Requires: mysql-community-common%{?_isa} = %{version}-%{release} Requires: mysql-community-common%{?_isa} = %{version}-%{release}
%endif %endif
Obsoletes: mariadb-embedded
Obsoletes: MySQL-embedded < %{version}-%{release} Obsoletes: MySQL-embedded < %{version}-%{release}
Obsoletes: mysql-embedded < %{version}-%{release} Obsoletes: mysql-embedded < %{version}-%{release}
Provides: 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-devel%{?_isa} = %{version}-%{release}
Requires: mysql-community-embedded%{?_isa} = %{version}-%{release} Requires: mysql-community-embedded%{?_isa} = %{version}-%{release}
%endif %endif
Obsoletes: mariadb-embedded-devel
Obsoletes: mysql-embedded-devel < %{version}-%{release} Obsoletes: mysql-embedded-devel < %{version}-%{release}
Provides: mysql-embedded-devel = %{version}-%{release} Provides: mysql-embedded-devel = %{version}-%{release}
Provides: mysql-embedded-devel%{?_isa} = %{version}-%{release} Provides: mysql-embedded-devel%{?_isa} = %{version}-%{release}
@ -907,6 +909,9 @@ fi
%endif %endif
%changelog %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 * Wed Jun 25 2014 Balasubramanian Kandasamy <balasubramanian.kandasamy@oracle.com> - 5.5.39-1
- Add bench package - Add bench package
- Enable dtrace - Enable dtrace