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 62e3d63086c8..e738e9804ee9 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = spl-linux-vfio
 	pkgver = 0.7.11_4.18.5.arch1.1
-	pkgrel = 1
+	pkgrel = 2
 	url = http://zfsonlinux.org/
 	arch = x86_64
 	license = GPL
@@ -15,19 +15,14 @@ pkgname = spl-linux-vfio
 	pkgdesc = Solaris Porting Layer kernel modules.
 	groups = archzfs-linux-vfio
 	provides = spl
+	conflicts = spl-dkms
+	conflicts = spl-dkms-git
 	conflicts = spl-linux-vfio-git
 
 pkgname = spl-linux-vfio-headers
 	pkgdesc = Solaris Porting Layer kernel headers.
-	conflicts = spl-archiso-linux-headers
-	conflicts = spl-archiso-linux-git-headers
-	conflicts = spl-linux-hardened-headers
-	conflicts = spl-linux-hardened-git-headers
-	conflicts = spl-linux-lts-headers
-	conflicts = spl-linux-lts-git-headers
-	conflicts = spl-linux-headers
-	conflicts = spl-linux-git-headers
-	conflicts = spl-linux-vfio-git-headers
-	conflicts = spl-linux-zen-headers
-	conflicts = spl-linux-zen-git-headers
+	provides = spl-headers
+	conflicts = spl-dkms
+	conflicts = spl-dkms-git
+	conflicts = spl-headers
 
diff --git a/PKGBUILD b/PKGBUILD
index 3a26af06e3a3..279dc590d994 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -22,7 +22,7 @@ _kernelver="4.18.5.arch1-1"
 _extramodules="${_kernelver/.arch/-arch}-vfio"
 
 pkgver="${_splver}_$(echo ${_kernelver} | sed s/-/./g)"
-pkgrel=1
+pkgrel=2
 makedepends=("linux-vfio-headers=${_kernelver}")
 arch=("x86_64")
 url="http://zfsonlinux.org/"
@@ -45,7 +45,7 @@ package_spl-linux-vfio() {
     pkgdesc="Solaris Porting Layer kernel modules."
     provides=("spl")
     groups=("archzfs-linux-vfio")
-    conflicts=('spl-linux-vfio-git')
+    conflicts=("spl-dkms" "spl-dkms-git" 'spl-linux-vfio-git')
     cd "${srcdir}/spl-${_splver}"
     make DESTDIR="${pkgdir}" install
     mv "${pkgdir}/lib" "${pkgdir}/usr/"
@@ -55,7 +55,8 @@ package_spl-linux-vfio() {
 
 package_spl-linux-vfio-headers() {
     pkgdesc="Solaris Porting Layer kernel headers."
-    conflicts=('spl-archiso-linux-headers' 'spl-archiso-linux-git-headers' 'spl-linux-hardened-headers' 'spl-linux-hardened-git-headers' 'spl-linux-lts-headers' 'spl-linux-lts-git-headers' 'spl-linux-headers' 'spl-linux-git-headers'  'spl-linux-vfio-git-headers' 'spl-linux-zen-headers' 'spl-linux-zen-git-headers' )
+    provides=("spl-headers")
+    conflicts=("spl-dkms" "spl-dkms-git" "spl-headers")
     cd "${srcdir}/spl-${_splver}"
     make DESTDIR="${pkgdir}" install
     rm -r "${pkgdir}/lib"