summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorXavierCLL2018-10-27 10:48:52 -0500
committerXavierCLL2018-10-27 10:48:52 -0500
commita07102d768457f57aaa9855428fc2234cafd041c (patch)
tree495b0eb1d28f78faaad4ac49f4b6a273b0064f39
parentd09be080bced7d52f047fea1635992710ad614bf (diff)
downloadaur-a07102d768457f57aaa9855428fc2234cafd041c.tar.gz
Fix conflicts packages
-rw-r--r--.SRCINFO2
-rw-r--r--PKGBUILD2
2 files changed, 2 insertions, 2 deletions
diff --git a/.SRCINFO b/.SRCINFO
index ca5786508b9..d4245091674 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -34,7 +34,7 @@ pkgbase = pycharm-professional
optdepends = jupyter: For support Jupyter Notebook
provides = pycharm
conflicts = pycharm
- conflicts = pycharm-community
+ conflicts = pycharm-community-edition
backup = opt/pycharm-professional/bin/pycharm.vmoptions
backup = opt/pycharm-professional/bin/pycharm64.vmoptions
source = https://download.jetbrains.com/python/pycharm-professional-2018.2.4.tar.gz
diff --git a/PKGBUILD b/PKGBUILD
index 8ff43aae3c3..4fed850d450 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -7,7 +7,7 @@ pkgrel=1
pkgdesc="Powerful Python and Django IDE. Professional Edition."
arch=('x86_64')
url='http://www.jetbrains.com/pycharm/'
-conflicts=('pycharm' 'pycharm-community')
+conflicts=('pycharm' 'pycharm-community-edition')
provides=('pycharm')
license=('custom')
install=${pkgname}.install