Author: kwizart Update of /cvs/nonfree/rpms/xorg-x11-drv-nvidia/devel In directory se02.es.rpmfusion.net:/tmp/cvs-serv23617 Modified Files: xorg-x11-drv-nvidia.spec Added Files: blacklist-nouveau.conf Log Message: Blacklist nouveau by default otherwise the driver will not work --- 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.spec =================================================================== RCS file: /cvs/nonfree/rpms/xorg-x11-drv-nvidia/devel/xorg-x11-drv-nvidia.spec,v retrieving revision 1.23 retrieving revision 1.24 diff -u -r1.23 -r1.24 --- xorg-x11-drv-nvidia.spec 5 Jun 2009 20:05:23 -0000 1.23 +++ xorg-x11-drv-nvidia.spec 7 Jun 2009 09:23:23 -0000 1.24 @@ -8,7 +8,7 @@ Name: xorg-x11-drv-nvidia Version: 185.18.14 -Release: 1%{?dist} +Release: 2%{?dist} Summary: NVIDIA's 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-x8... Source4: nvidia-settings.desktop Source5: nvidia-init +Source6: blacklist-nouveau.conf Source10: nvidia-config-display Source11: nvidia-README.Fedora # So we don't pull other nvidia variants @@ -229,6 +230,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 '{}' \; @@ -264,6 +269,7 @@ %files %defattr(-,root,root,-) %doc nvidiapkg/usr/share/doc/* +%config(noreplace) %{_sysconfdir}/modprobe.d/blacklist-nouveau.conf %{_initrddir}/nvidia %{_bindir}/* %{_sbindir}/* @@ -304,6 +310,9 @@ %changelog +* Sun Jun 7 2009 kwizart < kwizart at gmail.com > - 185.18.14-2 +- blacklist nouveau by default. + * Fri Jun 5 2009 kwizart < kwizart at gmail.com > - 185.18.14-1 - Update to 185.18.14 (final)