Author: kwizart Update of /cvs/nonfree/rpms/xorg-x11-drv-nvidia/F-12 In directory se02.es.rpmfusion.net:/tmp/cvs-serv3268 Modified Files: .cvsignore sources xorg-x11-drv-nvidia.spec Log Message: - Bump Epoch - Fan problem in recent release http://www.nvnews.net/vbulletin/announcement.php?f=14 Index: .cvsignore =================================================================== RCS file: /cvs/nonfree/rpms/xorg-x11-drv-nvidia/F-12/.cvsignore,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- .cvsignore 27 Feb 2010 14:51:15 -0000 1.17 +++ .cvsignore 12 Mar 2010 21:25:15 -0000 1.18 @@ -1,2 +1,2 @@ -NVIDIA-Linux-x86-195.36.08-pkg0.run -NVIDIA-Linux-x86_64-195.36.08-pkg0.run +NVIDIA-Linux-x86_64-190.53-pkg0.run +NVIDIA-Linux-x86-190.53-pkg0.run Index: sources =================================================================== RCS file: /cvs/nonfree/rpms/xorg-x11-drv-nvidia/F-12/sources,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- sources 27 Feb 2010 14:51:15 -0000 1.17 +++ sources 12 Mar 2010 21:25:15 -0000 1.18 @@ -1,2 +1,2 @@ -7b78eed78b5f345af6dd1b2a83f5d44b NVIDIA-Linux-x86-195.36.08-pkg0.run -854852a02595eda776e7a67573304eeb NVIDIA-Linux-x86_64-195.36.08-pkg0.run +3d3e956366f9df0e4c64d2e0299d1029 NVIDIA-Linux-x86_64-190.53-pkg0.run +2e80419f6f9ac16beecd839874d0c5ab NVIDIA-Linux-x86-190.53-pkg0.run Index: xorg-x11-drv-nvidia.spec =================================================================== RCS file: /cvs/nonfree/rpms/xorg-x11-drv-nvidia/F-12/xorg-x11-drv-nvidia.spec,v retrieving revision 1.38 retrieving revision 1.39 diff -u -r1.38 -r1.39 --- xorg-x11-drv-nvidia.spec 27 Feb 2010 17:29:02 -0000 1.38 +++ xorg-x11-drv-nvidia.spec 12 Mar 2010 21:25:15 -0000 1.39 @@ -7,8 +7,9 @@ %endif Name: xorg-x11-drv-nvidia -Version: 195.36.08 -Release: 1%{?dist} +Epoch: 1 +Version: 190.53 +Release: 2%{?dist} Summary: NVIDIA's proprietary display driver for NVIDIA graphic cards Group: User Interface/X Hardware Support @@ -47,7 +48,7 @@ Requires: which Requires: livna-config-display >= 0.0.21 %if 0%{?fedora} > 10 || 0%{?rhel} > 5 -Requires: %{name}-libs%{_isa} = %{version}-%{release} +Requires: %{name}-libs%{_isa} = 1:%{version}-%{release} %else Requires: %{name}-libs-%{_target_cpu} = %{version}-%{release} %endif @@ -59,7 +60,7 @@ Requires(preun): chkconfig -Provides: nvidia-kmod-common = %{version} +Provides: nvidia-kmod-common = 1:%{version} Conflicts: xorg-x11-drv-nvidia-beta Conflicts: xorg-x11-drv-nvidia-legacy Conflicts: xorg-x11-drv-nvidia-71xx @@ -67,7 +68,7 @@ Conflicts: xorg-x11-drv-nvidia-173xx Conflicts: xorg-x11-drv-fglrx Conflicts: xorg-x11-drv-catalyst -Obsoletes: nvidia-kmod < %{version} +Obsoletes: nvidia-kmod < 1:%{version} #Introduced in F10 for freshrpms compatibility Obsoletes: nvidia-x11-drv < %{version}-%{release} @@ -101,12 +102,12 @@ %package libs Summary: Libraries for %{name} Group: User Interface/X Hardware Support -Requires: %{name} = %{version}-%{release} +Requires: %{name} = 1:%{version}-%{release} Requires: libvdpau%{_isa} >= 0.3 -Provides: %{name}-libs-%{_target_cpu} = %{version}-%{release} +Provides: %{name}-libs-%{_target_cpu} = 1:%{version}-%{release} %ifarch %{ix86} -Provides: %{name}-libs-32bit = %{version}-%{release} -Obsoletes: %{name}-libs-32bit <= %{version}-%{release} +Provides: %{name}-libs-32bit = 1:%{version}-%{release} +Obsoletes: %{name}-libs-32bit <= 1:%{version}-%{release} Obsoletes: nvidia-x11-drv-32bit < %{version}-%{release} Provides: nvidia-x11-drv-32bit = %{version}-%{release} %endif @@ -155,9 +156,6 @@ if [[ ! "/${file##./usr/lib/vdpau}" = "/${file}" ]] then install -D -p -m 0755 nvidiapkg/${file} $RPM_BUILD_ROOT/%{_libdir}/vdpau/${file##./usr/lib/vdpau} - elif [[ ! "/${file##./etc/OpenCL/vendors}" = "/${file}" ]] - then - install -D -p -m 0755 nvidiapkg/${file} $RPM_BUILD_ROOT/%{_sysconfdir}/OpenCL/vendors/${file##./etc/OpenCL/vendors/} elif [[ ! "/${file##./usr/lib/}" = "/${file}" ]] then install -D -p -m 0755 nvidiapkg/${file} $RPM_BUILD_ROOT/%{nvidialibdir}/${file##./usr/lib/} @@ -230,12 +228,6 @@ # This is 180.xx adds - vdpau libs and headers ln -s libvdpau_nvidia.so.%{version} $RPM_BUILD_ROOT%{_libdir}/vdpau/libvdpau_nvidia.so.1 -# This is 195.xx adds - OpenCL support -ln -s libOpenCL.so.1.0.0 $RPM_BUILD_ROOT%{nvidialibdir}/libOpenCL.so.1 -ln -s libOpenCL.so.1.0.0 $RPM_BUILD_ROOT%{nvidialibdir}/libOpenCL.so -ln -s libnvidia-compiler.so.%{version} $RPM_BUILD_ROOT%{nvidialibdir}/libnvidia-compiler.so.1 -ln -s libnvidia-compiler.so.%{version} $RPM_BUILD_ROOT%{nvidialibdir}/libnvidia-compiler.so - # X configuration script install -D -p -m 0755 %{SOURCE10} $RPM_BUILD_ROOT%{_sbindir}/nvidia-config-display @@ -296,9 +288,6 @@ %files %defattr(-,root,root,-) %doc nvidiapkg/usr/share/doc/* -%dir %{_sysconfdir}/OpenCL -%dir %{_sysconfdir}/OpenCL/vendors -%config %{_sysconfdir}/OpenCL/vendors/nvidia.icd %config(noreplace) %{_sysconfdir}/modprobe.d/blacklist-nouveau.conf %{_initrddir}/nvidia %exclude %{_bindir}/nvidia-settings @@ -333,25 +322,22 @@ %files devel %defattr(-,root,root,-) %dir %{_includedir}/nvidia -%dir %{_includedir}/nvidia/CL %dir %{_includedir}/nvidia/GL %dir %{_includedir}/nvidia/cuda %exclude %dir %{_includedir}/nvidia/vdpau -%{_includedir}/nvidia/CL/*.h %{_includedir}/nvidia/GL/*.h %{_includedir}/nvidia/cuda/*.h %exclude %{_includedir}/nvidia/vdpau/*.h %exclude %{nvidialibdir}/libXvMCNVIDIA.a %exclude %{nvidialibdir}/libcuda.so -%{nvidialibdir}/libOpenCL.so -%{nvidialibdir}/libnvidia-compiler.so %{nvidialibdir}/libGL.so %{nvidialibdir}/libXvMCNVIDIA.so %changelog -* Sat Feb 27 2010 Nicolas Chauvet <kwizart(a)fedoraproject.org&gt; - 195.36.08-1 -- Update to 195.36.08 +* Fri Mar 12 2010 Nicolas Chauvet <kwizart(a)fedoraproject.org&gt; - 1:190.53-2 +- Bump Epoch - Fan problem in recent release + http://www.nvnews.net/vbulletin/announcement.php?f=14 * Wed Dec 30 2009 Nicolas Chauvet <kwizart(a)fedoraproject.org&gt; - 190.53-1 - Update to 190.53