Date: Friday, January 18, 2019 @ 20:40:48 Author: mtorromeo Revision: 424171
fix conflicts with mariadb-libs Modified: percona-server/trunk/PKGBUILD ----------+ PKGBUILD | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2019-01-18 20:13:34 UTC (rev 424170) +++ PKGBUILD 2019-01-18 20:40:48 UTC (rev 424171) @@ -6,7 +6,7 @@ _boost_ver=1.67.0 _pkgver=${pkgver/_/-} _myver=${pkgver/_rel*} -pkgrel=3 +pkgrel=4 arch=('x86_64') makedepends=('cmake' 'zlib' 'lz4' 'zstd' 'libaio' 'systemd-tools' 'pam' 'numactl' 'jemalloc' 'openssl' 'rpcsvc-proto') license=('GPL') @@ -60,6 +60,7 @@ -DINSTALL_INCLUDEDIR=include/perconaserver \ -DINSTALL_SUPPORTFILESDIR=share/mysql \ -DINSTALL_MYSQLSHAREDIR=share/mysql \ + -DINSTALL_STATIC_LIBRARIES=OFF \ -DWITH_ZLIB=system \ -DWITH_LZ4=system \ -DWITH_SSL=system \ @@ -102,7 +103,7 @@ make -C $dir DESTDIR="$pkgdir" install done - # Conflicting files with libmariadbclient + # Conflicting files with mariadb-libs rm -rf "$pkgdir"/usr/lib/{libmysqld.so*,libmysqlclient{,_r}.so*,mysql} install -Dm755 scripts/mysql_config "$pkgdir"/usr/bin/perconaserver_config @@ -164,6 +165,9 @@ rm usr/share/man/man1/mysql_config.1 rm -r usr/share/aclocal usr/lib/pkgconfig + # conflicting with mariadb-libs + rm usr/lib/mysql/plugin/dialog.so + # provided by percona-server-clients rm usr/bin/mysql{,admin,check,dump,import,show,slap,pump,binlog,test,_upgrade} rm usr/share/man/man1/mysql{,admin,check,dump,import,show,slap,pump,binlog,_upgrade}.1 @@ -170,4 +174,5 @@ # not needed rm -r usr/mysql-test + rm usr/share/doc/percona-server/{INFO_*,mysql.info,*-test} }