main/mariadb: fix conflict

This commit is contained in:
Kaarle Ritvanen 2018-04-12 22:47:57 +03:00
parent b38f739046
commit 374f208096

View File

@ -6,7 +6,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org> # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=mariadb pkgname=mariadb
pkgver=10.2.14 pkgver=10.2.14
pkgrel=1 pkgrel=2
pkgdesc="A fast SQL database server" pkgdesc="A fast SQL database server"
url="http://www.mariadb.org" url="http://www.mariadb.org"
pkgusers="mysql" pkgusers="mysql"
@ -171,6 +171,7 @@ package() {
"$pkgdir"/usr/include/mysql/mysqld_error.h \ "$pkgdir"/usr/include/mysql/mysqld_error.h \
"$pkgdir"/usr/lib/$pkgname/plugin/dialog.so \ "$pkgdir"/usr/lib/$pkgname/plugin/dialog.so \
"$pkgdir"/usr/lib/$pkgname/plugin/mysql_clear_password.so \ "$pkgdir"/usr/lib/$pkgname/plugin/mysql_clear_password.so \
"$pkgdir"/usr/lib/$pkgname/plugin/sha256_password.so \
"$pkgdir"/usr/lib/libmysqlclient.so \ "$pkgdir"/usr/lib/libmysqlclient.so \
"$pkgdir"/usr/lib/libmysqlclient_r.so \ "$pkgdir"/usr/lib/libmysqlclient_r.so \
"$pkgdir"/usr/lib/libmariadb.so* "$pkgdir"/usr/lib/libmariadb.so*