- up to official release 9629, it's not beta but xgl doesn't work for me

[packages/xorg-driver-video-nvidia.git] / xorg-driver-video-nvidia.spec

diff --git a/xorg-driver-video-nvidia.spec b/xorg-driver-video-nvidia.spec
index 00d8a1a2cf99349b668063f839c0e67982729d5d..f7f5b31a4bfe4533eb44c98f003a5e7a7a509f45 100644 (file)
--- a/xorg-driver-video-nvidia.spec
+++ b/xorg-driver-video-nvidia.spec
@@ -10,7 +10,7 @@
 %define                no_install_post_strip 1
 #
 %define                _nv_ver         1.0
-%define                _nv_rel         8774
+%define                _nv_rel         9629
 %define                _min_x11        6.7.0
 %define                _rel            0.1
 #
@@ -37,13 +37,13 @@ License:    nVidia Binary
 Group:         X11
 %if %{need_x86}
 Source0:       http://download.nvidia.com/XFree86/Linux-x86/%{_nv_ver}-%{_nv_rel}/NVIDIA-Linux-x86-%{_nv_ver}-%{_nv_rel}-pkg1.run
-# Source0-md5: eb01a4372096ee7799e6560cf568c1c2
+# Source0-md5: a9e6097e84a0d6310e5a71c58249ccae
 %endif
 %if %{need_x8664}
 Source1:       http://download.nvidia.com/XFree86/Linux-x86_64/%{_nv_ver}-%{_nv_rel}/NVIDIA-Linux-x86_64-%{_nv_ver}-%{_nv_rel}-pkg2.run
-# Source1-md5: 1f569a860caf1c4314444536c7e659dd
+# Source1-md5: c7be950ab060dbd33a9958785f96b6e2
 %endif
-Source2:       X11-driver-nvidia-xinitrc.sh
+Source2:       %{name}-xinitrc.sh
 Patch0:                X11-driver-nvidia-GL.patch
 Patch1:                X11-driver-nvidia-desktop.patch
 URL:           http://www.nvidia.com/object/linux.html
@@ -199,7 +199,7 @@ for cfg in %{?with_dist_kernel:%{?with_smp:smp} up}%{!?with_dist_kernel:nondist}
        ln -sf %{_kernelsrcdir}/Module.symvers-$cfg o/Module.symvers
        ln -sf %{_kernelsrcdir}/include/linux/autoconf-$cfg.h o/include/linux/autoconf.h
 %if %{with dist_kernel}
-       %{__make} -C %{_kernelsrcdir} O=$PWD/o prepare scripts
+       %{__make} -j1 -C %{_kernelsrcdir} O=$PWD/o prepare scripts
 %else
        install -d o/include/config
        touch o/include/config/MARKER
@@ -246,7 +246,7 @@ done
 
 install usr/X11R6/lib/modules/extensions/libglx.so.%{version} \
        $RPM_BUILD_ROOT%{_libdir}/xorg/modules/extensions
-install usr/X11R6/lib/modules/drivers/nvidia_drv.o \
+install usr/X11R6/lib/modules/drivers/nvidia_drv.so \
        $RPM_BUILD_ROOT%{_libdir}/xorg/modules/drivers
 
 install usr/include/GL/*.h $RPM_BUILD_ROOT%{_includedir}/GL
@@ -318,7 +318,7 @@ EOF
 %attr(755,root,root) %{_libdir}/libXvMCNVIDIA_dynamic.so.1
 %attr(755,root,root) %{_libdir}/libnvidia-tls.so.*.*.*
 %attr(755,root,root) %{_libdir}/xorg/modules/extensions/libglx.so*
-%attr(755,root,root) %{_libdir}/xorg/modules/drivers/nvidia_drv.o
+%attr(755,root,root) %{_libdir}/xorg/modules/drivers/nvidia_drv.so
 %endif
 
 %if %{with kernel}