Semi-automated update for latest git commit

3 files changed, 11 insertions, 17 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 8c0e8696167b..13d30621c15e 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = zfs-utils-common-git
 	pkgdesc = Kernel module support files for the Zettabyte File System.
-	pkgver = 2018.05.26.r3492.g3e5300e0e
+	pkgver = 2018.05.31.r4577.g1a5b96b8e
 	pkgrel = 1
 	url = http://zfsonlinux.org/
 	install = zfs-utils.install
@@ -11,21 +11,17 @@ pkgbase = zfs-utils-common-git
 	depends = python2
 	provides = zfs-utils
 	conflicts = zfs-utils-common
-	conflicts = zfs-utils-linux-git
-	conflicts = zfs-utils-linux
-	conflicts = zfs-utils-linux-lts
-	conflicts = zfs-utils-linux-lts-git
-	replaces = zfs-utils-linux,
-	replaces = zfs-utils-linux-lts
+	conflicts = spl-utils-common-git
+	replaces = spl-utils-common-git
 	backup = etc/zfs/zed.d/zed.rc
 	backup = etc/default/zfs
-	source = git+https://github.com/zfsonlinux/zfs.git#commit=3e5300e0ed3c4b49e3b0dab7daded1e3bfaaded7
+	source = git+https://github.com/zfsonlinux/zfs.git#commit=1a5b96b8ee66da5dfdfbedcb6bc462f454b4a25d
 	source = zfs-utils.bash-completion-r1
 	source = zfs-utils.initcpio.install
 	source = zfs-utils.initcpio.hook
 	sha256sums = SKIP
 	sha256sums = b60214f70ffffb62ffe489cbfabd2e069d14ed2a391fac0e36f914238394b540
-	sha256sums = e33adabbe3f2f4866802c9d63c7810c7a42b4df2288d0cdd23376519b15b36e4
+	sha256sums = 335e309ebf5b74fd8956f5e8805939c37d4008b0bcc3b00be6e7ef1d5b7c1669
 	sha256sums = 3eb874cf2cbb6c6a0e1c11a98af54f682d6225667af944b43435aeabafa0112f
 
 pkgname = zfs-utils-common-git
diff --git a/PKGBUILD b/PKGBUILD
index 82f291388a4d..8e54cee06ea8 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -7,27 +7,27 @@
 #
 pkgname="zfs-utils-common-git"
 
-pkgver=2018.05.26.r3492.g3e5300e0e
+pkgver=2018.05.31.r4577.g1a5b96b8e
 pkgrel=1
 pkgdesc="Kernel module support files for the Zettabyte File System."
 depends=("python2")
 makedepends=("git")
 arch=("x86_64")
 url="http://zfsonlinux.org/"
-source=("git+https://github.com/zfsonlinux/zfs.git#commit=3e5300e0ed3c4b49e3b0dab7daded1e3bfaaded7"
+source=("git+https://github.com/zfsonlinux/zfs.git#commit=1a5b96b8ee66da5dfdfbedcb6bc462f454b4a25d"
         "zfs-utils.bash-completion-r1"
         "zfs-utils.initcpio.install"
         "zfs-utils.initcpio.hook")
 sha256sums=("SKIP"
             "b60214f70ffffb62ffe489cbfabd2e069d14ed2a391fac0e36f914238394b540"
-            "e33adabbe3f2f4866802c9d63c7810c7a42b4df2288d0cdd23376519b15b36e4"
+            "335e309ebf5b74fd8956f5e8805939c37d4008b0bcc3b00be6e7ef1d5b7c1669"
             "3eb874cf2cbb6c6a0e1c11a98af54f682d6225667af944b43435aeabafa0112f")
 license=("CDDL")
 groups=("archzfs-linux-git")
 provides=("zfs-utils")
 install=zfs-utils.install
-conflicts=('zfs-utils-common' 'zfs-utils-linux-git' 'zfs-utils-linux' 'zfs-utils-linux-lts' 'zfs-utils-linux-lts-git')
-replaces=("zfs-utils-linux", "zfs-utils-linux-lts")
+conflicts=('zfs-utils-common' 'spl-utils-common-git')
+replaces=("spl-utils-common-git")
 backup=('etc/zfs/zed.d/zed.rc' 'etc/default/zfs')
 
 build() {
diff --git a/zfs-utils.initcpio.install b/zfs-utils.initcpio.install
index 6f7d05b5addc..c3d5a9860aae 100644
--- a/zfs-utils.initcpio.install
+++ b/zfs-utils.initcpio.install
@@ -7,8 +7,7 @@ build() {
         zunicode \
         zcommon \
         zfs \
-        spl \
-        splat
+        spl
 
     map add_binary \
         arcstat.py \
@@ -24,7 +23,6 @@ build() {
         zpool \
         zstreamdump \
         ztest \
-        splat \
         /lib/udev/vdev_id \
         /lib/udev/zvol_id \
         findmnt