rpms/xorg-x11-drv-nvidia-173xx/F-11 blacklist-nouveau.conf, NONE, 1.1 xorg-x11-drv-nvidia-173xx.spec, 1.7, 1.8

[NicolasChauvet]

Author: kwizart

Update of /cvs/nonfree/rpms/xorg-x11-drv-nvidia-173xx/F-11
In directory se02.es.rpmfusion.net:/tmp/cvs-serv19401

Modified Files:
	xorg-x11-drv-nvidia-173xx.spec 
Added Files:
	blacklist-nouveau.conf 
Log Message:
Fix the interaction with nouveau,



--- NEW FILE blacklist-nouveau.conf ---
# RPM Fusion blacklist for nouveau driver - you need to run as root:
# mkinitrd -f /boot/initrd-$(uname -r).img $(uname -r)
# if nouveau is loaded despite this file.
blacklist nouveau


Index: xorg-x11-drv-nvidia-173xx.spec
===================================================================
RCS file: /cvs/nonfree/rpms/xorg-x11-drv-nvidia-173xx/F-11/xorg-x11-drv-nvidia-173xx.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- xorg-x11-drv-nvidia-173xx.spec	3 Apr 2009 19:55:37 -0000	1.7
+++ xorg-x11-drv-nvidia-173xx.spec	9 Jun 2009 20:27:46 -0000	1.8
@@ -8,7 +8,7 @@
 
 Name:          xorg-x11-drv-nvidia-173xx
 Version:       173.14.18
-Release:       3%{?dist}
+Release:       4%{?dist}
 Summary:       NVIDIA's 173xx serie proprietary display driver for NVIDIA graphic cards
 
 Group:         User Interface/X Hardware Support
@@ -18,6 +18,7 @@
 Source1:       ftp://download.nvidia.com/XFree86/Linux-x86_64/%{version}/NVIDIA-Linux-x86_64-%{version}-pkg0.run
 Source4:       nvidia-settings.desktop
 Source5:       nvidia-173xx-init
+Source6:       blacklist-nouveau.conf
 Source10:      nvidia-173xx-config-display
 Source11:      nvidia-173xx-README.Fedora
 # So we don't pull other nvidia variants
@@ -208,6 +209,10 @@
 mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/ld.so.conf.d/
 echo "%{nvidialibdir}" > $RPM_BUILD_ROOT%{_sysconfdir}/ld.so.conf.d/nvidia-%{_lib}.conf
 
+#Blacklist nouveau by F-11
+mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/modprobe.d/
+install -pm 0644 %{SOURCE6} $RPM_BUILD_ROOT%{_sysconfdir}/modprobe.d/
+
 # Change perms on static libs. Can't fathom how to do it nicely above.
 find $RPM_BUILD_ROOT/%{nvidialibdir} -type f -name "*.a" -exec chmod 0644 '{}' \;
 
@@ -275,6 +280,9 @@
 
 
 %changelog
+* Sun Jun  7 2009 kwizart < kwizart at gmail.com > - 173.14.18-4
+- blacklist nouveau by default.
+
 * Fri Apr  3 2009 kwizart < kwizart at gmail.com > - 173.14.18-3
 - Fix x86 Arch for fedora >= 11