diff options
| author | André Fabian Silva Delgado <andre@pc-01.localdomain> | 2012-04-14 15:40:13 -0300 |
|---|---|---|
| committer | André Fabian Silva Delgado <andre@pc-01.localdomain> | 2012-04-14 15:40:13 -0300 |
| commit | a6b8eb42c128cd9c15c1f2ad0058e727d00fcf91 (patch) | |
| tree | 15f7d0a5cf0359effbd3fc22e6592be628371b77 /libre/mariadb | |
| parent | 8df0f600e8af6ec882fdc19ffff4ef823b7747b3 (diff) | |
mariadb-5.5.23-2: fixing conflicts issues
Diffstat (limited to 'libre/mariadb')
| -rw-r--r-- | libre/mariadb/PKGBUILD | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/libre/mariadb/PKGBUILD b/libre/mariadb/PKGBUILD index 3c519dc28..a87c3082a 100644 --- a/libre/mariadb/PKGBUILD +++ b/libre/mariadb/PKGBUILD @@ -9,9 +9,8 @@ __falsename=MySQL pkgbase=mariadb _pkgbase=MariaDB pkgname=("lib${pkgbase}client" "${pkgbase}-clients" "${pkgbase}") -conflicts=("lib${_falsename}client" "${_falsename}-clients" "${_falsename}") pkgver=5.5.23 -pkgrel=1 +pkgrel=2 arch=('i686' 'x86_64' 'mips64el') license=('GPL') url="http://www.${pkgbase}.org/" @@ -73,6 +72,7 @@ package_libmariadbclient(){ pkgdesc="${_pkgbase} client libraries (branch of ${__falsename})" depends=('openssl') replaces=("lib${_falsename}client") + conflicts=("lib${_falsename}client") provides=("lib${_falsename}client=${pkgver}") cd "${srcdir}"/build @@ -92,6 +92,7 @@ package_mariadb-clients(){ pkgdesc="${_pkgbase} client tools (branch of ${__falsename})" depends=("lib${pkgbase}client") replaces=("${_falsename}-clients") + conflicts=("${_falsename}-clients") provides=("${_falsename}-clients=${pkgver}") cd "${srcdir}"/build @@ -114,6 +115,7 @@ package_mariadb(){ depends=("${pkgbase}-clients") optdepends=('perl-dbi' "perl-dbd-${_falsename}") replaces=("${_falsename}") + conflicts=("${_falsename}") provides=("${_falsename}=${pkgver}") options=('emptydirs') |