bzr merge -rtag:mariadb-10.0.15 maria/10.0

This commit is contained in:
Nirbhay Choubey 2014-12-05 12:33:02 -05:00
commit 3bb02f3e6d
2330 changed files with 593213 additions and 12446 deletions

View file

@ -181,7 +181,7 @@ IF(RPM MATCHES "(rhel|centos)5")
ELSEIF(RPM MATCHES "(rhel|centos)6")
ALTERNATIVE_NAME("client" "mysql")
ALTERNATIVE_NAME("shared" "mysql-libs")
ELSEIF(RPM MATCHES "fedora")
ELSEIF(RPM MATCHES "fedora" OR RPM MATCHES "(rhel|centos)7")
SET(epoch 1) # this is fedora
ALTERNATIVE_NAME("client" "mariadb")
ALTERNATIVE_NAME("client" "mysql")