%define no_install_post_strip 1
#
%define _nv_ver 1.0
-%define _nv_rel 9625
+%define _nv_rel 9629
%define _min_x11 6.7.0
-%define _rel 1
+%define _rel 0.1
#
%define need_x86 0
%define need_x8664 0
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: 0e15c3234b9c61a2e81b0c0c697f22ef
+# 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: e346c7b835dff8dadc12c5c504772ac5
+# Source1-md5: c7be950ab060dbd33a9958785f96b6e2
%endif
Source2: %{name}-xinitrc.sh
Patch0: X11-driver-nvidia-GL.patch
%{?with_dist_kernel:BuildRequires: kernel%{_alt_kernel}-module-build >= 3:2.6.7}
%endif
BuildRequires: %{kgcc_package}
-BuildRequires: rpmbuild(macros) >= 1.308
+BuildRequires: rpmbuild(macros) >= 1.326
BuildRequires: sed >= 4.0
BuildConflicts: XFree86-nvidia
Requires: xorg-xserver-server
%if %{with kernel}
cd usr/src/nv/
ln -sf Makefile.kbuild Makefile
-for cfg in %{?with_dist_kernel:%{?with_smp:smp} up}%{!?with_dist_kernel:nondist}; do
- if [ ! -r "%{_kernelsrcdir}/config-$cfg" ]; then
- exit 1
- fi
- install -d o/include/linux
- ln -sf %{_kernelsrcdir}/config-$cfg o/.config
- 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} -j1 -C %{_kernelsrcdir} O=$PWD/o prepare scripts
-%else
- install -d o/include/config
- touch o/include/config/MARKER
- ln -sf %{_kernelsrcdir}/scripts o/scripts
-%endif
- %{__make} -C %{_kernelsrcdir} clean \
- RCS_FIND_IGNORE="-name '*.ko' -o -name nv-kernel.o -o" \
- SYSSRC=%{_kernelsrcdir} \
- SYSOUT=$PWD/o \
- M=$PWD O=$PWD/o \
- %{?with_verbose:V=1}
- %{__make} -C %{_kernelsrcdir} modules \
- CC="%{__cc}" CPP="%{__cpp}" \
- SYSSRC=%{_kernelsrcdir} \
- SYSOUT=$PWD/o \
- M=$PWD O=$PWD/o \
- %{?with_verbose:V=1}
- mv nvidia.ko nvidia-$cfg.ko
-done
+%build_kernel_modules -m nvidia
%endif
%install
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 \
-# $RPM_BUILD_ROOT%{_libdir}/xorg/modules/drivers
+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
%endif
%if %{with kernel}
-cd usr/src/nv/
-install -d $RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}{,smp}/misc
-install nvidia-%{?with_dist_kernel:up}%{!?with_dist_kernel:nondist}.ko \
- $RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}/misc/nvidia.ko
-%if %{with smp} && %{with dist_kernel}
-install nvidia-smp.ko \
- $RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}smp/misc/nvidia.ko
-%endif
+%install_kernel_modules -m usr/src/nv/nvidia -d misc
%endif
%clean
%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}