Semi-automated update for 4.7.2_1-7

2 files changed, 6 insertions, 3 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 9d43de0dfafa..1fd2bca09a9e 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,9 @@
 # Generated by mksrcinfo v8
-# Tue Sep 13 04:58:01 UTC 2016
+# Tue Sep 13 07:35:19 UTC 2016
 pkgbase = zfs-linux-git
 	pkgdesc = Kernel modules for the Zettabyte File System.
 	pkgver = 0.7.0_rc1_r12_gb8eb3c4_4.7.2_1
-	pkgrel = 6
+	pkgrel = 7
 	url = http://zfsonlinux.org/
 	install = zfs.install
 	arch = x86_64
@@ -16,6 +16,8 @@ pkgbase = zfs-linux-git
 	depends = zfs-utils-linux-git
 	depends = linux=4.7.2
 	provides = zfs
+	conflicts = zfs-linux
+	conflicts = zfs-linux-lts
 	replaces = zfs-git
 	source = git+https://github.com/zfsonlinux/zfs.git
 	sha256sums = SKIP
diff --git a/PKGBUILD b/PKGBUILD
index bf8d44a36f3d..1009986e53ee 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -16,7 +16,7 @@
 #
 pkgname="zfs-linux-git"
 pkgver=0.7.0_rc1_r12_gb8eb3c4_4.7.2_1
-pkgrel=6
+pkgrel=7
 pkgdesc="Kernel modules for the Zettabyte File System."
 depends=("kmod" "spl-linux-git" "zfs-utils-linux-git" "linux=4.7.2")
 makedepends=("linux-headers=4.7.2" "git")
@@ -28,6 +28,7 @@ groups=("archzfs-linux-git")
 license=("CDDL")
 install=zfs.install
 provides=("zfs")
+conflicts=('zfs-linux' 'zfs-linux-lts')
 replaces=("zfs-git")
 
 build() {