rpms/xorg-x11-drv-nvidia-96xx/devel blacklist-nouveau.conf, NONE, 1.1 xorg-x11-drv-nvidia-96xx.spec, 1.8, 1.9

[NicolasChauvet]

Author: kwizart

Update of /cvs/nonfree/rpms/xorg-x11-drv-nvidia-96xx/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv14867

Modified Files:
	xorg-x11-drv-nvidia-96xx.spec 
Added Files:
	blacklist-nouveau.conf 
Log Message:
Fix blacklist nouveau so driver work on new install



--- 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-96xx.spec
===================================================================
RCS file: /cvs/nonfree/rpms/xorg-x11-drv-nvidia-96xx/devel/xorg-x11-drv-nvidia-96xx.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- xorg-x11-drv-nvidia-96xx.spec	3 Apr 2009 19:57:08 -0000	1.8
+++ xorg-x11-drv-nvidia-96xx.spec	7 Jun 2009 14:38:55 -0000	1.9
@@ -8,7 +8,7 @@
 
 Name:            xorg-x11-drv-nvidia-96xx
 Version:         96.43.11
-Release:         3%{?dist}
+Release:         4%{?dist}
 Summary:         NVIDIA's 96xx series 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-96xx-init
+Source6:         blacklist-nouveau.conf
 Source10:        nvidia-96xx-config-display
 Source11:        nvidia-96xx-README.Fedora
 # So we don't pull other nvidia variants
@@ -195,6 +196,10 @@
 # Install initscript
 install -D -p -m 0755 %{SOURCE5} $RPM_BUILD_ROOT%{_initrddir}/nvidia-96xx
 
+#Blacklist nouveau by F-11
+mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/modprobe.d/
+install -pm 0644 %{SOURCE6} $RPM_BUILD_ROOT%{_sysconfdir}/modprobe.d/
+
 # ld.so.conf.d file
 mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/ld.so.conf.d/
 echo "%{nvidialibdir}" > $RPM_BUILD_ROOT%{_sysconfdir}/ld.so.conf.d/nvidia-96xx-%{_lib}.conf
@@ -261,6 +266,9 @@
 
 
 %changelog
+* Sun Jun  7 2009 kwizart < kwizart at gmail.com > - 96.43.11-4
+- blacklist nouveau by default.
+
 * Fri Apr  3 2009 kwizart < kwizart at gmail.com > - 96.43.11-3
 - Fix x86 Arch for fedora >= 11