diff options
-rw-r--r-- | .SRCINFO | 12 | ||||
-rw-r--r-- | PKGBUILD | 13 |
2 files changed, 12 insertions, 13 deletions
@@ -1,12 +1,11 @@ pkgbase = zfs-dkms-git - pkgver = 0.7.0_r481_gbc5f51c5d + pkgver = 0.7.0_r1575_g93491c4bb pkgrel = 1 url = http://zfsonlinux.org/ arch = i686 arch = x86_64 license = CDDL makedepends = git - makedepends = spl-dkms-git source = git+https://github.com/zfsonlinux/zfs.git source = zfs-utils.bash-completion-r1 source = zfs-utils.initcpio.install @@ -18,23 +17,22 @@ pkgbase = zfs-dkms-git pkgname = zfs-dkms-git pkgdesc = Kernel modules for the Zettabyte File System. (Git version) - depends = spl-dkms-git - depends = zfs-utils-dkms-git=0.7.0_r481_gbc5f51c5d-1 + depends = zfs-utils-git=0.7.0_r1575_g93491c4bb-1 depends = dkms provides = zfs conflicts = zfs-git conflicts = zfs-lts conflicts = zfs-dkms -pkgname = zfs-utils-dkms-git +pkgname = zfs-utils-git pkgdesc = Kernel module support files for the Zettabyte File System. (Git version) install = zfs-utils.install provides = zfs-utils - conflicts = zfs-utils-git - conflicts = zfs-utils-lts + conflicts = zfs-utils-dkms-git conflicts = zfs-utils conflicts = zfs-utils-common-git conflicts = zfs-utils-common + replaces = zfs-utils-dkms-git backup = etc/zfs/zed.d/zed.rc backup = etc/default/zfs @@ -2,11 +2,11 @@ # Contributor: Iacopo Isimbaldi <isiachi@rhye.it> pkgbase="zfs-dkms-git" -pkgname=("zfs-dkms-git" "zfs-utils-dkms-git") -pkgver=0.7.0_r481_gbc5f51c5d +pkgname=("zfs-dkms-git" "zfs-utils-git") +pkgver=0.7.0_r1575_g93491c4bb pkgrel=1 license=('CDDL') -makedepends=("git" "spl-dkms-git") +makedepends=("git") arch=("i686" "x86_64") url="http://zfsonlinux.org/" source=("git+https://github.com/zfsonlinux/zfs.git" @@ -43,7 +43,7 @@ build() { package_zfs-dkms-git() { pkgdesc="Kernel modules for the Zettabyte File System. (Git version)" - depends=("spl-dkms-git" "zfs-utils-dkms-git=${pkgver}-${pkgrel}" "dkms") + depends=("zfs-utils-git=${pkgver}-${pkgrel}" "dkms") provides=("zfs") conflicts=("zfs-git" "zfs-lts" "zfs-dkms") @@ -59,10 +59,11 @@ package_zfs-dkms-git() { chmod g-w,o-w -R . } -package_zfs-utils-dkms-git() { +package_zfs-utils-git() { pkgdesc="Kernel module support files for the Zettabyte File System. (Git version)" provides=("zfs-utils") - conflicts=("zfs-utils-git" "zfs-utils-lts" "zfs-utils" "zfs-utils-common-git" "zfs-utils-common") + replaces=("zfs-utils-dkms-git") + conflicts=("zfs-utils-dkms-git" "zfs-utils" "zfs-utils-common-git" "zfs-utils-common") install=zfs-utils.install backup=('etc/zfs/zed.d/zed.rc' 'etc/default/zfs') |