Semi-automated update for kernel 4.19.4.arch1-1 + zfs 0.7.12

2 files changed, 7 insertions, 4 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 9b9043d8e20..9c1714abec6 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = zfs-linux
 	pkgver = 0.7.12_4.19.4.arch1.1
-	pkgrel = 1
+	pkgrel = 2
 	url = http://zfsonlinux.org/
 	arch = x86_64
 	license = CDDL
@@ -20,7 +20,9 @@ pkgname = zfs-linux
 	provides = zfs
 	conflicts = zfs-dkms
 	conflicts = zfs-dkms-git
+	conflicts = zfs-dkms-rc
 	conflicts = zfs-linux-git
+	conflicts = zfs-linux-rc
 	replaces = zfs-git
 
 pkgname = zfs-linux-headers
@@ -29,4 +31,5 @@ pkgname = zfs-linux-headers
 	conflicts = zfs-headers
 	conflicts = zfs-dkms
 	conflicts = zfs-dkms-git
+	conflicts = zfs-dkms-rc
 
diff --git a/PKGBUILD b/PKGBUILD
index 0791c9a338e..caef35bb204 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -22,7 +22,7 @@ _kernelver="4.19.4.arch1-1"
 _extramodules="${_kernelver/.arch/-arch}-ARCH"
 
 pkgver="${_zfsver}_$(echo ${_kernelver} | sed s/-/./g)"
-pkgrel=1
+pkgrel=2
 makedepends=("linux-headers=${_kernelver}" "spl-linux-headers")
 arch=("x86_64")
 url="http://zfsonlinux.org/"
@@ -47,7 +47,7 @@ package_zfs-linux() {
     install=zfs.install
     provides=("zfs")
     groups=("archzfs-linux")
-    conflicts=("zfs-dkms" "zfs-dkms-git" 'zfs-linux-git')
+    conflicts=("zfs-dkms" "zfs-dkms-git" "zfs-dkms-rc" 'zfs-linux-git' 'zfs-linux-rc')
     replaces=("zfs-git")
     cd "${srcdir}/zfs-${_zfsver}"
     make DESTDIR="${pkgdir}" install
@@ -60,7 +60,7 @@ package_zfs-linux() {
 package_zfs-linux-headers() {
     pkgdesc="Kernel headers for the Zettabyte File System."
     provides=("zfs-headers")
-    conflicts=("zfs-headers" "zfs-dkms" "zfs-dkms-git")
+    conflicts=("zfs-headers" "zfs-dkms" "zfs-dkms-git" "zfs-dkms-rc")
     cd "${srcdir}/zfs-${_zfsver}"
     make DESTDIR="${pkgdir}" install
     rm -r "${pkgdir}/lib"