Semi-automated update for kernel 4.18.5.arch1-1 + zfs 0.7.11

2 files changed, 11 insertions, 15 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 0dcae662f917..ce3dec5135e2 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = zfs-linux-vfio
 	pkgver = 0.7.11_4.18.5.arch1.1
-	pkgrel = 1
+	pkgrel = 2
 	url = http://zfsonlinux.org/
 	arch = x86_64
 	license = CDDL
@@ -18,19 +18,14 @@ pkgname = zfs-linux-vfio
 	install = zfs.install
 	groups = archzfs-linux-vfio
 	provides = zfs
+	conflicts = zfs-dkms
+	conflicts = zfs-dkms-git
 	conflicts = zfs-linux-vfio-git
 
 pkgname = zfs-linux-vfio-headers
 	pkgdesc = Kernel headers for the Zettabyte File System.
-	conflicts = zfs-archiso-linux-headers
-	conflicts = zfs-archiso-linux-git-headers
-	conflicts = zfs-linux-hardened-headers
-	conflicts = zfs-linux-hardened-git-headers
-	conflicts = zfs-linux-lts-headers
-	conflicts = zfs-linux-lts-git-headers
-	conflicts = zfs-linux-headers
-	conflicts = zfs-linux-git-headers
-	conflicts = zfs-linux-vfio-git-headers
-	conflicts = zfs-linux-zen-headers
-	conflicts = zfs-linux-zen-git-headers
+	provides = zfs-headers
+	conflicts = zfs-headers
+	conflicts = zfs-dkms
+	conflicts = zfs-dkms-git
 
diff --git a/PKGBUILD b/PKGBUILD
index 3f2d41d07f05..71c8790fc0bd 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -22,7 +22,7 @@ _kernelver="4.18.5.arch1-1"
 _extramodules="${_kernelver/.arch/-arch}-vfio"
 
 pkgver="${_zfsver}_$(echo ${_kernelver} | sed s/-/./g)"
-pkgrel=1
+pkgrel=2
 makedepends=("linux-vfio-headers=${_kernelver}" "spl-linux-vfio-headers")
 arch=("x86_64")
 url="http://zfsonlinux.org/"
@@ -47,7 +47,7 @@ package_zfs-linux-vfio() {
     install=zfs.install
     provides=("zfs")
     groups=("archzfs-linux-vfio")
-    conflicts=('zfs-linux-vfio-git')
+    conflicts=("zfs-dkms" "zfs-dkms-git" 'zfs-linux-vfio-git')
     cd "${srcdir}/zfs-${_zfsver}"
     make DESTDIR="${pkgdir}" install
     cp -r "${pkgdir}"/{lib,usr}
@@ -58,7 +58,8 @@ package_zfs-linux-vfio() {
 
 package_zfs-linux-vfio-headers() {
     pkgdesc="Kernel headers for the Zettabyte File System."
-    conflicts=('zfs-archiso-linux-headers' 'zfs-archiso-linux-git-headers' 'zfs-linux-hardened-headers' 'zfs-linux-hardened-git-headers' 'zfs-linux-lts-headers' 'zfs-linux-lts-git-headers' 'zfs-linux-headers' 'zfs-linux-git-headers'  'zfs-linux-vfio-git-headers' 'zfs-linux-zen-headers' 'zfs-linux-zen-git-headers' )
+    provides=("zfs-headers")
+    conflicts=("zfs-headers" "zfs-dkms" "zfs-dkms-git")
     cd "${srcdir}/zfs-${_zfsver}"
     make DESTDIR="${pkgdir}" install
     rm -r "${pkgdir}/lib"