Semi-automated update for 4.16.10.1-1

2 files changed, 11 insertions, 12 deletions

diff --git a/.SRCINFO b/.SRCINFO
index d4e0bbbc880f..4fb31b5562e7 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,17 +1,15 @@
 pkgbase = zfs-linux-vfio-git
-	pkgver = 2018.05.26.r3492.g3e5300e0e.4.16.10.1
+	pkgver = 2018.05.31.r4577.g1a5b96b8e.4.16.10.1
 	pkgrel = 1
 	url = http://zfsonlinux.org/
 	arch = x86_64
 	license = CDDL
 	makedepends = linux-vfio-headers=4.16.10-1
 	makedepends = git
-	makedepends = spl-linux-vfio-git-headers
 	depends = kmod
-	depends = spl-linux-vfio-git
-	depends = zfs-utils-common-git>=2018.05.26.r3492.g3e5300e0e
+	depends = zfs-utils-common-git=2018.05.31.r4577.g1a5b96b8e
 	depends = linux-vfio=4.16.10-1
-	source = git+https://github.com/zfsonlinux/zfs.git
+	source = git+https://github.com/zfsonlinux/zfs.git#commit=1a5b96b8ee66da5dfdfbedcb6bc462f454b4a25d
 	sha256sums = SKIP
 
 pkgname = zfs-linux-vfio-git
@@ -20,7 +18,8 @@ pkgname = zfs-linux-vfio-git
 	groups = archzfs-linux-vfio-git
 	provides = zfs
 	conflicts = zfs-linux-vfio
-	replaces = zfs-git
+	conflicts = spl-linux-vfio-git
+	replaces = spl-linux-vfio-git
 
 pkgname = zfs-linux-vfio-git-headers
 	pkgdesc = Kernel headers for the Zettabyte File System.
diff --git a/PKGBUILD b/PKGBUILD
index 672bb7e6ce41..e04fbf224018 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -17,15 +17,15 @@
 pkgbase="zfs-linux-vfio-git"
 pkgname=("zfs-linux-vfio-git" "zfs-linux-vfio-git-headers")
 
-pkgver=2018.05.26.r3492.g3e5300e0e.4.16.10.1
+pkgver=2018.05.31.r4577.g1a5b96b8e.4.16.10.1
 pkgrel=1
-makedepends=("linux-vfio-headers=4.16.10-1" "git" "spl-linux-vfio-git-headers")
+makedepends=("linux-vfio-headers=4.16.10-1" "git")
 arch=("x86_64")
 url="http://zfsonlinux.org/"
-source=("git+https://github.com/zfsonlinux/zfs.git")
+source=("git+https://github.com/zfsonlinux/zfs.git#commit=1a5b96b8ee66da5dfdfbedcb6bc462f454b4a25d")
 sha256sums=("SKIP")
 license=("CDDL")
-depends=("kmod" "spl-linux-vfio-git" "zfs-utils-common-git>=2018.05.26.r3492.g3e5300e0e" "linux-vfio=4.16.10-1")
+depends=("kmod" "zfs-utils-common-git=2018.05.31.r4577.g1a5b96b8e" "linux-vfio=4.16.10-1")
 
 build() {
     cd "${srcdir}/zfs"
@@ -43,8 +43,8 @@ package_zfs-linux-vfio-git() {
     install=zfs.install
     provides=("zfs")
     groups=("archzfs-linux-vfio-git")
-    conflicts=('zfs-linux-vfio')
-    replaces=("zfs-git")
+    conflicts=('zfs-linux-vfio' 'spl-linux-vfio-git')
+    replaces=("spl-linux-vfio-git")
     cd "${srcdir}/zfs"
     make DESTDIR="${pkgdir}" install
     cp -r "${pkgdir}"/{lib,usr}