summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorJean Lucas2019-06-21 16:50:06 -0400
committerJean Lucas2019-06-21 16:50:06 -0400
commit38005062e3f817cc37581d8cf1613123ee9b9d8a (patch)
tree64faa0648b8fa0a94d9a9dab8248a5de166fce62
parentc25e38bca9e7622918e215099ce3f0e3b30d1bf2 (diff)
downloadaur-38005062e3f817cc37581d8cf1613123ee9b9d8a.tar.gz
Remove package variant conflicts
-rw-r--r--.SRCINFO6
-rw-r--r--PKGBUILD8
2 files changed, 5 insertions, 9 deletions
diff --git a/.SRCINFO b/.SRCINFO
index b3a64a0fc7a5..3432c7f39e8c 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,6 @@
-# Generated by mksrcinfo v8
-# Tue May 7 03:43:20 UTC 2019
pkgbase = opencorsairlink-testing
pkgdesc = Status and control utility for Corsair Link products (testing branch)
- pkgver = 0+207+6560584
+ pkgver = 0+207+g6560584
pkgrel = 1
url = https://github.com/audiohacked/OpenCorsairLink
arch = i686
@@ -14,8 +12,6 @@ pkgbase = opencorsairlink-testing
depends = libusb
provides = opencorsairlink
conflicts = opencorsairlink
- conflicts = opencorsairlink-git
- conflicts = opencorsairlink-testing-git
source = git+https://github.com/audiohacked/OpenCorsairLink#commit=656058442cba29e59043f411c290c5bf3a198713
sha512sums = SKIP
diff --git a/PKGBUILD b/PKGBUILD
index d85807a9ada8..1e6a156a7756 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,23 +1,23 @@
# Maintainer: Jean Lucas <jean@4ray.co>
pkgname=opencorsairlink-testing
-pkgver=0+207+6560584
+pkgver=0+207+g6560584
_commit=656058442cba29e59043f411c290c5bf3a198713
pkgrel=1
-pkgdesc="Status and control utility for Corsair Link products (testing branch)"
+pkgdesc='Status and control utility for Corsair Link products (testing branch)'
arch=(i686 x86_64)
url=https://github.com/audiohacked/OpenCorsairLink
license=(GPL2)
depends=(libusb)
makedepends=(git libdrm pkg-config)
provides=(opencorsairlink)
-conflicts=(opencorsairlink opencorsairlink-git opencorsairlink-testing-git)
+conflicts=(opencorsairlink)
source=(git+$url#commit=$_commit)
sha512sums=(SKIP)
pkgver() {
cd OpenCorsairLink
- printf 0+%s+%s $(git rev-list --count HEAD) $(git rev-parse --short HEAD)
+ printf 0+%s+%s $(git rev-list --count HEAD) g$(git rev-parse --short HEAD)
}
build() {