From 9ce0159053392d666eb1ab5e6554d6ac78a5c6fe Mon Sep 17 00:00:00 2001 From: Jesus Alvarez Date: Sun, 20 Apr 2014 12:30:26 -0700 Subject: [PATCH] Add *-lts to conflicts in git PKGBUILDS --- spl-git/PKGBUILD | 2 +- spl-utils-git/PKGBUILD | 2 +- zfs-git/PKGBUILD | 4 ++-- zfs-utils-git/PKGBUILD | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/spl-git/PKGBUILD b/spl-git/PKGBUILD index ef9d5b1..df38606 100644 --- a/spl-git/PKGBUILD +++ b/spl-git/PKGBUILD @@ -45,7 +45,7 @@ license=("GPL") install=spl.install replaces=("spl") provides=("spl") -conflicts=("spl") +conflicts=("spl" "spl-lts") prepare() { cd "${srcdir}" diff --git a/spl-utils-git/PKGBUILD b/spl-utils-git/PKGBUILD index 70a6407..a63a167 100644 --- a/spl-utils-git/PKGBUILD +++ b/spl-utils-git/PKGBUILD @@ -33,7 +33,7 @@ md5sums=('f00535bf89a7fde0e08f44a14a1f1e03' license=("GPL") replaces=("spl-utils") provides=("spl-utils") -conflicts=("spl-utils") +conflicts=("spl-utils" "spl-utils-lts") prepare() { cd "${srcdir}" diff --git a/zfs-git/PKGBUILD b/zfs-git/PKGBUILD index 7eb13d8..263a8ce 100644 --- a/zfs-git/PKGBUILD +++ b/zfs-git/PKGBUILD @@ -38,14 +38,14 @@ arch=("i686" "x86_64") url="http://zfsonlinux.org/" source=("http://archive.zfsonlinux.org/downloads/zfsonlinux/zfs/zfs-0.6.2.tar.gz" "http://demizerone.com/patches/zfs-0.6.2-r258-g4fd762f.patch.tar.xz") -groups=("archzfs") +groups=("archzfs-git") md5sums=('0b183b0abdd5be287046ad9ce4f899fd' '577cc119618ad580d87b470463c1ef55') license=("CDDL") install=zfs.install replaces=("zfs") provides=("zfs") -conflicts=("zfs") +conflicts=("zfs" "zfs-lts") prepare() { cd "${srcdir}" diff --git a/zfs-utils-git/PKGBUILD b/zfs-utils-git/PKGBUILD index 8325580..d8ee626 100644 --- a/zfs-utils-git/PKGBUILD +++ b/zfs-utils-git/PKGBUILD @@ -29,7 +29,7 @@ source=("http://archive.zfsonlinux.org/downloads/zfsonlinux/zfs/zfs-0.6.2.tar.gz "zfs-utils.bash-completion-r1" "zfs-utils.initcpio.install" "zfs-utils.initcpio.hook") -groups=("archzfs") +groups=("archzfs-git") md5sums=('0b183b0abdd5be287046ad9ce4f899fd' '577cc119618ad580d87b470463c1ef55' '9ddb0c8a94861f929d0fa741fdc49950' @@ -38,7 +38,7 @@ md5sums=('0b183b0abdd5be287046ad9ce4f899fd' license=("CDDL") replaces=("zfs-utils") provides=("zfs-utils") -conflicts=("zfs-utils") +conflicts=("zfs-utils" "zfs-utils-lts") prepare() { cd "${srcdir}"