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

Conflict only with real-mysql, otherwise mariadb conflicts with ourself

Browse Source
This commit is contained in:
Honza Horák 2013-02-11 10:38:18 +01:00
parent a4dbe8dcaa
commit 473e3e84d1
1 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
mariadb.spec
View File

@ -78,7 +78,7 @@ Provides: real-%{name}%{?_isa} = %{version}-%{release}
%if 0%obsoletemysql %if 0%obsoletemysql
Obsoletes: mysql < %{obsoleted_mysql_evr} Obsoletes: mysql < %{obsoleted_mysql_evr}
%else %else
Conflicts: mysql Conflicts: real-mysql
%endif %endif
# mysql-cluster used to be built from this SRPM, but no more # mysql-cluster used to be built from this SRPM, but no more
Obsoletes: mysql-cluster < 5.1.44 Obsoletes: mysql-cluster < 5.1.44
@ -110,7 +110,7 @@ Provides: real-%{name}-libs%{?_isa} = %{version}-%{release}
%if 0%obsoletemysql %if 0%obsoletemysql
Obsoletes: mysql-libs < %{obsoleted_mysql_evr} Obsoletes: mysql-libs < %{obsoleted_mysql_evr}
%else %else
Conflicts: mysql-libs Conflicts: real-mysql-libs
%endif %endif
%description libs %description libs
@ -147,7 +147,7 @@ Provides: real-%{name}-server%{?_isa} = %{version}-%{release}
%if 0%obsoletemysql %if 0%obsoletemysql
Obsoletes: mysql-server < %{obsoleted_mysql_evr} Obsoletes: mysql-server < %{obsoleted_mysql_evr}
%else %else
Conflicts: mysql-server Conflicts: real-mysql-server
%endif %endif
%description server %description server
@ -172,7 +172,7 @@ Provides: real-%{name}-devel%{?_isa} = %{version}-%{release}
%if 0%obsoletemysql %if 0%obsoletemysql
Obsoletes: mysql-devel < %{obsoleted_mysql_evr} Obsoletes: mysql-devel < %{obsoleted_mysql_evr}
%else %else
Conflicts: mysql-devel Conflicts: real-mysql-devel
%endif %endif
%description devel %description devel
@ -193,7 +193,7 @@ Provides: real-%{name}-embedded%{?_isa} = %{version}-%{release}
%if 0%obsoletemysql %if 0%obsoletemysql
Obsoletes: mysql-embedded < %{obsoleted_mysql_evr} Obsoletes: mysql-embedded < %{obsoleted_mysql_evr}
%else %else
Conflicts: mysql-embedded Conflicts: real-mysql-embedded
%endif %endif
%description embedded %description embedded
@ -215,7 +215,7 @@ Provides: real-%{name}-embedded-devel%{?_isa} = %{version}-%{release}
%if 0%obsoletemysql %if 0%obsoletemysql
Obsoletes: mysql-embedded-devel < %{obsoleted_mysql_evr} Obsoletes: mysql-embedded-devel < %{obsoleted_mysql_evr}
%else %else
Conflicts: mysql-embedded-devel Conflicts: real-mysql-embedded-devel
%endif %endif
%description embedded-devel %description embedded-devel
@ -237,7 +237,7 @@ Provides: real-%{name}-bench%{?_isa} = %{version}-%{release}
%if 0%obsoletemysql %if 0%obsoletemysql
Obsoletes: mysql-bench < %{obsoleted_mysql_evr} Obsoletes: mysql-bench < %{obsoleted_mysql_evr}
%else %else
Conflicts: mysql-bench Conflicts: real-mysql-bench
%endif %endif
%description bench %description bench
@ -261,7 +261,7 @@ Provides: real-%{name}-test %{?_isa} = %{version}-%{release}
%if 0%obsoletemysql %if 0%obsoletemysql
Obsoletes: mysql-test < %{obsoleted_mysql_evr} Obsoletes: mysql-test < %{obsoleted_mysql_evr}
%else %else
Conflicts: mysql-test Conflicts: real-mysql-test
%endif %endif
%description test %description test
@ -794,6 +794,7 @@ fi
unambiguously unambiguously
- Fix format for buffer size in error messages (MDEV-4156) - Fix format for buffer size in error messages (MDEV-4156)
- Disable some tests that fail on ppc and s390 - Disable some tests that fail on ppc and s390
- Conflict only with real-mysql, otherwise mariadb conflicts with ourself
* Tue Feb 05 2013 Honza Horak <hhorak@redhat.com> 5.5.29-2 * Tue Feb 05 2013 Honza Horak <hhorak@redhat.com> 5.5.29-2
- Let mariadb-libs to own /etc/my.cnf.d - Let mariadb-libs to own /etc/my.cnf.d