From e1c68ab0caecb20b76faea4449d9268ac0bc40c0 Mon Sep 17 00:00:00 2001
From: Michael Hanson <hansonorders@verizon.net>
Date: Sat, 13 Nov 2010 03:11:11 +0000
Subject: python: add conflict with python2 to pkgbuild

---
 abs/core/python/PKGBUILD | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/abs/core/python/PKGBUILD b/abs/core/python/PKGBUILD
index 18d3c8c..fcbfc50 100644
--- a/abs/core/python/PKGBUILD
+++ b/abs/core/python/PKGBUILD
@@ -4,7 +4,7 @@
 
 pkgname=python
 pkgver=3.1.2
-pkgrel=2
+pkgrel=3
 _pybasever=3.1
 pkgdesc="Next generation of the python high-level scripting language"
 arch=('i686' 'x86_64')
@@ -15,6 +15,7 @@ makedepends=('tk' 'sqlite3')
 optdepends=('tk: for tkinter')
 provides=('python3')
 replaces=('python3')
+conflicts=('python2')
 options=('!makeflags')
 source=(http://www.python.org/ftp/python/${pkgver}/Python-${pkgver}.tar.bz2
         python-internal-expat.patch)
-- 
cgit v0.12

