summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorDrew Walton2016-03-30 20:47:39 -0600
committerDrew Walton2016-03-30 20:47:39 -0600
commit394814c2dcbbf03326b12cc6cbe80addc5e2a95d (patch)
treec52458c94b0bffca860ce40165ae85ca3ae20e06
parentbb8f4b872958359c140cf6be017cf2a504dc8148 (diff)
downloadaur-lib32-nvidia-utils-352.tar.gz
Re-update conflict glvnd
-rw-r--r--.SRCINFO2
-rw-r--r--PKGBUILD2
2 files changed, 2 insertions, 2 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 6c58deabbd7e..194f62b23f40 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -23,7 +23,7 @@ pkgname = lib32-nvidia-libgl-352
provides = lib32-nvidia-libgl
conflicts = lib32-libgl
conflicts = lib32-nvidia-libgl
- conflicts = libglvnd
+ conflicts = lib32-libglvnd
replaces = lib32-nvidia-utils<=313.26-1
pkgname = lib32-opencl-nvidia-352
diff --git a/PKGBUILD b/PKGBUILD
index 9499e27ac818..5913f390c10d 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -54,7 +54,7 @@ package_lib32-nvidia-libgl-352() {
pkgdesc="NVIDIA drivers libraries symlinks (32-bit)"
depends=('lib32-nvidia-utils-352')
replaces=('lib32-nvidia-utils<=313.26-1')
- conflicts=('lib32-libgl' 'lib32-nvidia-libgl' 'libglvnd')
+ conflicts=('lib32-libgl' 'lib32-nvidia-libgl' 'lib32-libglvnd')
provides=('lib32-libgl' 'lib32-nvidia-libgl')
cd "${_pkg}"