summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorEduardo Pedroni2019-07-31 13:01:33 +0200
committerEduardo Pedroni2019-07-31 13:01:33 +0200
commitb0db28fbe1c4ae2e1c211685c0a670c4ec0644b9 (patch)
treee0f6224c7e3c272b42e97203588093f567aa5bae
parent574124e0590ca5e58e5a5d96e5b04178feb34b8b (diff)
downloadaur-b0db28fbe1c4ae2e1c211685c0a670c4ec0644b9.tar.gz
Fix conflicts array
-rw-r--r--.SRCINFO2
-rw-r--r--PKGBUILD2
2 files changed, 2 insertions, 2 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 7d05ad3076d8..80468cbe956f 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -9,7 +9,7 @@ pkgbase = eclipse-platform
depends = unzip
depends = webkit2gtk
provides = eclipse=4.12
- conflicts = eclipse
+ conflicts = eclipse-common
options = !strip
source = http://www.eclipse.org/downloads/download.php?file=/eclipse/downloads/drops4/R-4.12-201906051800/eclipse-platform-4.12-linux-gtk-x86_64.tar.gz&r=1
source = eclipse.sh
diff --git a/PKGBUILD b/PKGBUILD
index b077113509dd..a41dbdffaf23 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -12,7 +12,7 @@ arch=("x86_64")
license=("EPL")
depends=("java-environment>=8" "unzip" "webkit2gtk")
optdepends=()
-conflicts=("eclipse")
+conflicts=("eclipse-common")
provides=("eclipse=$pkgver")
options=(!strip)