rpms/mariadb
5
0
Fork 0
Code Issues Pull Requests Releases Activity

Let mariadb-embedded-devel conflict with MySQL-embedded-devel

Browse Source
This commit is contained in:
Honza Horák 2013-03-13 09:10:42 +01:00
parent e9b1460d6c
commit 91bd546649
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
mariadb.spec
View File

@ -1,6 +1,6 @@
Name: mariadb Name: mariadb
Version: 5.5.29 Version: 5.5.29
Release: 8%{?dist} Release: 9%{?dist}
Summary: A community developed branch of MySQL Summary: A community developed branch of MySQL
Group: Applications/Databases Group: Applications/Databases
@ -215,6 +215,7 @@ Provides: mysql-embedded-devel = %{version}-%{release}
Provides: mysql-embedded-devel%{?_isa} = %{version}-%{release} Provides: mysql-embedded-devel%{?_isa} = %{version}-%{release}
Provides: real-%{name}-embedded-devel = %{version}-%{release} Provides: real-%{name}-embedded-devel = %{version}-%{release}
Provides: real-%{name}-embedded-devel%{?_isa} = %{version}-%{release} Provides: real-%{name}-embedded-devel%{?_isa} = %{version}-%{release}
Conflicts: MySQL-embedded-devel
%if 0%obsoletemysql %if 0%obsoletemysql
Obsoletes: mysql-embedded-devel < %{obsoleted_mysql_evr} Obsoletes: mysql-embedded-devel < %{obsoleted_mysql_evr}
%else %else
@ -788,6 +789,9 @@ fi
%{_mandir}/man1/mysql_client_test.1* %{_mandir}/man1/mysql_client_test.1*
%changelog %changelog
* Wed Mar 13 2013 Honza Horak <hhorak@redhat.com> 5.5.29-9
- Let mariadb-embedded-devel conflict with MySQL-embedded-devel
* Mon Mar 4 2013 Honza Horak <hhorak@redhat.com> 5.5.29-8 * Mon Mar 4 2013 Honza Horak <hhorak@redhat.com> 5.5.29-8
- Mask expected warnings about setrlimit in test suite - Mask expected warnings about setrlimit in test suite