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

[andyrtr at archlinux.org]

    Date: Tuesday, March 6, 2012 @ 15:35:06
  Author: andyrtr
Revision: 152427

upgpkg: java7-openjdk 7.b147_2.1-3

fix provides conflict

Modified:
  java7-openjdk/trunk/PKGBUILD

----------+
 PKGBUILD |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2012-03-06 20:09:33 UTC (rev 152426)
+++ PKGBUILD	2012-03-06 20:35:06 UTC (rev 152427)
@@ -24,7 +24,7 @@
 _bootstrap=0 # 0/1 for quick build or full bootstrap
 
 pkgver=${_java_ver}.${_openjdk_build}_${_icedtea_ver}
-pkgrel=2
+pkgrel=3
 arch=('i686' 'x86_64')
 url="http://icedtea.classpath.org"
 license=('custom')
@@ -144,7 +144,7 @@
   optdepends=('libcups: needed for Java Mauve support - libmawt.so'
               'fontconfig: needed for Java Mauve support - libmawt.so')
   provides=('java-runtime-headless=7')
-  conflicts=('java-runtime' 'openjdk6')
+  conflicts=('openjdk6')
   #  replaces=('openjdk6') # once we remove openjdk6 pkg from the repos
   backup=(etc/profile.d/jre.sh
           etc/profile.d/jre.csh