Updated to pkgver 0.6.5.3

1 files changed, 19 insertions, 28 deletions

diff --git a/PKGBUILD b/PKGBUILD
index 82ce1380f47c..db40d0cbd961 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,16 +1,17 @@
 #
-# Maintainer: isiachi <isiachi@rhyeworld.it>
+# Maintainer: bjin <bjin1990 at gmail dot com>
+# Maintainer: Iacopo Isimbaldi <isiachi@rhye.it>
 #
 
 pkgbase="zfs-dkms"
 pkgname=("zfs-dkms" "zfs-utils")
-pkgver=0.6.5.2
+pkgver=0.6.5.3
 pkgrel=1
 license=('CDDL')
-makedepends=("git")
+makedepends=("git" "spl-dkms=${pkgver}")
 arch=("i686" "x86_64")
 url="http://zfsonlinux.org/"
-source=("git+https://github.com/zfsonlinux/zfs.git"
+source=("git+https://github.com/zfsonlinux/zfs.git#tag=zfs-${pkgver}"
         "zfs-utils.bash-completion-r1"
         "zfs-utils.initcpio.install"
         "zfs-utils.initcpio.hook")
@@ -18,26 +19,15 @@ md5sums=('SKIP'
          '9ddb0c8a94861f929d0fa741fdc49950'
          '9ef4841abb85dee611828cc7e6f5c6fe'
          '62ba32c6853c315ff231c396cf8bfdbb')
-#install=zfs.install
-
-_dirver="${pkgver}"
-_gittag="zfs-${pkgver}"
-
-prepare() {
-    cd "${srcdir}/zfs"
-    
-    git checkout ${_gittag}
-}
 
 build() {
     cd "${srcdir}/zfs"
     ./autogen.sh
-    scripts/dkms.mkconf -v ${_dirver} -f dkms.conf -n zfs
-    
+
     ./configure --prefix=/usr \
                 --sysconfdir=/etc \
-		--bindir=/usr/bin \
                 --sbindir=/usr/bin \
+                --with-mounthelperdir=/usr/bin \
                 --libdir=/usr/lib \
                 --datadir=/usr/share \
                 --includedir=/usr/include \
@@ -49,23 +39,26 @@ build() {
 
 package_zfs-dkms() {
     pkgdesc="Kernel modules for the Zettabyte File System."
-    depends=("spl-dkms=${pkgver}-${pkgrel}" "zfs-utils=${pkgver}-${pkgrel}" "dkms")
+    depends=("spl-dkms=${pkgver}" "zfs-utils=${pkgver}-${pkgrel}" "dkms")
     provides=("zfs")
     conflicts=("zfs-git" "zfs-lts")
-    replaces=("zfs-dkms-git")
     install=zfs.install
-    
-    install -d ${pkgdir}/usr/src
-    cp -a ${srcdir}/zfs ${pkgdir}/usr/src/zfs-${_dirver}
-    rm -rf ${pkgdir}/usr/src/zfs-${_dirver}/.git
-    rm -f ${pkgdir}/usr/src/zfs-${_dirver}/.gitignore
+
+    dkmsdir="${pkgdir}/usr/src/zfs-${pkgver}"
+    install -d "${dkmsdir}"
+
+    cd "${srcdir}/zfs"
+    git archive --format=tar HEAD | tar -x -C "${dkmsdir}"
+
+    cd "${dkmsdir}"
+    ./autogen.sh
+    scripts/dkms.mkconf -v ${pkgver} -f dkms.conf -n zfs
+    chmod g-w,o-w -R .
 }
 
 package_zfs-utils() {
     pkgdesc="Kernel module support files for the Zettabyte File System."
-    depends=("spl-dkms=${pkgver}-${pkgrel}")
     conflicts=("zfs-utils-git" "zfs-utils-lts")
-    replaces=("zfs-utils-dkms-git")
 
     cd "${srcdir}/zfs"
     make DESTDIR="${pkgdir}" install
@@ -77,8 +70,6 @@ package_zfs-utils() {
     # move module tree /lib -> /usr/lib
     cp -r "${pkgdir}"/{lib,usr}
     rm -r "${pkgdir}"/lib
-    mv "${pkgdir}"/sbin/* "${pkgdir}"/usr/bin
-    rm -r "${pkgdir}"/sbin
 
     install -D -m644 "${srcdir}"/zfs-utils.initcpio.hook "${pkgdir}"/usr/lib/initcpio/hooks/zfs
     install -D -m644 "${srcdir}"/zfs-utils.initcpio.install "${pkgdir}"/usr/lib/initcpio/install/zfs