- 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 b20078c551380b234289cbc9b844f22957e19a2c..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,12 +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:       %{name}-xinitrc.sh
 Patch0:                X11-driver-nvidia-GL.patch
 Patch1:                X11-driver-nvidia-desktop.patch
 URL:           http://www.nvidia.com/object/linux.html
@@ -50,7 +51,7 @@ URL:          http://www.nvidia.com/object/linux.html
 %{?with_dist_kernel:BuildRequires:     kernel%{_alt_kernel}-module-build >= 3:2.6.7}
 %endif
 BuildRequires: %{kgcc_package}
-BuildRequires: rpmbuild(macros) >= 1.213
+BuildRequires: rpmbuild(macros) >= 1.308
 BuildRequires: sed >= 4.0
 BuildConflicts:        XFree86-nvidia
 Requires:      xorg-xserver-server
@@ -198,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
@@ -226,12 +227,13 @@ rm -rf $RPM_BUILD_ROOT
 %if %{with userspace}
 install -d $RPM_BUILD_ROOT%{_libdir}/xorg/modules/{drivers,extensions} \
        $RPM_BUILD_ROOT{%{_includedir}/GL,%{_libdir},%{_bindir},%{_mandir}/man1} \
-       $RPM_BUILD_ROOT{%{_desktopdir},%{_pixmapsdir}}
+       $RPM_BUILD_ROOT{%{_desktopdir},%{_pixmapsdir},/etc/X11/xinit/xinitrc.d}
 
 install usr/bin/nvidia-{settings,xconfig,bug-report.sh} $RPM_BUILD_ROOT%{_bindir}
 install usr/share/man/man1/nvidia-{settings,xconfig}.* $RPM_BUILD_ROOT%{_mandir}/man1
 install usr/share/applications/nvidia-settings.desktop $RPM_BUILD_ROOT%{_desktopdir}
 install usr/share/pixmaps/nvidia-settings.png $RPM_BUILD_ROOT%{_pixmapsdir}
+install %{SOURCE2} $RPM_BUILD_ROOT/etc/X11/xinit/xinitrc.d/nvidia-settings.sh
 
 for f in \
        usr/lib/tls/libnvidia-tls.so.%{version}         \
@@ -244,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
@@ -316,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}
@@ -344,6 +346,7 @@ EOF
 %attr(755,root,root) %{_bindir}/nvidia-settings
 %attr(755,root,root) %{_bindir}/nvidia-xconfig
 %attr(755,root,root) %{_bindir}/nvidia-bug-report.sh
+%attr(755,root,root) /etc/X11/xinit/xinitrc.d/*.sh
 %{_desktopdir}/nvidia-settings.desktop
 %{_mandir}/man1/nvidia-*
 %{_pixmapsdir}/nvidia-settings.png