From 1c48d9f45587b33d6c3ea7e41a1c35b4048cdd78 Mon Sep 17 00:00:00 2001
From: Eli Schwartz <eschwartz@archlinux.org>
Date: Sun, 26 May 2019 20:29:28 -0400
Subject: upgpkg: zfs-dkms 0.8.0-1

upstream release
---
 .SRCINFO | 12 ++++++++----
 PKGBUILD | 27 +++++++++++++++++----------
 2 files changed, 25 insertions(+), 14 deletions(-)

diff --git a/.SRCINFO b/.SRCINFO
index 1e41105..34a3430 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,21 +1,25 @@
 pkgbase = zfs-dkms
 	pkgdesc = Kernel modules for the Zettabyte File System.
-	pkgver = 0.7.13
+	pkgver = 0.8.0
 	pkgrel = 1
 	url = https://zfsonlinux.org/
 	arch = any
 	license = CDDL
 	makedepends = git
 	provides = zfs
-	source = git+https://github.com/zfsonlinux/zfs.git#tag=zfs-0.7.13?signed
+	provides = spl-dkms
+	conflicts = spl-dkms
+	replaces = spl-dkms
+	source = https://github.com/zfsonlinux/zfs/releases/download/zfs-0.8.0/zfs-0.8.0.tar.gz
+	source = https://github.com/zfsonlinux/zfs/releases/download/zfs-0.8.0/zfs-0.8.0.tar.gz.asc
 	source = 0001-only-build-the-module-in-dkms.conf.patch
 	validpgpkeys = 4F3BA9AB6D1F8D683DC2DFB56AD860EED4598027
 	validpgpkeys = C33DF142657ED1F7C328A2960AB9E991C6AF658B
+	sha256sums = 0fd92e87f4b9df9686f18e2ac707c16b2eeaf00f682d41c20ea519f3a0fe4705
 	sha256sums = SKIP
 	sha256sums = 780e590383fb00389c5e02ac15709b7a476d9e07d3c4935ed9eb67c951a88409
 
 pkgname = zfs-dkms
-	depends = spl-dkms=0.7.13
-	depends = zfs-utils=0.7.13
+	depends = zfs-utils=0.8.0
 	depends = dkms
 
diff --git a/PKGBUILD b/PKGBUILD
index 21c4fd5..a884c71 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,23 +2,26 @@
 # Contributor: Iacopo Isimbaldi <isiachi@rhye.it>
 
 pkgname=zfs-dkms
-pkgver=0.7.13
+pkgver=0.8.0
 pkgrel=1
 pkgdesc="Kernel modules for the Zettabyte File System."
 arch=('any')
 url="https://zfsonlinux.org/"
 license=('CDDL')
 makedepends=('git')
-provides=("${pkgname%-dkms}")
-source=("git+https://github.com/zfsonlinux/zfs.git#tag=zfs-${pkgver}?signed"
+conflicts=('spl-dkms')
+provides=("${pkgname%-dkms}" 'spl-dkms')
+replaces=('spl-dkms')
+source=("https://github.com/zfsonlinux/zfs/releases/download/zfs-${pkgver}/zfs-${pkgver}.tar.gz"{,.asc}
         "0001-only-build-the-module-in-dkms.conf.patch")
-sha256sums=('SKIP'
+sha256sums=('0fd92e87f4b9df9686f18e2ac707c16b2eeaf00f682d41c20ea519f3a0fe4705'
+            'SKIP'
             '780e590383fb00389c5e02ac15709b7a476d9e07d3c4935ed9eb67c951a88409')
 validpgpkeys=('4F3BA9AB6D1F8D683DC2DFB56AD860EED4598027'  # Tony Hutter (GPG key for signing ZFS releases) <hutter2@llnl.gov>
               'C33DF142657ED1F7C328A2960AB9E991C6AF658B') # Brian Behlendorf <behlendorf1@llnl.gov>
 
 prepare() {
-    cd "${srcdir}"/${pkgname%-dkms}
+    cd "${srcdir}"/${pkgname%-dkms}-${pkgver}
 
     patch -p1 -i ../0001-only-build-the-module-in-dkms.conf.patch
 
@@ -32,16 +35,20 @@ prepare() {
     autoreconf -fi
 }
 
+build() {
+    cd "${srcdir}"/${pkgname%-dkms}-${pkgver}
+
+    ./scripts/dkms.mkconf -n ${pkgname%-dkms} -v ${pkgver} -f dkms.conf
+}
+
 package() {
-    depends=("spl-dkms=${pkgver}" "zfs-utils=${pkgver}" 'dkms')
+    depends=("zfs-utils=${pkgver}" 'dkms')
 
-    cd "${srcdir}"/${pkgname%-dkms}
+    cd "${srcdir}"/${pkgname%-dkms}-${pkgver}
 
     dkmsdir="${pkgdir}/usr/src/${pkgname%-dkms}-${pkgver}"
     install -d "${dkmsdir}"/{config,scripts}
-    cp -a configure Makefile.in META ${pkgname%-dkms}_config.h.in ${pkgname%-dkms}.release.in include/ module/ "${dkmsdir}"/
+    cp -a configure dkms.conf Makefile.in META ${pkgname%-dkms}_config.h.in ${pkgname%-dkms}.release.in include/ module/ "${dkmsdir}"/
     cp config/config.* config/missing config/*sh "${dkmsdir}"/config/
     cp scripts/enum-extract.pl scripts/dkms.postbuild "${dkmsdir}"/scripts/
-
-    ./scripts/dkms.mkconf -n ${pkgname%-dkms} -v ${pkgver} -f "${dkmsdir}"/dkms.conf
 }
-- 
cgit v1.2.1