[arch-commits] Commit in percona-server/trunk (PKGBUILD)

[Massimiliano Torromeo]

    Date: Friday, January 18, 2019 @ 22:05:41
  Author: mtorromeo
Revision: 424175

moved plugins to /usr/lib/perconaserver

Modified:
  percona-server/trunk/PKGBUILD

----------+
 PKGBUILD |   13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2019-01-18 21:53:46 UTC (rev 424174)
+++ PKGBUILD	2019-01-18 22:05:41 UTC (rev 424175)
@@ -6,7 +6,7 @@
 _boost_ver=1.67.0
 _pkgver=${pkgver/_/-}
 _myver=${pkgver/_rel*}
-pkgrel=4
+pkgrel=5
 arch=('x86_64')
 makedepends=('cmake' 'zlib' 'lz4' 'zstd' 'libaio' 'systemd-tools' 'pam' 'numactl' 'jemalloc' 'openssl' 'rpcsvc-proto')
 license=('GPL')
@@ -32,7 +32,7 @@
 
 	patch -p1 -i "$srcdir"/build-hostname.patch
 	patch -p1 -i "$srcdir"/no-werror.patch
-	# patch -p1 -i "$srcdir"/rocksdb-systemlibs.patch
+	patch -p1 -i "$srcdir"/rocksdb-systemlibs.patch
 }
 
 build() {
@@ -55,7 +55,7 @@
 		-DINSTALL_DOCREADMEDIR=share/doc/percona-server \
 		-DINSTALL_DOCDIR=share/doc/percona-server \
 		-DINSTALL_MANDIR=share/man \
-		-DINSTALL_PLUGINDIR=lib/mysql/plugin \
+		-DINSTALL_PLUGINDIR=lib/perconaserver/plugin \
 		-DINSTALL_SCRIPTDIR=bin \
 		-DINSTALL_INCLUDEDIR=include/perconaserver \
 		-DINSTALL_SUPPORTFILESDIR=share/mysql \
@@ -104,7 +104,7 @@
 	done
 
 	# Conflicting files with mariadb-libs
-	rm -rf "$pkgdir"/usr/lib/{libmysqld.so*,libmysqlclient{,_r}.so*,mysql}
+	rm -rf "$pkgdir"/usr/lib/{libmysqld.so*,libmysqlclient{,_r}.so*,perconaserver}
 
 	install -Dm755 scripts/mysql_config "$pkgdir"/usr/bin/perconaserver_config
 	install -Dm644 "$srcdir"/$pkgbase-$_pkgver/man/mysql_config.1 "$pkgdir"/usr/share/man/man1/perconaserver_config.1
@@ -150,7 +150,7 @@
 	cd "$pkgdir"
 	chmod 755 usr
 	mv usr/usr/lib/* usr/lib
-	rm -rf usr/{usr,data,run,lib/mysql/plugin/debug}
+	rm -rf usr/{usr,data,run,lib/perconaserver/plugin/debug}
 
 	# Move documentation
 	if [ -f usr/PATENTS ]; then
@@ -165,9 +165,6 @@
 	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