summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorRobert Falkenberg2021-02-07 15:33:06 +0100
committerRobert Falkenberg2021-02-07 15:33:06 +0100
commitd8186b25e486585c909b9fd49ae97f6a013e9677 (patch)
tree78888e40968a487b3fa92fa8392dc97ef4662daa
parent053ddaaea9bc5c3dabb4d4e7c79e5eebcb17f5dc (diff)
downloadaur-d8186b25e486585c909b9fd49ae97f6a013e9677.tar.gz
Update conflicts
-rw-r--r--.SRCINFO3
-rw-r--r--PKGBUILD2
2 files changed, 2 insertions, 3 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 0cc0101a303d..2497680d2181 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -14,8 +14,7 @@ pkgbase = libuhd3
optdepends = python: usrp utils
optdepends = libuhd-firmware3
provides = libuhd=3.15.0.0
- conflicts = libuhd
- conflicts = libuhd-firmware
+ conflicts = libuhd-firmware>3.15.0.0
source = libuhd-3.15.0.0.tar.gz::https://github.com/EttusResearch/uhd/archive/v3.15.0.0.tar.gz
source = boost-1.73.patch
sha256sums = eed4a77d75faafff56be78985950039f8d9d1eb9fcbd58b8862e481dd49825cd
diff --git a/PKGBUILD b/PKGBUILD
index 8de533dd7859..9da29e4db1d1 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -14,7 +14,7 @@ optdepends=('python: usrp utils' 'libuhd-firmware3')
makedepends=('cmake' 'boost' 'python-mako')
# gpsd? dpdk?
provides=('libuhd=3.15.0.0')
-conflicts=('libuhd' 'libuhd-firmware')
+conflicts=('libuhd-firmware>3.15.0.0')
source=("libuhd-$pkgver.tar.gz::https://github.com/EttusResearch/uhd/archive/v$pkgver.tar.gz"
boost-1.73.patch)