rpms/xorg-x11-drv-nvidia-173xx/F-19 xorg-x11-drv-nvidia-173xx.spec, 1.25, 1.26

[Nicolas Chauvet]

Author: kwizart

Update of /cvs/nonfree/rpms/xorg-x11-drv-nvidia-173xx/F-19
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv11052

Modified Files:
	xorg-x11-drv-nvidia-173xx.spec 
Log Message:
Add back nvidia tools



Index: xorg-x11-drv-nvidia-173xx.spec
===================================================================
RCS file: /cvs/nonfree/rpms/xorg-x11-drv-nvidia-173xx/F-19/xorg-x11-drv-nvidia-173xx.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- xorg-x11-drv-nvidia-173xx.spec	5 Apr 2013 08:13:58 -0000	1.25
+++ xorg-x11-drv-nvidia-173xx.spec	13 Jul 2013 23:06:17 -0000	1.26
@@ -5,7 +5,7 @@
 
 Name:          xorg-x11-drv-nvidia-173xx
 Version:       173.14.37
-Release:       1%{?dist}
+Release:       2%{?dist}
 Summary:       NVIDIA's 173xx serie proprietary display driver for NVIDIA graphic cards
 
 Group:         User Interface/X Hardware Support
@@ -26,8 +26,12 @@
 %else
 ExclusiveArch: i386 x86_64
 %endif
-Requires:  nvidia-xconfig
-Requires:  nvidia-settings
+Obsoletes:  nvidia-xconfig < 1.0-30
+Provides:  nvidia-xconfig = %{version}-%{release}
+Obsoletes:  nvidia-settings < 1.0-34
+Provides:  nvidia-settings = %{version}-%{release}
+Obsoletes:  nvidia-settings-desktop < 1.0-34
+Provides:  nvidia-settings-desktop = %{version}-%{release}
 
 Requires:        nvidia-173xx-kmod >= %{version}
 Requires(post):  nvidia-173xx-kmod >= %{version}
@@ -293,8 +297,8 @@
 %config(noreplace) %{_sysconfdir}/modprobe.d/blacklist-nouveau.conf
 %config(noreplace) %{_sysconfdir}/X11/nvidia-173xx-xorg.conf
 #{_initrddir}/nvidia-173xx
-%exclude %{_bindir}/nvidia-settings
-%exclude %{_sbindir}/nvidia-xconfig
+%{_bindir}/nvidia-settings
+%{_sbindir}/nvidia-xconfig
 %{_bindir}/nvidia-bug-report.sh
 %{_bindir}/nvidia-smi
 #{_sbindir}/nvidia-173xx-config-display
@@ -304,8 +308,8 @@
 %{_libdir}/xorg/modules/extensions/nvidia/*.so*
 #/no_multilib
 %{_datadir}/pixmaps/*.png
-%exclude %{_mandir}/man1/nvidia-settings.*
-%exclude %{_mandir}/man1/nvidia-xconfig.*
+%{_mandir}/man1/nvidia-settings.*
+%{_mandir}/man1/nvidia-xconfig.*
 
 %files libs
 %defattr(-,root,root,-)
@@ -327,6 +331,9 @@
 
 
 %changelog
+* Sat Jul 13 2013 Nicolas Chauvet <kwizart at gmail.com> - 173.14.37-2
+- Restore nvidia-settings and nvidia-xconfig - rfbz#2852
+
 * Fri Apr 05 2013 Nicolas Chauvet <kwizart at gmail.com> - 173.14.37-1
 - Update to 173.14.37