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

commit 86c9dde6302b68b53e6b0fc812ccd0d7685f3c54
Author: Michel Hermier <herm...@frugalware.org>
Date:   Mon Mar 21 08:55:54 2011 +0100

nvidia.sh

* Remove some old fixes.

diff --git a/source/include/nvidia.sh b/source/include/nvidia.sh
index 417fc5a..cdb295a 100644
--- a/source/include/nvidia.sh
+++ b/source/include/nvidia.sh
@@ -93,13 +93,11 @@ _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=("${rodepends[@]}" 'libvdpau' 'nvidia-settings' 'nvidia-xconfig' 
'pkgconfig' 'xorg-server>=1.9.0')
conflicts=("${conflicts[@]}" 'libgl' 'libgl-headers-mesa' 'libglx')
provides=("${provides[@]}" 'libgl' 'libgl-headers-mesa' 'libglx')
options=("${options[@]}" 'nostrip')
-removes=("${removes[@]}" '/usr/lib/libOpenCL.so.1')

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

Reply via email to