diff options
| author | Michał Masłowski <mtjm@mtjm.eu> | 2013-03-28 16:32:45 +0100 |
|---|---|---|
| committer | Michał Masłowski <mtjm@mtjm.eu> | 2013-03-28 16:32:45 +0100 |
| commit | e4421c38da95569f796d29c83a54f750e5222545 (patch) | |
| tree | 3b7ac69f38e8a83d0dc58b69305011d095c5ceb0 /extra/mysql | |
| parent | 3ffe7613c97fecff8c5710dfbd44a984eaae9adc (diff) | |
| parent | 0fbe25a10dce8ec16455854ed6929b688f98cb36 (diff) | |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts:
community/erlang/PKGBUILD
community/haskell-x11-xft/PKGBUILD
community/libgdamm/PKGBUILD
community/luasql/PKGBUILD
community/myodbc/PKGBUILD
community/python2-basemap/PKGBUILD
community/ruby-cairo/PKGBUILD
community/ruby-gtk2/PKGBUILD
community/stardict/PKGBUILD
core/diffutils/PKGBUILD
core/libsasl/PKGBUILD
core/systemd/PKGBUILD
extra/anjuta/PKGBUILD
extra/ardour/PKGBUILD
extra/boost/PKGBUILD
extra/calligra/PKGBUILD
extra/gnokii/PKGBUILD
extra/icu/PKGBUILD
extra/libgda/PKGBUILD
extra/libmtp/PKGBUILD
extra/lighttpd/PKGBUILD
extra/mariadb/PKGBUILD
extra/mysql/PKGBUILD
extra/php/PKGBUILD
extra/qt3/PKGBUILD
extra/qt4/PKGBUILD
extra/qt5/PKGBUILD
extra/tracker/PKGBUILD
extra/vlc/PKGBUILD
extra/webkitgtk/PKGBUILD
libre/lilo/PKGBUILD
libre/psi/PKGBUILD
Diffstat (limited to 'extra/mysql')
| -rw-r--r-- | extra/mysql/PKGBUILD | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/extra/mysql/PKGBUILD b/extra/mysql/PKGBUILD index 45a9762f4..c936868cb 100644 --- a/extra/mysql/PKGBUILD +++ b/extra/mysql/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 178940 2013-03-01 05:59:24Z bpiotrowski $ +# $Id: PKGBUILD 180684 2013-03-25 19:15:35Z bpiotrowski $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Douglas Soares de Andrade <douglas@archlinux.org> pkgbase=mysql pkgname=('libmysqlclient' 'mysql-clients' 'mysql') pkgver=5.5.30 -pkgrel=6 +pkgrel=7 arch=('i686' 'x86_64' 'mips64el') license=('GPL') url="https://www.mysql.com/products/community/" @@ -66,6 +66,8 @@ build() { package_libmysqlclient(){ pkgdesc="MySQL client libraries" depends=('openssl') + conflicts=('libmariadbclient') + provides=("libmariadbclient=$pkgver") cd build for dir in include libmysql libmysqld libservices; do @@ -83,6 +85,8 @@ package_libmysqlclient(){ package_mysql-clients(){ pkgdesc="MySQL client tools" depends=('libmysqlclient') + conflicts=('mariadb-clients') + provides=("mariadb-clients=$pkgver") cd build make -C client DESTDIR="${pkgdir}" install @@ -102,6 +106,8 @@ package_mysql(){ backup=('etc/mysql/my.cnf') install=mysql.install depends=('mysql-clients' 'systemd-tools') + conflicts=('mariadb') + provides=("mariadb=$pkgver") options=('emptydirs') cd build |