From 8b8d13986ed8fddfcb6ddecdf228c234dbb2f3c5 Mon Sep 17 00:00:00 2001 From: davehome Date: Thu, 29 Mar 2012 19:09:12 -0600 Subject: [PATCH] libmysqlclient-devel: fix broken symlink by moving real plugin to main pkg; revbump --- srcpkgs/mysql/libmysqlclient-devel.template | 22 +++++++++------------ srcpkgs/mysql/template | 3 ++- 2 files changed, 11 insertions(+), 14 deletions(-) diff --git a/srcpkgs/mysql/libmysqlclient-devel.template b/srcpkgs/mysql/libmysqlclient-devel.template index 369d61cb5e4..20c2da98ea4 100644 --- a/srcpkgs/mysql/libmysqlclient-devel.template +++ b/srcpkgs/mysql/libmysqlclient-devel.template @@ -1,29 +1,25 @@ # Template file for 'libmysqlclient-devel'. # +revision=1 short_desc="MySQL database development files" long_desc="${long_desc} This package includes development libraries and header files." Add_dependency run libstdc++-devel -Add_dependency run libmysqlclient +Add_dependency run libmysqlclient ">=${version}" noverifyrdeps=yes do_install() { - mkdir -p ${DESTDIR}/usr/lib/mysql/plugin \ - ${DESTDIR}/usr/share/man/man1 ${DESTDIR}/usr/bin \ - ${DESTDIR}/usr/include/mysql + vmove usr/bin/mysql_config usr/bin + vmove usr/share/man/man1/mysql_config.1 usr/share/man + vmove "usr/include/mysql/*.h" usr/include/mysql + vmove usr/lib/mysql/libmysqlclient*.a usr/lib/mysql + vmove usr/share/aclocal usr/share - mv ${SRCPKGDESTDIR}/usr/bin/mysql_config ${DESTDIR}/usr/bin - mv ${SRCPKGDESTDIR}/usr/share/man/man1/mysql_config.1 \ - ${DESTDIR}/usr/share/man/man1 - mv ${SRCPKGDESTDIR}/usr/include/mysql/*.h ${DESTDIR}/usr/include/mysql - mv ${SRCPKGDESTDIR}/usr/lib/mysql/libmysqlclient*.a ${DESTDIR}/usr/lib - mv ${SRCPKGDESTDIR}/usr/share/aclocal ${DESTDIR}/usr/share - for p in *example* mypluglib* *.{a,so}; do - mv ${SRCPKGDESTDIR}/usr/lib/mysql/plugin/${p} \ - ${DESTDIR}/usr/lib/mysql/plugin + for p in *example* mypluglib* *.a; do + vmove usr/lib/mysql/plugin/${p} usr/lib/mysql/plugin done } diff --git a/srcpkgs/mysql/template b/srcpkgs/mysql/template index ee2f3bbbbc0..18f84eb520d 100644 --- a/srcpkgs/mysql/template +++ b/srcpkgs/mysql/template @@ -12,7 +12,7 @@ configure_args="--sysconfdir=/etc/mysql --with-plugins=all --with-embedded-privilege-control --with-mysqlmanager --with-mysqld-user=mysqld --enable-thread-safe-client --libexecdir=/usr/sbin --without-readline" -revision=1 +revision=2 short_desc="The world's most popular open source database" maintainer="Juan RP " checksum=84370fffc4fe277645fb3a5040d153ff567576b664f0663452be077826b7ab1f @@ -49,6 +49,7 @@ Add_dependency build ncurses-devel Add_dependency build openssl-devel Add_dependency build readline-devel Add_dependency full perl ">=0" +Add_dependency full procps post_install() {