summarylogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.SRCINFO6
-rw-r--r--PKGBUILD3
2 files changed, 6 insertions, 3 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 93c7fabc96ba..1d29130709c5 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,9 @@
# Generated by mksrcinfo v8
-# Tue Sep 13 04:58:00 UTC 2016
+# Tue Sep 13 07:35:18 UTC 2016
pkgbase = spl-linux-git
pkgdesc = Solaris Porting Layer kernel modules.
pkgver = 0.7.0_rc1_r0_g4fd75d3_4.7.2_1
- pkgrel = 6
+ pkgrel = 7
url = http://zfsonlinux.org/
install = spl.install
arch = x86_64
@@ -15,6 +15,8 @@ pkgbase = spl-linux-git
depends = kmod
depends = linux=4.7.2
provides = spl
+ conflicts = spl-utils-linux
+ conflicts = spl-utils-linux-lts
replaces = spl-git
source = git+https://github.com/zfsonlinux/spl.git
sha256sums = SKIP
diff --git a/PKGBUILD b/PKGBUILD
index 91c6c830a032..425ec1bf5492 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -16,7 +16,7 @@
#
pkgname="spl-linux-git"
pkgver=0.7.0_rc1_r0_g4fd75d3_4.7.2_1
-pkgrel=6
+pkgrel=7
pkgdesc="Solaris Porting Layer kernel modules."
depends=("spl-utils-linux-git" "kmod" "linux=4.7.2")
makedepends=("linux-headers=4.7.2" "git")
@@ -28,6 +28,7 @@ groups=("archzfs-linux-git")
license=("GPL")
install=spl.install
provides=("spl")
+conflicts=('spl-utils-linux' 'spl-utils-linux-lts')
replaces=("spl-git")
build() {