summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorRobert Falkenberg2021-02-07 20:43:06 +0100
committerRobert Falkenberg2021-02-07 20:43:06 +0100
commitd6a5143127b33d86ec20b3fde1a17168c30646c5 (patch)
tree66a37b18862ba48ad704f2f65e68e3673268583e
parentd8186b25e486585c909b9fd49ae97f6a013e9677 (diff)
downloadaur-d6a5143127b33d86ec20b3fde1a17168c30646c5.tar.gz
Update conflicts
-rw-r--r--.SRCINFO1
-rw-r--r--PKGBUILD2
2 files changed, 2 insertions, 1 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 2497680d2181..3dfc811d6196 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -14,6 +14,7 @@ pkgbase = libuhd3
optdepends = python: usrp utils
optdepends = libuhd-firmware3
provides = libuhd=3.15.0.0
+ conflicts = libuhd>3.15.0.0
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
diff --git a/PKGBUILD b/PKGBUILD
index 9da29e4db1d1..3028b27699e5 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-firmware>3.15.0.0')
+conflicts=('libuhd>3.15.0.0' '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)