Semi-automated update for kernel 4.19.45-1 + zfs 0.8.0

2 files changed, 23 insertions, 14 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 7cf57228a7b8..aa386c0c7f8f 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,34 +1,42 @@
 pkgbase = zfs-linux-lts
-	pkgver = 0.7.13_4.19.45.1
+	pkgver = 0.8.0_4.19.45.1
 	pkgrel = 1
 	url = http://zfsonlinux.org/
 	arch = x86_64
 	license = CDDL
+	makedepends = python
 	makedepends = linux-lts-headers=4.19.45-1
-	makedepends = spl-linux-lts-headers
 	depends = kmod
-	depends = spl-linux-lts
-	depends = zfs-utils=0.7.13
+	depends = zfs-utils=0.8.0
 	depends = linux-lts=4.19.45-1
-	source = https://github.com/zfsonlinux/zfs/releases/download/zfs-0.7.13/zfs-0.7.13.tar.gz
-	sha256sums = d23f0d292049b1bc636d2300277292b60248c0bde6a0f4ba707c0cb5df3f8c8d
+	source = https://github.com/zfsonlinux/zfs/releases/download/zfs-0.8.0/zfs-0.8.0.tar.gz
+	sha256sums = 0fd92e87f4b9df9686f18e2ac707c16b2eeaf00f682d41c20ea519f3a0fe4705
 
 pkgname = zfs-linux-lts
 	pkgdesc = Kernel modules for the Zettabyte File System.
 	install = zfs.install
 	groups = archzfs-linux-lts
 	provides = zfs
+	provides = spl
 	conflicts = zfs-dkms
 	conflicts = zfs-dkms-git
 	conflicts = zfs-dkms-rc
+	conflicts = spl-dkms
+	conflicts = spl-dkms-git
 	conflicts = zfs-linux-lts-git
 	conflicts = zfs-linux-lts-rc
+	conflicts = spl-linux-lts
+	replaces = spl-linux-lts
 
 pkgname = zfs-linux-lts-headers
 	pkgdesc = Kernel headers for the Zettabyte File System.
 	provides = zfs-headers
+	provides = spl-headers
 	conflicts = zfs-headers
 	conflicts = zfs-dkms
 	conflicts = zfs-dkms-git
 	conflicts = zfs-dkms-rc
+	conflicts = spl-dkms
+	conflicts = spl-dkms-git
+	conflicts = spl-headers
 
diff --git a/PKGBUILD b/PKGBUILD
index 40a41c3445b1..ecb3fd74d311 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -17,19 +17,19 @@
 #
 pkgbase="zfs-linux-lts"
 pkgname=("zfs-linux-lts" "zfs-linux-lts-headers")
-_zfsver="0.7.13"
+_zfsver="0.8.0"
 _kernelver="4.19.45-1"
 _extramodules="4.19.45-1-lts"
 
 pkgver="${_zfsver}_$(echo ${_kernelver} | sed s/-/./g)"
 pkgrel=1
-makedepends=("linux-lts-headers=${_kernelver}" "spl-linux-lts-headers")
+makedepends=("python" "linux-lts-headers=${_kernelver}")
 arch=("x86_64")
 url="http://zfsonlinux.org/"
 source=("https://github.com/zfsonlinux/zfs/releases/download/zfs-${_zfsver}/zfs-${_zfsver}.tar.gz")
-sha256sums=("d23f0d292049b1bc636d2300277292b60248c0bde6a0f4ba707c0cb5df3f8c8d")
+sha256sums=("0fd92e87f4b9df9686f18e2ac707c16b2eeaf00f682d41c20ea519f3a0fe4705")
 license=("CDDL")
-depends=("kmod" 'spl-linux-lts' "zfs-utils=${_zfsver}" "linux-lts=${_kernelver}")
+depends=("kmod" "zfs-utils=${_zfsver}" "linux-lts=${_kernelver}")
 
 build() {
     cd "${srcdir}/zfs-${_zfsver}"
@@ -45,9 +45,10 @@ build() {
 package_zfs-linux-lts() {
     pkgdesc="Kernel modules for the Zettabyte File System."
     install=zfs.install
-    provides=("zfs")
+    provides=("zfs" "spl")
     groups=("archzfs-linux-lts")
-    conflicts=("zfs-dkms" "zfs-dkms-git" "zfs-dkms-rc" 'zfs-linux-lts-git' 'zfs-linux-lts-rc')
+    conflicts=("zfs-dkms" "zfs-dkms-git" "zfs-dkms-rc" "spl-dkms" "spl-dkms-git" 'zfs-linux-lts-git' 'zfs-linux-lts-rc' 'spl-linux-lts')
+    replaces=("spl-linux-lts")
     cd "${srcdir}/zfs-${_zfsver}"
     make DESTDIR="${pkgdir}" install
     cp -r "${pkgdir}"/{lib,usr}
@@ -58,8 +59,8 @@ package_zfs-linux-lts() {
 
 package_zfs-linux-lts-headers() {
     pkgdesc="Kernel headers for the Zettabyte File System."
-    provides=("zfs-headers")
-    conflicts=("zfs-headers" "zfs-dkms" "zfs-dkms-git" "zfs-dkms-rc")
+    provides=("zfs-headers" "spl-headers")
+    conflicts=("zfs-headers" "zfs-dkms" "zfs-dkms-git" "zfs-dkms-rc" "spl-dkms" "spl-dkms-git" "spl-headers")
     cd "${srcdir}/zfs-${_zfsver}"
     make DESTDIR="${pkgdir}" install
     rm -r "${pkgdir}/lib"