[arch-commits] Commit in antlr2/trunk (PKGBUILD)

[Guillaume Alaux]

    Date: Thursday, January 30, 2014 @ 21:02:40
  Author: guillaume
Revision: 204893

Removed 'conflict' and 'replaces'

Modified:
  antlr2/trunk/PKGBUILD

----------+
 PKGBUILD |   10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2014-01-30 19:47:56 UTC (rev 204892)
+++ PKGBUILD	2014-01-30 20:02:40 UTC (rev 204893)
@@ -7,12 +7,12 @@
 pkgbase=antlr2
 pkgname=('antlr2' 'python2-antlr2')
 pkgver=2.7.7
-pkgrel=4
-# architecture dependant files in /usr/lib/libantlr.a
-arch=('i686' 'x86_64')
+pkgrel=5
+arch=('any')
 url="http://www.antlr2.org/"
 license=('custom')
 makedepends=('java-environment' 'python2' 'sh')
+options=('!staticlibs')
 source=("http://www.antlr2.org/download/antlr-${pkgver}.tar.gz"
         'runantlr2.sh'
         'gcc4.4.patch')
@@ -34,8 +34,6 @@
 package_antlr2() {
   pkgdesc='Language recognition tool providing a framework to build grammatical parsers'
   depends=('java-runtime' 'sh')
-  replaces=('antlr')
-  conflicts=('antlr')
   provides=("antlr=${pkgver}")
 
   cd ${srcdir}/antlr-${pkgver}/lib/cpp
@@ -51,8 +49,6 @@
 package_python2-antlr2() {
   pkgdesc='Language recognition tool providing a framework to build grammatical parsers'
   depends=('antlr2' 'python2')
-  replaces=('python-antlr')
-  conflicts=('python-antlr')
   provides=("python-antlr=${pkgver}")
 
   cd ${srcdir}/antlr-${pkgver}/lib/python