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

[Laurent Carlier]

    Date: Monday, February 11, 2013 @ 08:11:49
  Author: lcarlier
Revision: 84126

upgpkg: lib32-mesa 9.0.2-3

Fix conflict with lib32-libgl and lib32-libgbm

Modified:
  lib32-mesa/trunk/PKGBUILD

----------+
 PKGBUILD |    5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2013-02-11 00:25:52 UTC (rev 84125)
+++ PKGBUILD	2013-02-11 07:11:49 UTC (rev 84126)
@@ -15,7 +15,7 @@
     pkgver=9.0.2
 fi
 
-pkgrel=2
+pkgrel=3
 arch=('x86_64')
 makedepends=('glproto>=1.4.16' 'lib32-libdrm>=2.4.39' 'lib32-libxxf86vm>=1.1.2' 'lib32-libxdamage>=1.1.3' 'lib32-expat>=2.1.0'
              'lib32-libx11>=1.5.0' 'lib32-libxt>=1.1.3' 'lib32-gcc-libs>=4.7.1-6' 'dri2proto>=2.8' 'python2' 'libxml2'
@@ -95,9 +95,6 @@
   depends=('lib32-libdrm>=2.4.39' 'lib32-libxxf86vm>=1.1.2' 'lib32-libxdamage>=1.1.3' 'lib32-expat>=2.1.0' 'lib32-libglapi'
            'libgl')
   pkgdesc="Mesa 3-D graphics library and DRI software rasterizer (32-bit)"
-  # currently disabled so force the remove
-  conflicts=('lib32-libgbm')
-  replace=('lib32-libgbm')
 
   cd ${srcdir}/?esa-*