Git-Url:
http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=c08641805b7a1ed6287d217e62aabd59a8cc5ec1
commit c08641805b7a1ed6287d217e62aabd59a8cc5ec1
Author: Michel Hermier <herm...@frugalware.org>
Date: Sun Jul 5 15:56:20 2009 +0200
nvidia.sh nvidia.install
* Make nvidia package conflicts with libgl-headers.
diff --git a/source/include/nvidia.install b/source/include/nvidia.install
index 9f4d25a..ec7b9de 100644
--- a/source/include/nvidia.install
+++ b/source/include/nvidia.install
@@ -97,7 +97,7 @@ pre_remove() {
post_remove() {
/sbin/depmod -a $_F_kernelmod_uname
echo "*** Nvidia driver is removed now. To have a working Xorg Server again run
: ***"
- echo "*** pacman-g2 -S libgl libglx ****"
+ echo "*** pacman-g2 -S libgl libgl-headers libglx ****"
}
op=$1
diff --git a/source/include/nvidia.sh b/source/include/nvidia.sh
index 697475f..e119556 100644
--- a/source/include/nvidia.sh
+++ b/source/include/nvidia.sh
@@ -88,14 +88,14 @@ _F_kernelmod_scriptlet=$_F_nvidia_install
###
# == APPENDED VARIABLES
# * depends: add xorg-server and pkgconfig to depends
-# * conflicts: add libgl and libglx to conflicts
-# * provides: add ligl and libglx to provides
+# * 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.0
###
depends=(${depen...@]} 'xorg-server>=1.6.1-8' 'pkgconfig')
-conflicts=(${conflic...@]} 'libgl' 'libglx')
-provides=(${provid...@]} 'libgl' 'libglx')
+conflicts=(${conflic...@]} 'libgl' 'libgl-headers' 'libglx')
+provides=(${provid...@]} 'libgl' 'libgl-headers' 'libglx')
options=(${optio...@]} 'nostrip')
removes=(${remov...@]} 'usr/lib/libcuda.so.1' 'usr/lib/libnvidia-cfg.so.1')
_______________________________________________
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git
