From f34945ce0980cd3146ebfeaaa67a66a8615605d1 Mon Sep 17 00:00:00 2001
From: Samir <ram-z@chakra-project.org>
Date: Thu, 7 Feb 2013 22:28:06 +0000
Subject: [PATCH] remove libgl conflict

---
 lib32-nvidia-utils-bumblebee/PKGBUILD | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/lib32-nvidia-utils-bumblebee/PKGBUILD b/lib32-nvidia-utils-bumblebee/PKGBUILD
index 9abed6f..96294e0 100644
--- a/lib32-nvidia-utils-bumblebee/PKGBUILD
+++ b/lib32-nvidia-utils-bumblebee/PKGBUILD
@@ -6,13 +6,13 @@
 _pkgbasename=nvidia-utils-bumblebee
 pkgname=lib32-$_pkgbasename
 pkgver=313.18
-pkgrel=1
+pkgrel=2
 pkgdesc="NVIDIA drivers utilities and libraries (32-bit). Repacked and installed in away that won't break LibGL from mesa."
 arch=('x86_64')
 url="http://www.nvidia.com/"
 depends=('lib32-libxvmc' 'lib32-zlib' 'lib32-gcc-libs' $_pkgbasename=$pkgver)
-conflicts=("lib32-nvidia-utils" "lib32-nvidia-304xx-utils" "lib32-libgl")
-provides=("lib32-nvidia-utils=${pkgver}" "lib32-libgl")
+conflicts=("lib32-nvidia-utils" "lib32-nvidia-304xx-utils")
+provides=("lib32-nvidia-utils=${pkgver}")
 license=('custom')
 options=('!strip')