[arch-commits] Commit in nvidia-340xx-utils/trunk (PKGBUILD)

[Sven-Hendrik Haase]

    Date: Thursday, August 25, 2016 @ 00:03:51
  Author: svenstaro
Revision: 274631

upgpkg: nvidia-340xx-utils 340.96-3

proper conflict with libglvnd

Modified:
  nvidia-340xx-utils/trunk/PKGBUILD

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

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2016-08-24 23:18:11 UTC (rev 274630)
+++ PKGBUILD	2016-08-25 00:03:51 UTC (rev 274631)
@@ -6,12 +6,11 @@
 pkgbase=nvidia-340xx-utils
 pkgname=('nvidia-340xx-utils' 'nvidia-340xx-libgl' 'opencl-nvidia-340xx')
 pkgver=340.96
-pkgrel=2
+pkgrel=3
 arch=('i686' 'x86_64')
 url="http://www.nvidia.com/"
 license=('custom')
 options=('!strip')
-conflicts=('libglvnd')
 source=(nvidia-drm-outputclass.conf)
 source_i686=("ftp://download.nvidia.com/XFree86/Linux-x86/${pkgver}/NVIDIA-Linux-x86-${pkgver}.run")
 source_x86_64=("ftp://download.nvidia.com/XFree86/Linux-x86_64/${pkgver}/NVIDIA-Linux-x86_64-${pkgver}-no-compat32.run")
@@ -95,7 +94,7 @@
     optdepends=('gtk2: nvidia-settings'
                 'xorg-server-devel: nvidia-xconfig'
                 'opencl-nvidia-340xx: OpenCL support')
-    conflicts=('nvidia-utils')
+    conflicts=('nvidia-utils' 'libglvnd')
     provides=('nvidia-utils')
     install="${pkgname}.install"
     cd "${_pkg}"