summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorbrent s2016-08-09 08:35:01 -0400
committerbrent s2016-08-09 08:35:01 -0400
commit7fa80fe218039a5b8509bfb14418d04a1ff977bf (patch)
treef37fe7a6c1042828a5cd90216cbec4f312bd2a08
parent93ba38a37b985134f47f3b84ef5a8b141b7b4173 (diff)
downloadaur-7fa80fe218039a5b8509bfb14418d04a1ff977bf.tar.gz
don't conflict with megaraid-cli in case some people want both installed
-rw-r--r--.SRCINFO5
-rw-r--r--PKGBUILD4
2 files changed, 4 insertions, 5 deletions
diff --git a/.SRCINFO b/.SRCINFO
index c81bc8f6368d..f1ac0c481113 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,16 +1,15 @@
# Generated by mksrcinfo v8
-# Sat Jun 25 21:28:22 UTC 2016
+# Tue Aug 9 12:35:01 UTC 2016
pkgbase = storcli
pkgdesc = CLI program for LSI MegaRAID cards, also works with some Dell PERC RAID cards (successor to megaraid-cli)
pkgver = 1.19.04
- pkgrel = 3
+ pkgrel = 4
url = https://www.thomas-krenn.com/en/wiki/StorCLI
install = storcli.install
arch = i686
arch = x86_64
license = custom
makedepends = rpmextract
- conflicts = megaraid-cli
source = https://square-r00t.net/files/arch/storcli/1.19.04_StorCLI.zip
source = 1.19.04_StorCLI.zip.sig
sha512sums = 3086360a4c40755cdcaa8faa7192adccae5555cf3aaa741be583fa3559a7dedc14652489d8248a69465040871710917d09461644df3d1d2d31fe6d6e0957196b
diff --git a/PKGBUILD b/PKGBUILD
index 61898c695c50..a1c8a4107e08 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -6,7 +6,7 @@ validpgpkeys=('748231EBCBD808A14F5E85D28C004C2F93481F6B')
pkgname=storcli
_pkgname=StorCLI
pkgver=1.19.04
-pkgrel=3
+pkgrel=4
_pkgrel=1
pkgdesc="CLI program for LSI MegaRAID cards, also works with some Dell PERC RAID cards (successor to megaraid-cli)"
arch=('i686' 'x86_64')
@@ -14,7 +14,7 @@ url="https://www.thomas-krenn.com/en/wiki/StorCLI"
license=('custom')
makedepends=('rpmextract')
install=${pkgname}.install
-conflicts=('megaraid-cli')
+#conflicts=('megaraid-cli')
if [[ "${CARCH}" == 'x86_64' ]];
then