summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorNeal Miller2018-06-07 22:54:36 -0500
committerNeal Miller2018-06-07 22:54:36 -0500
commit75067b6c5c0e4d500aa9c6aa65d6cc2b162c8d7b (patch)
tree6e228f80b71d53a15ea5cefc1c1a5b32532ab431
parentc4b26ff2c059439073903887cc19edf31005a025 (diff)
downloadaur-75067b6c5c0e4d500aa9c6aa65d6cc2b162c8d7b.tar.gz
removed un-needed conflicts
-rw-r--r--.SRCINFO3
-rw-r--r--PKGBUILD2
2 files changed, 1 insertions, 4 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 4910f7b3985..bc5c5f5ac23 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -19,9 +19,6 @@ pkgbase = wsjtx-git
depends = hamlib
provides = wsjtx
conflicts = wsjtx
- conflicts = wsjtx-bin
- conflicts = wsjtx-bin-rpm
- conflicts = wsjtx-svn
source = git+https://git.code.sf.net/p/wsjt/wsjtx/
source = wsjtx.patch
md5sums = SKIP
diff --git a/PKGBUILD b/PKGBUILD
index fd434752e08..63df6b3ef62 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -11,7 +11,7 @@ license=("GPL-3")
depends=(qt5-base qt5-multimedia qt5-serialport libusb libusb-compat fftw gcc-fortran hamlib)
makedepends=('cmake' 'git' 'asciidoc')
provides=("wsjtx")
-conflicts=("wsjtx" "wsjtx-bin" "wsjtx-bin-rpm" "wsjtx-svn")
+conflicts=("wsjtx")
source=("git+https://git.code.sf.net/p/wsjt/wsjtx/"
"wsjtx.patch")
md5sums=("SKIP"