Git-Url: 
http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=80c5bbc7b21825104707f0aaa1bff4e9da093283

commit 80c5bbc7b21825104707f0aaa1bff4e9da093283
Author: Michel Hermier <herm...@frugalware.org>
Date:   Thu Apr 8 09:34:07 2010 +0200

nvidia.sh

* Attempt to allow a clean install (ldconfig symlink issue)

diff --git a/source/include/nvidia.sh b/source/include/nvidia.sh
index 158abec..c16ceff 100644
--- a/source/include/nvidia.sh
+++ b/source/include/nvidia.sh
@@ -94,11 +94,13 @@ _F_kernelmod_scriptlet=$_F_nvidia_install
# * conflicts: add libgl, libgl-headers and libglx to conflicts
# * provides: add libgl, libgl-headers and libglx to provides
# * options: add nostrip to options
+# * removes: temporary fix for some nvidia mess, has to be removed after 
Frugalware 1.3
###
rodepends=("${rodepen...@]}" 'libvdpau' 'nvidia-settings' 'nvidia-xconfig' 
'pkgconfig' 'xorg-server>=1.7.1')
conflicts=("${conflic...@]}" 'libgl' 'libgl-headers-mesa' 'libglx')
provides=("${provid...@]}" 'libgl' 'libgl-headers-mesa' 'libglx')
options=("${optio...@]}" 'nostrip')
+removes=("${remov...@]}" '/usr/lib/libOpenCL.so.1')

if [ "$pkgname" != "nvidia" ]; then
conflicts=("${conflic...@]}" 'nvidia')
_______________________________________________
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git

Reply via email to