summarylogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.SRCINFO8
-rw-r--r--PKGBUILD5
2 files changed, 4 insertions, 9 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 99034dbdb5d3..474909173408 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,18 +1,14 @@
pkgbase = zfs-utils-common
pkgdesc = Kernel module support files for the Zettabyte File System.
pkgver = 0.7.11
- pkgrel = 1
+ pkgrel = 2
url = http://zfsonlinux.org/
install = zfs-utils.install
arch = x86_64
groups = archzfs-linux
license = CDDL
provides = zfs-utils
- conflicts = zfs-utils-common-git
- conflicts = zfs-utils-linux-git
- conflicts = zfs-utils-linux
- conflicts = zfs-utils-linux-lts
- conflicts = zfs-utils-linux-lts-git
+ conflicts = zfs-utils
replaces = zfs-utils-linux,
replaces = zfs-utils-linux-lts
backup = etc/zfs/zed.d/zed.rc
diff --git a/PKGBUILD b/PKGBUILD
index f2a15728b992..d5e2b20ba981 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -8,9 +8,8 @@
pkgname="zfs-utils-common"
pkgver=0.7.11
-pkgrel=1
+pkgrel=2
pkgdesc="Kernel module support files for the Zettabyte File System."
-depends=()
makedepends=()
arch=("x86_64")
url="http://zfsonlinux.org/"
@@ -28,7 +27,7 @@ license=("CDDL")
groups=("archzfs-linux")
provides=("zfs-utils")
install=zfs-utils.install
-conflicts=('zfs-utils-common-git' 'zfs-utils-linux-git' 'zfs-utils-linux' 'zfs-utils-linux-lts' 'zfs-utils-linux-lts-git')
+conflicts=("zfs-utils")
replaces=("zfs-utils-linux", "zfs-utils-linux-lts")
backup=('etc/zfs/zed.d/zed.rc' 'etc/default/zfs')