git » mariadb.git » commit b394342

move all plugins from mariadb-libs to mariadb package (FS#61457)

author Christian Hesse
2019-01-18 21:22:53 UTC
committer Christian Hesse
2019-01-18 21:22:53 UTC
parent 582ad830b9cb98c5cd0594fa5c716c407a0eff80

move all plugins from mariadb-libs to mariadb package (FS#61457)

PKGBUILD +7 -3

diff --git a/PKGBUILD b/PKGBUILD
index a4dec06..6cae991 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,7 +5,7 @@ pkgbase=mariadb
 pkgname=('mariadb-libs' 'mariadb-clients' 'mariadb' 'mytop')
 pkgdesc='Fast SQL database server, derived from MySQL'
 pkgver=10.3.12
-pkgrel=2
+pkgrel=3
 arch=('x86_64')
 license=('GPL')
 url='https://mariadb.org/'
@@ -125,8 +125,13 @@ package_mariadb-libs() {
   install -D -m0644 support-files/mariadb.pc "$pkgdir"/usr/share/pkgconfig/mariadb.pc
   install -D -m0644 "$srcdir"/"$pkgbase-$pkgver"/support-files/mysql.m4 "$pkgdir"/usr/share/aclocal/mysql.m4
 
+  cd "$pkgdir"
+
   # remove static libraries
-  rm "$pkgdir"/usr/lib/*.a
+  rm usr/lib/*.a
+
+  # provided by mariadb
+  rm -r usr/lib/mysql/plugin/
 }
 
 package_mariadb-clients() {
@@ -198,7 +203,6 @@ package_mariadb() {
   rm usr/share/man/man1/mysql_config.1
   rm -r usr/share/{aclocal,pkgconfig}
   rm usr/lib/lib*
-  rm usr/lib/mysql/plugin/{auth_gssapi_client,caching_sha2_password,dialog,mysql_clear_password,sha256_password}.so
   rm -r usr/lib/pkgconfig/
 
   # provided by mariadb-clients