rpms/xorg-x11-drv-nvidia-173xx/F-11 .cvsignore, 1.6, 1.7 sources, 1.6, 1.7 xorg-x11-drv-nvidia-173xx.spec, 1.13, 1.14

[Nicolas Chauvet]

Author: kwizart

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

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



Index: .cvsignore
===================================================================
RCS file: /cvs/nonfree/rpms/xorg-x11-drv-nvidia-173xx/F-11/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	31 Aug 2009 19:52:05 -0000	1.6
+++ .cvsignore	24 Nov 2009 22:46:11 -0000	1.7
@@ -1,2 +1,2 @@
-NVIDIA-Linux-x86-173.14.20-pkg0.run
-NVIDIA-Linux-x86_64-173.14.20-pkg0.run
+NVIDIA-Linux-x86_64-173.14.22-pkg0.run
+NVIDIA-Linux-x86-173.14.22-pkg0.run


Index: sources
===================================================================
RCS file: /cvs/nonfree/rpms/xorg-x11-drv-nvidia-173xx/F-11/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	31 Aug 2009 19:52:05 -0000	1.6
+++ sources	24 Nov 2009 22:46:11 -0000	1.7
@@ -1,2 +1,2 @@
-1274759c7e17a039f322a38097de0a98  NVIDIA-Linux-x86-173.14.20-pkg0.run
-8bddf91b7a98b296e2ae2b657bc5f971  NVIDIA-Linux-x86_64-173.14.20-pkg0.run
+148d68a518348330fd8047266552776c  NVIDIA-Linux-x86_64-173.14.22-pkg0.run
+6bbf9a164cd3f8b84774c6bdca758a14  NVIDIA-Linux-x86-173.14.22-pkg0.run


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.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- xorg-x11-drv-nvidia-173xx.spec	10 Oct 2009 17:24:31 -0000	1.13
+++ xorg-x11-drv-nvidia-173xx.spec	24 Nov 2009 22:46:11 -0000	1.14
@@ -8,7 +8,7 @@
 
 Name:          xorg-x11-drv-nvidia-173xx
 Version:       173.14.20
-Release:       2%{?dist}
+Release:       3%{?dist}
 Summary:       NVIDIA's 173xx serie proprietary display driver for NVIDIA graphic cards
 
 Group:         User Interface/X Hardware Support
@@ -30,11 +30,15 @@
 %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
 %endif
+Requires:  nvidia-xconfig
+Requires:  nvidia-settings
 
 Requires:        nvidia-173xx-kmod >= %{version}
 Requires(post):  nvidia-173xx-kmod >= %{version}
@@ -253,8 +257,11 @@
 %doc nvidiapkg/usr/share/doc/*
 %config(noreplace) %{_sysconfdir}/modprobe.d/blacklist-nouveau.conf
 %{_initrddir}/nvidia-173xx
-%{_bindir}/*
-%{_sbindir}/*
+%exclude %{_bindir}/nvidia-settings
+%exclude %{_sbindir}/nvidia-xconfig
+%{_bindir}/nvidia-bug-report.sh
+%{_bindir}/nvidia-smi
+%{_sbindir}/nvidia-config-display
 # Xorg libs that do not need to be multilib
 %dir %{_libdir}/xorg/modules/extensions/nvidia
 %{_libdir}/xorg/modules/drivers/nvidia_drv.so
@@ -262,7 +269,9 @@
 #/no_multilib
 %{_datadir}/applications/*nvidia-settings.desktop
 %{_datadir}/pixmaps/*.png
-%{_mandir}/man[1-9]/nvidia*.*
+%exclude %{_mandir}/man1/nvidia-settings.*
+%exclude %{_mandir}/man1/nvidia-xconfig.*
+%{_mandir}/man1/nvidia-smi.*
 
 %files libs
 %defattr(-,root,root,-)
@@ -284,6 +293,9 @@
 
 
 %changelog
+* Tue Nov 24 2009 Nicolas Chauvet <kwizart at fedoraproject.org> - 173.14.20-3
+- Use nvidia-xconfig and nvidia-settings built from sources.
+
 * Sat Oct 10 2009 kwizart < kwizart at gmail.com > - 173.14.20-2
 - Avoid Requires/Provides of the libGL.so.1 . rfbz#859