rpms/xorg-x11-drv-nvidia/F-12 .cvsignore, 1.18, 1.19 sources, 1.18, 1.19 xorg-x11-drv-nvidia.spec, 1.41, 1.42

Sat Mar 27 11:08:52 CET 2010

Author: kwizart

Update of /cvs/nonfree/rpms/xorg-x11-drv-nvidia/F-12
In directory se02.es.rpmfusion.net:/tmp/cvs-serv11144/F-12

Modified Files:
	.cvsignore sources xorg-x11-drv-nvidia.spec 
Log Message:
Update to 195.36.15



Index: .cvsignore
===================================================================
RCS file: /cvs/nonfree/rpms/xorg-x11-drv-nvidia/F-12/.cvsignore,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19

--- .cvsignore	12 Mar 2010 21:25:15 -0000	1.18
+++ .cvsignore	27 Mar 2010 10:08:51 -0000	1.19
@@ -1,2 +1,2 @@
-NVIDIA-Linux-x86_64-190.53-pkg0.run
-NVIDIA-Linux-x86-190.53-pkg0.run
+NVIDIA-Linux-x86-195.36.15-pkg0.run
+NVIDIA-Linux-x86_64-195.36.15-pkg0.run


Index: sources
===================================================================
RCS file: /cvs/nonfree/rpms/xorg-x11-drv-nvidia/F-12/sources,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- sources	12 Mar 2010 21:25:15 -0000	1.18
+++ sources	27 Mar 2010 10:08:51 -0000	1.19
@@ -1,2 +1,2 @@
-3d3e956366f9df0e4c64d2e0299d1029  NVIDIA-Linux-x86_64-190.53-pkg0.run
-2e80419f6f9ac16beecd839874d0c5ab  NVIDIA-Linux-x86-190.53-pkg0.run
+b09b45113585524b08b3b2acfdf4a290  NVIDIA-Linux-x86-195.36.15-pkg0.run
+82ff23e6d02b9f208c618ec17c60ca29  NVIDIA-Linux-x86_64-195.36.15-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.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- xorg-x11-drv-nvidia.spec	14 Mar 2010 10:45:34 -0000	1.41
+++ xorg-x11-drv-nvidia.spec	27 Mar 2010 10:08:51 -0000	1.42
@@ -8,8 +8,8 @@
 
 Name:            xorg-x11-drv-nvidia
 Epoch:           1
-Version:         190.53
-Release:         4%{?dist}
+Version:         195.36.15
+Release:         1%{?dist}
 Summary:         NVIDIA's proprietary display driver for NVIDIA graphic cards
 
 Group:           User Interface/X Hardware Support
@@ -48,7 +48,7 @@
 Requires:        which
 Requires:        livna-config-display >= 0.0.21
 %if 0%{?fedora} > 10 || 0%{?rhel} > 5
-Requires:        %{name}-libs%{_isa} = 1:%{version}-%{release}
+Requires:        %{name}-libs%{_isa} = %{?epoch}:%{version}-%{release}
 %else
 Requires:        %{name}-libs-%{_target_cpu} = %{version}-%{release}
 %endif
@@ -60,7 +60,7 @@
 Requires(preun): chkconfig
 
 
-Provides:        nvidia-kmod-common = 1:%{version}
+Provides:        nvidia-kmod-common = %{?epoch}:%{version}
 Conflicts:       xorg-x11-drv-nvidia-beta
 Conflicts:       xorg-x11-drv-nvidia-legacy
 Conflicts:       xorg-x11-drv-nvidia-71xx
@@ -68,7 +68,7 @@
 Conflicts:       xorg-x11-drv-nvidia-173xx
 Conflicts:       xorg-x11-drv-fglrx
 Conflicts:       xorg-x11-drv-catalyst
-Obsoletes:       nvidia-kmod < 1:%{version}
+Obsoletes:       nvidia-kmod < %{?epoch}:%{version}
 
 #Introduced in F10 for freshrpms compatibility
 Obsoletes:       nvidia-x11-drv < %{version}-%{release}
@@ -90,7 +90,7 @@
 %package devel
 Summary:         Development files for %{name}
 Group:           Development/Libraries
-Requires:        %{name}-libs-%{_target_cpu} = 1:%{version}-%{release}
+Requires:        %{name}-libs-%{_target_cpu} = %{?epoch}:%{version}-%{release}
 #Introduced in F10 when 173xx has forked to legacy serie
 Obsoletes:       xorg-x11-drv-nvidia-newest-devel < %{version}-100
 Provides:        xorg-x11-drv-nvidia-newest-devel = %{version}-101
@@ -102,12 +102,12 @@
 %package libs
 Summary:         Libraries for %{name}
 Group:           User Interface/X Hardware Support
-Requires:        %{name} = 1:%{version}-%{release}
+Requires:        %{name} = %{?epoch}:%{version}-%{release}
 Requires:        libvdpau%{_isa} >= 0.3
-Provides:        %{name}-libs-%{_target_cpu} = 1:%{version}-%{release}
+Provides:        %{name}-libs-%{_target_cpu} = %{?epoch}:%{version}-%{release}
 %ifarch %{ix86}
-Provides:        %{name}-libs-32bit = 1:%{version}-%{release}
-Obsoletes:       %{name}-libs-32bit <= 1:%{version}-%{release}
+Provides:        %{name}-libs-32bit = %{?epoch}:%{version}-%{release}
+Obsoletes:       %{name}-libs-32bit <= %{?epoch}:%{version}-%{release}
 Obsoletes:       nvidia-x11-drv-32bit < %{version}-%{release}
 Provides:        nvidia-x11-drv-32bit = %{version}-%{release}
 %endif
@@ -156,6 +156,9 @@
   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/}
@@ -228,6 +231,12 @@
 # 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
 
@@ -288,6 +297,9 @@
 %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
@@ -322,19 +334,27 @@
 %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 Mar 27 2010 Nicolas Chauvet <kwizart at fedoraproject.org> - 1:195.36.15-1
+- Update to 195.36.15
+- Use macro for Epoch
+
 * Sun Mar 14 2010 Nicolas Chauvet <kwizart at fedoraproject.org> - 1:190.53-4
 - Fix multilibs requirements
 
@@ -342,6 +362,9 @@
 - Bump Epoch - Fan problem in recent release
   http://www.nvnews.net/vbulletin/announcement.php?f=14
 
+* Sat Feb 27 2010 Nicolas Chauvet <kwizart at fedoraproject.org> - 195.36.08-1
+- Update to 195.36.08
+
 * Wed Dec 30 2009 Nicolas Chauvet <kwizart at fedoraproject.org> - 190.53-1
 - Update to 190.53
 - Switch to new libvdpau location in %%{_libdir}/vdpau

