summarylogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.SRCINFO1
-rw-r--r--PKGBUILD1
2 files changed, 0 insertions, 2 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 7b19290b9ac6..779834c11b66 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -18,7 +18,6 @@ pkgbase = python36
depends = zlib
optdepends = tk: for tkinter
optdepends = sqlite
- conflicts = python
options = !makeflags
source = http://www.python.org/ftp/python/3.6.6/Python-3.6.6.tar.xz
sha256sums = d79bc15d456e73a3173a2938f18a17e5149c850ebdedf84a78067f501ee6e16f
diff --git a/PKGBUILD b/PKGBUILD
index e5d6ca548cf3..57f6fb074ca1 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -7,7 +7,6 @@ pkgdesc="Major release 3.6 of the Python high-level programming language"
arch=('i686' 'x86_64')
license=('custom')
url="http://www.python.org/"
-conflicts=('python') # as long as Python 3.6 is arch linux default
depends=('expat' 'bzip2' 'gdbm' 'openssl' 'libffi' 'zlib')
makedepends=('tk' 'sqlite' 'bluez-libs' 'mpdecimal')
optdepends=('tk: for tkinter' 'sqlite')