Semi-automated update for 4.11.4_1-2

2 files changed, 5 insertions, 4 deletions

diff --git a/.SRCINFO b/.SRCINFO
index da4355aff2c4..9e670d3302ff 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,9 @@
 # Generated by mksrcinfo v8
-# Wed Jun 14 16:59:38 UTC 2017
+# Thu Jun 15 03:11:55 UTC 2017
 pkgbase = spl-linux-git
 	pkgdesc = Solaris Porting Layer kernel modules.
 	pkgver = 0.7.0_rc4_r4_gac48361_4.11.4_1
-	pkgrel = 1
+	pkgrel = 2
 	url = http://zfsonlinux.org/
 	install = spl.install
 	arch = x86_64
@@ -17,6 +17,7 @@ pkgbase = spl-linux-git
 	provides = spl
 	conflicts = spl-utils-linux
 	conflicts = spl-utils-linux-lts
+	conflicts = spl-utils-linux-lts-git
 	source = git+https://github.com/zfsonlinux/spl.git
 	sha256sums = SKIP
 
diff --git a/PKGBUILD b/PKGBUILD
index 924ff8e9fb44..10bec1f10025 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -16,7 +16,7 @@
 #
 pkgname="spl-linux-git"
 pkgver=0.7.0_rc4_r4_gac48361_4.11.4_1
-pkgrel=1
+pkgrel=2
 pkgdesc="Solaris Porting Layer kernel modules."
 depends=("spl-utils-linux-git" "kmod" "linux=4.11.4-1")
 makedepends=("linux-headers=4.11.4-1" "git")
@@ -28,7 +28,7 @@ groups=("archzfs-linux-git")
 license=("GPL")
 install=spl.install
 provides=("spl")
-conflicts=('spl-utils-linux' 'spl-utils-linux-lts')
+conflicts=('spl-utils-linux' 'spl-utils-linux-lts' 'spl-utils-linux-lts-git')
 
 build() {
     cd "${srcdir}/spl"