From 61cc2c7a7b821ed937a8a3aa0af41eb152e9d890 Mon Sep 17 00:00:00 2001
From: Samir <ram-z@chakra-project.org>
Date: Fri, 21 Dec 2012 16:40:31 +0000
Subject: [PATCH] fix conflict in mesa

---
 lib32-mesa/PKGBUILD | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/lib32-mesa/PKGBUILD b/lib32-mesa/PKGBUILD
index a1cb6c8..4ce1746 100644
--- a/lib32-mesa/PKGBUILD
+++ b/lib32-mesa/PKGBUILD
@@ -6,7 +6,7 @@
 pkgbase=lib32-mesa
 pkgname=('lib32-mesa' 'lib32-libgl' 'lib32-libglapi')
 pkgver=8.0.4
-pkgrel=4
+pkgrel=5
 arch=(x86_64)
 makedepends=('glproto>=1.4.12' 'pkgconfig' 'lib32-libdrm>=2.4.37' 'lib32-libxxf86vm>=1.1.0' 'lib32-libxdamage>=1.1.3' 
              'lib32-expat>=2.0.1' 'lib32-libx11>=1.3.5' 'lib32-libxt>=1.0.8' 'lib32-gcc-libs>=4.5' 'lib32-llvm>=3.0' 
@@ -112,6 +112,7 @@ package_lib32-mesa() {
 
   rm -f "${pkgdir}/usr/lib32/libglapi.so"*
   rm -f "${pkgdir}/usr/lib32/libGL.so"*
+  rm -f "${pkgdir}/usr/lib32/xorg/modules/dri/swrast_dri.so"*
   rm -rf "${pkgdir}/usr/include"
 
   install -m755 -d "${pkgdir}/usr/share/licenses/mesa"