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

[Sven-Hendrik Haase]

    Date: Monday, October 30, 2017 @ 14:54:29
  Author: svenstaro
Revision: 264795

upgpkg: lib32-nvidia-340xx-utils 340.104-2

Add lib32-nvidia-utils conflicts to lib32-nvidia-340xx-utils

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

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

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2017-10-30 14:40:55 UTC (rev 264794)
+++ PKGBUILD	2017-10-30 14:54:29 UTC (rev 264795)
@@ -6,7 +6,7 @@
 pkgbase=lib32-$_pkgbasename
 pkgname=('lib32-nvidia-340xx-utils' 'lib32-opencl-nvidia-340xx')
 pkgver=340.104
-pkgrel=1
+pkgrel=2
 arch=('x86_64')
 url="http://www.nvidia.com/"
 license=('custom')
@@ -41,7 +41,7 @@
 
     # OpenCL
     install -D -m755 "libnvidia-compiler.so.${pkgver}" "${pkgdir}/usr/lib32/libnvidia-compiler.so.${pkgver}"
-    install -D -m755 "libnvidia-opencl.so.${pkgver}" "${pkgdir}/usr/lib32/libnvidia-opencl.so.${pkgver}" 
+    install -D -m755 "libnvidia-opencl.so.${pkgver}" "${pkgdir}/usr/lib32/libnvidia-opencl.so.${pkgver}"
 
     create_links
 
@@ -52,11 +52,11 @@
 package_lib32-nvidia-340xx-utils() {
     pkgdesc="NVIDIA drivers utilities (32-bit)"
     depends=('lib32-zlib' 'lib32-gcc-libs' 'nvidia-340xx-utils')
-    conflicts=('lib32-nvidia-340xx-libgl')
+    conflicts=('lib32-nvidia-340xx-libgl' 'lib32-nvidia-utils')
     provides=('lib32-libgl' 'lib32-libegl' 'lib32-libgles' 'lib32-nvidia-340xx-libgl')
     replaces=('lib32-nvidia-340xx-libgl')
     optdepends=('lib32-opencl-nvidia-340xx')
-    
+
     cd "${_pkg}"
 
     # OpenGL libraries