summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorCayetano Santos2020-03-21 12:51:53 +0100
committerCayetano Santos2020-03-21 12:51:53 +0100
commit90235acbb9d05d38e377911475724d9ffcf29c00 (patch)
tree15caf16556299b7008c226f991e1e698ccdd439d
parent027064d84b9cab78550530b3c0acb0cefe5e8883 (diff)
downloadaur-90235acbb9d05d38e377911475724d9ffcf29c00.tar.gz
Fix conflicts
-rw-r--r--.SRCINFO2
-rw-r--r--PKGBUILD2
2 files changed, 2 insertions, 2 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 62a07ccc1ffe..23d07789e127 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -13,7 +13,7 @@ pkgbase = python-fusesoc
optdepends = ghdl: for simulating VHDL designs
optdepends = gtkwave: for visualizing waveforms
provides = python-fusesoc
- conflicts = python-fusesoc
+ conflicts = python-fusesoc-git
options = !emptydirs
source = git+https://github.com/olofk/fusesoc#tag=1.10
md5sums = SKIP
diff --git a/PKGBUILD b/PKGBUILD
index c9a9c456e354..77342f0fd1d1 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -6,7 +6,7 @@ pkgdesc="Package manager and build abstraction tool for FPGA/ASIC development."
arch=('any')
url="http://github.com/olofk/fusesoc/"
license=('GPLv3')
-conflicts=('python-fusesoc')
+conflicts=('python-fusesoc-git')
provides=('python-fusesoc')
depends=('python' 'python-edalize')