Author: kwizart Update of /cvs/nonfree/rpms/xorg-x11-drv-nvidia-173xx/F-18 In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv26806/F-18 Modified Files: .cvsignore sources xorg-x11-drv-nvidia-173xx.spec Log Message: Sync with F-19 Index: .cvsignore =================================================================== RCS file: /cvs/nonfree/rpms/xorg-x11-drv-nvidia-173xx/F-18/.cvsignore,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- .cvsignore 16 Nov 2012 15:14:30 -0000 1.9 +++ .cvsignore 18 Jul 2013 07:53:59 -0000 1.10 @@ -1,2 +1,2 @@ -NVIDIA-Linux-x86-173.14.36-pkg0.run -NVIDIA-Linux-x86_64-173.14.36-pkg0.run +NVIDIA-Linux-x86-173.14.37-pkg0.run +NVIDIA-Linux-x86_64-173.14.37-pkg0.run Index: sources =================================================================== RCS file: /cvs/nonfree/rpms/xorg-x11-drv-nvidia-173xx/F-18/sources,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- sources 16 Nov 2012 15:14:30 -0000 1.10 +++ sources 18 Jul 2013 07:53:59 -0000 1.11 @@ -1,2 +1,2 @@ -513677824e9684dd34ca17ad56a68500 NVIDIA-Linux-x86-173.14.36-pkg0.run -c341612429c2885980103b40542cb2b2 NVIDIA-Linux-x86_64-173.14.36-pkg0.run +ca80332b4e27d21108ceab9314420b9b NVIDIA-Linux-x86-173.14.37-pkg0.run +761fec0664e715df35cdb64cd4b087f4 NVIDIA-Linux-x86_64-173.14.37-pkg0.run Index: xorg-x11-drv-nvidia-173xx.spec =================================================================== RCS file: /cvs/nonfree/rpms/xorg-x11-drv-nvidia-173xx/F-18/xorg-x11-drv-nvidia-173xx.spec,v retrieving revision 1.24 retrieving revision 1.25 diff -u -r1.24 -r1.25 --- xorg-x11-drv-nvidia-173xx.spec 16 Nov 2012 15:14:30 -0000 1.24 +++ xorg-x11-drv-nvidia-173xx.spec 18 Jul 2013 07:53:59 -0000 1.25 @@ -4,8 +4,8 @@ %global __strip /bin/true Name: xorg-x11-drv-nvidia-173xx -Version: 173.14.36 -Release: 1%{?dist} +Version: 173.14.37 +Release: 4%{?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} @@ -63,12 +67,12 @@ %{?filter_setup: %filter_from_provides /^libnvidia/d; -%filter_from_provides /^libGLCore\.so/d; +%filter_from_provides /^libGLcore\.so/d; %filter_from_provides /^libGL\.so/d; %filter_from_provides /^libXvMCNVIDIA_dynamic\.so\.1/d; %filter_from_provides /^libglx\.so/d; %filter_from_requires /^libnvidia/d; -%filter_from_requires /^libGLCore\.so/d; +%filter_from_requires /^libGLcore\.so/d; %filter_from_requires /^libGL\.so/d; %filter_from_requires /^libXvMCNVIDIA_dynamic\.so\.1/d; %filter_from_requires /^libglx\.so/d; @@ -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,16 @@ %changelog +* Mon Jul 15 2013 Nicolas Chauvet <kwizart(a)gmail.com&gt; - 173.14.37-4 +- Avoid a Virtual Provides for legacy series +- Fix typo with libGLcore filter + +* Sat Jul 13 2013 Nicolas Chauvet <kwizart(a)gmail.com&gt; - 173.14.37-2 +- Restore nvidia-settings and nvidia-xconfig - rfbz#2852 + +* Fri Apr 05 2013 Nicolas Chauvet <kwizart(a)gmail.com&gt; - 173.14.37-1 +- Update to 173.14.37 + * Fri Nov 16 2012 Leigh Scott <leigh123linux(a)googlemail.com&gt; - 173.14.36-1 - Update to 173.14.36 - Adds support for xserver ABI 13 (xorg-server 1.13)