rpms/xorg-x11-drv-nvidia/F-18 .cvsignore, 1.49, 1.50 00-nvidia.conf, 1.1, 1.2 sources, 1.53, 1.54 xorg-x11-drv-nvidia.spec, 1.87, 1.88

[Nicolas Chauvet]

Author: kwizart

Update of /cvs/nonfree/rpms/xorg-x11-drv-nvidia/F-18
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv28290/F-18

Modified Files:
	.cvsignore 00-nvidia.conf sources xorg-x11-drv-nvidia.spec 
Log Message:
Update to 304.64
move nvidia xorg libraries to _libdir/nvidia/xorg



Index: .cvsignore
===================================================================
RCS file: /cvs/nonfree/rpms/xorg-x11-drv-nvidia/F-18/.cvsignore,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -r1.49 -r1.50
--- .cvsignore	18 Oct 2012 22:24:03 -0000	1.49
+++ .cvsignore	8 Nov 2012 22:47:50 -0000	1.50
@@ -1 +1,2 @@
-NVIDIA-Linux-x86_64-304.60.run
+NVIDIA-Linux-x86-304.64.run
+NVIDIA-Linux-x86_64-304.64.run


Index: 00-nvidia.conf
===================================================================
RCS file: /cvs/nonfree/rpms/xorg-x11-drv-nvidia/F-18/00-nvidia.conf,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- 00-nvidia.conf	2 Nov 2010 12:02:45 -0000	1.1
+++ 00-nvidia.conf	8 Nov 2012 22:47:50 -0000	1.2
@@ -2,6 +2,6 @@
 #Do not edit
 
 Section "Files"
-	ModulePath   "@LIBDIR@/xorg/modules/extensions/nvidia"
+	ModulePath   "@LIBDIR@/nvidia/xorg"
 	ModulePath   "@LIBDIR@/xorg/modules"
 EndSection


Index: sources
===================================================================
RCS file: /cvs/nonfree/rpms/xorg-x11-drv-nvidia/F-18/sources,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -r1.53 -r1.54
--- sources	18 Oct 2012 22:59:03 -0000	1.53
+++ sources	8 Nov 2012 22:47:50 -0000	1.54
@@ -1,2 +1,2 @@
-ddb9ff46add2c29e2d4d19a5e01eb02c  NVIDIA-Linux-x86_64-304.60.run
-42b9887076b2ebcf1af5ee13bc332ccb  NVIDIA-Linux-x86-304.60.run
+6964415cf648a5f4f38117b168369de2  NVIDIA-Linux-x86-304.64.run
+a2d14786929d832ca9cf650cbad40c24  NVIDIA-Linux-x86_64-304.64.run


Index: xorg-x11-drv-nvidia.spec
===================================================================
RCS file: /cvs/nonfree/rpms/xorg-x11-drv-nvidia/F-18/xorg-x11-drv-nvidia.spec,v
retrieving revision 1.87
retrieving revision 1.88
diff -u -r1.87 -r1.88
--- xorg-x11-drv-nvidia.spec	18 Oct 2012 22:24:03 -0000	1.87
+++ xorg-x11-drv-nvidia.spec	8 Nov 2012 22:47:50 -0000	1.88
@@ -1,4 +1,5 @@
 %global        nvidialibdir      %{_libdir}/nvidia
+%global        nvidiaxorgdir     %{_libdir}/nvidia/xorg
 %global        ignoreabi         0
 
 %global	       debug_package %{nil}
@@ -6,7 +7,7 @@
 
 Name:            xorg-x11-drv-nvidia
 Epoch:           1
-Version:         304.60
+Version:         304.64
 Release:         1%{?dist}
 Summary:         NVIDIA's proprietary display driver for NVIDIA graphic cards
 
@@ -191,13 +192,13 @@
 install -p -m 0755 tls/lib*.so.%{version}      $RPM_BUILD_ROOT%{nvidialibdir}/tls/
 
 # .. but some in a different place
-install -m 0755 -d $RPM_BUILD_ROOT%{_libdir}/xorg/modules/extensions/nvidia/
-install -m 0755 -d $RPM_BUILD_ROOT%{_libdir}/xorg/modules/drivers/
+install -m 0755 -d $RPM_BUILD_ROOT%{nvidiaxorgdir}
+install -m 0755 -d $RPM_BUILD_ROOT%{nvidiaxorgdir}
 rm -f $RPM_BUILD_ROOT%{nvidialibdir}/lib{nvidia-wfb,glx,vdpau*}.so.%{version}
 
 # Finish up the special case libs
-install -p -m 0755 libnvidia-wfb.so.%{version} $RPM_BUILD_ROOT%{_libdir}/xorg/modules/extensions/nvidia/
-install -p -m 0755 libglx.so.%{version}        $RPM_BUILD_ROOT%{_libdir}/xorg/modules/extensions/nvidia/
+install -p -m 0755 libnvidia-wfb.so.%{version} $RPM_BUILD_ROOT%{nvidiaxorgdir}
+install -p -m 0755 libglx.so.%{version}        $RPM_BUILD_ROOT%{nvidiaxorgdir}
 install -p -m 0755 nvidia_drv.so               $RPM_BUILD_ROOT%{_libdir}/xorg/modules/drivers/
 install -p -m 0755 libvdpau*.so.%{version}     $RPM_BUILD_ROOT%{_libdir}/vdpau/
 install -p -m 0644 libXvMCNVIDIA.a             $RPM_BUILD_ROOT%{nvidialibdir}/
@@ -328,9 +329,9 @@
 %{_bindir}/nvidia-cuda-proxy-server
 #{_sbindir}/nvidia-config-display
 # Xorg libs that do not need to be multilib
-%dir %{_libdir}/xorg/modules/extensions/nvidia
+%dir %{nvidiaxorgdir}
+%{nvidiaxorgdir}/*.so*
 %{_libdir}/xorg/modules/drivers/nvidia_drv.so
-%{_libdir}/xorg/modules/extensions/nvidia/*.so*
 #/no_multilib
 %{_datadir}/pixmaps/*.png
 %{_mandir}/man1/nvidia-smi.*
@@ -364,6 +365,10 @@
 
 
 %changelog
+* Thu Nov 08 2012 Nicolas Chauvet <kwizart at gmail.com> - 1:304.64-1
+- Update to 304.64
+- Move nvidia xorg libraries to _libdir/nvidia/xorg - rfbz#2264
+
 * Thu Oct 18 2012 Leigh Scott <leigh123linux at googlemail.com> - 1:304.60-1
 - Update to 304.60