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

[Laurent Carlier]

    Date: Thursday, July 28, 2016 @ 20:03:09
  Author: lcarlier
Revision: 184580

upgpkg: lib32-mesa 12.0.1-5

fix FS#50182, remove old replaces/conflicts/provides packages

Modified:
  lib32-mesa/trunk/PKGBUILD

----------+
 PKGBUILD |   13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2016-07-28 19:51:05 UTC (rev 184579)
+++ PKGBUILD	2016-07-28 20:03:09 UTC (rev 184580)
@@ -5,7 +5,7 @@
 pkgbase=lib32-mesa
 pkgname=('lib32-mesa-vdpau' 'lib32-mesa' 'lib32-mesa-libgl')
 pkgver=12.0.1
-pkgrel=4
+pkgrel=5
 arch=('x86_64')
 makedepends=('python2-mako' 'lib32-libxml2' 'lib32-expat' 'lib32-libx11' 'glproto' 'lib32-libdrm' 'dri2proto' 'dri3proto' 'presentproto'
              'lib32-libxshmfence' 'lib32-libxxf86vm' 'lib32-libxdamage' 'gcc-multilib' 'lib32-elfutils' 'lib32-llvm' 'lib32-systemd'
@@ -97,12 +97,9 @@
            'lib32-elfutils' 'lib32-llvm-libs' 'lib32-wayland' 'lib32-libtxc_dxtn' 'lib32-expat' 'mesa')
   optdepends=('opengl-man-pages: for the OpenGL API man pages'
               'lib32-mesa-vdpau: for accelerated video playback')
-  provides=('lib32-libglapi' 'lib32-osmesa' 'lib32-libgbm'
-            'lib32-ati-dri' 'lib32-intel-dri' 'lib32-nouveau-dri' 'lib32-mesa-dri')
-  conflicts=('lib32-libglapi' 'lib32-osmesa' 'lib32-libgbm'
-            'lib32-ati-dri' 'lib32-intel-dri' 'lib32-nouveau-dri' 'lib32-mesa-dri')
-  replaces=('lib32-libglapi' 'lib32-osmesa' 'lib32-libgbm'
-            'lib32-ati-dri' 'lib32-intel-dri' 'lib32-nouveau-dri' 'lib32-mesa-dri')
+  provides=('lib32-ati-dri' 'lib32-intel-dri' 'lib32-nouveau-dri' 'lib32-mesa-dri')
+  conflicts=('lib32-ati-dri' 'lib32-intel-dri' 'lib32-nouveau-dri' 'lib32-mesa-dri')
+  replaces=('lib32-ati-dri' 'lib32-intel-dri' 'lib32-nouveau-dri' 'lib32-mesa-dri')
 
   install -m755 -d ${pkgdir}/usr/lib32/xorg/modules/dri
   # ati-dri, nouveay-dri, intel-dri, swrast
@@ -128,7 +125,7 @@
   pkgdesc="Mesa 3-D graphics library (32-bit)"
   depends=('lib32-mesa')
   provides=('lib32-libgl' 'lib32-libegl' 'lib32-libgles')
-  replaces=('lib32-libgl' 'lib32-libegl' 'lib32-libgles')
+  conflicts=('lib32-libgl' 'lib32-libegl' 'lib32-libgles')
 
   install -m755 -d ${pkgdir}/usr/lib32