rpms/xorg-x11-drv-nvidia-96xx/F-11 .cvsignore, 1.5, 1.6 blacklist-nouveau.conf, 1.1, 1.2 sources, 1.5, 1.6 xorg-x11-drv-nvidia-96xx.spec, 1.12, 1.13

[Nicolas Chauvet]

Author: kwizart

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

Modified Files:
	.cvsignore blacklist-nouveau.conf sources 
	xorg-x11-drv-nvidia-96xx.spec 
Log Message:
- Use nvidia-xconfig and nvidia-settings built from sources.



Index: .cvsignore
===================================================================
RCS file: /cvs/nonfree/rpms/xorg-x11-drv-nvidia-96xx/F-11/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	31 Aug 2009 20:12:06 -0000	1.5
+++ .cvsignore	24 Nov 2009 22:37:44 -0000	1.6
@@ -1,2 +1,2 @@
-NVIDIA-Linux-x86_64-96.43.13-pkg0.run
-NVIDIA-Linux-x86-96.43.13-pkg0.run
+NVIDIA-Linux-x86_64-96.43.14-pkg0.run
+NVIDIA-Linux-x86-96.43.14-pkg0.run


Index: blacklist-nouveau.conf
===================================================================
RCS file: /cvs/nonfree/rpms/xorg-x11-drv-nvidia-96xx/F-11/blacklist-nouveau.conf,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- blacklist-nouveau.conf	9 Jun 2009 20:39:47 -0000	1.1
+++ blacklist-nouveau.conf	24 Nov 2009 22:37:44 -0000	1.2
@@ -1,4 +1,4 @@
 # RPM Fusion blacklist for nouveau driver - you need to run as root:
-# mkinitrd -f /boot/initrd-$(uname -r).img $(uname -r)
+# dracut -f /boot/initramfs-$(uname -r).img $(uname -r)
 # if nouveau is loaded despite this file.
 blacklist nouveau


Index: sources
===================================================================
RCS file: /cvs/nonfree/rpms/xorg-x11-drv-nvidia-96xx/F-11/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	31 Aug 2009 20:12:06 -0000	1.5
+++ sources	24 Nov 2009 22:37:44 -0000	1.6
@@ -1,2 +1,2 @@
-200f4aac06a9b9d8c2fb6cf5b08c2443  NVIDIA-Linux-x86_64-96.43.13-pkg0.run
-ed4a1f2e22e900aecc693fb3e3c4fde3  NVIDIA-Linux-x86-96.43.13-pkg0.run
+6924d94b07163d7d71b44f53471dfb83  NVIDIA-Linux-x86_64-96.43.14-pkg0.run
+4c1524c5f88e684bb1045ca759c11526  NVIDIA-Linux-x86-96.43.14-pkg0.run


Index: xorg-x11-drv-nvidia-96xx.spec
===================================================================
RCS file: /cvs/nonfree/rpms/xorg-x11-drv-nvidia-96xx/F-11/xorg-x11-drv-nvidia-96xx.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- xorg-x11-drv-nvidia-96xx.spec	10 Oct 2009 17:27:05 -0000	1.12
+++ xorg-x11-drv-nvidia-96xx.spec	24 Nov 2009 22:37:44 -0000	1.13
@@ -8,7 +8,7 @@
 
 Name:            xorg-x11-drv-nvidia-96xx
 Version:         96.43.13
-Release:         2%{?dist}
+Release:         3%{?dist}
 Summary:         NVIDIA's 96xx series proprietary display driver for NVIDIA graphic cards
 
 Group:           User Interface/X Hardware Support
@@ -30,7 +30,9 @@
 %define          __find_provides %{SOURCE92}
 
 BuildRoot:       %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-%if 0%{?fedora} >= 11
+%if 0%{?fedora} > 11 || 0%{?rhel} > 5
+ExclusiveArch: i686 x86_64
+%else 0%{?fedora} == 11
 ExclusiveArch: i586 x86_64
 %else
 ExclusiveArch: i386 x86_64
@@ -270,6 +272,9 @@
 
 
 %changelog
+* Tue Nov 24 2009 Nicolas Chauvet <kwizart at fedoraproject.org> - 96.43.14-3
+- Use nvidia-xconfig and nvidia-settings built from sources.
+
 * Sat Oct 10 2009 kwizart < kwizart at gmail.com > - 96.43.13-2
 - Avoid Requires/Provides of the libGL.so.1 . rfbz#859