%bcond_with verbose # verbose build (V=1)
#
%define _nv_ver 1.0
-%define _nv_rel 8756
+%define _nv_rel 9625
%define _min_x11 6.7.0
%define _rel 1
#
%define need_x8664 1
%endif
%endif
-#
+%if %{without kernel}
+%undefine with_dist_kernel
+%endif
+#
Summary: Linux Drivers for nVidia TNT/TNT2/GeForce/Quadro Chips
Summary(pl): Sterowniki do kart graficznych nVidia TNT/TNT2/GeForce/Quadro
Name: X11-driver-nvidia
# why not pkg0!?
%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: 67293549b90f549ca9210743eaa5b09c
+# Source0-md5: 0e15c3234b9c61a2e81b0c0c697f22ef
%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}-pkg1.run
-# Source1-md5: cbefbe43bca916f536872a994da8dcec
+# Source1-md5: df4ab1c8ce00d69c22ab5a51d5ba38b3
%endif
+Source2: %{name}-settings.desktop
+Source3: %{name}-xinitrc.sh
Patch0: %{name}-GL.patch
Patch1: %{name}-conftest.patch
# http://www.minion.de/files/1.0-6629/
URL: http://www.nvidia.com/object/linux.html
%if %{with kernel}
-%{?with_dist_kernel:BuildRequires: kernel-module-build >= 3:2.6.7}
+%{?with_dist_kernel:BuildRequires: kernel%{_alt_kernel}-module-build >= 3:2.6.7}
%endif
BuildRequires: %{kgcc_package}
#BuildRequires: X11-devel >= %{_min_x11} # disabled for now
-BuildRequires: rpmbuild(macros) >= 1.213
+BuildRequires: rpmbuild(macros) >= 1.308
BuildRequires: sed >= 4.0
BuildConflicts: XFree86-nvidia
Requires: X11-Xserver
%define _noautoreqdep libGL.so.1 libGLcore.so.1
%define _prefix /usr/X11R6
+%define _mandir %{_prefix}/man
%ifarch %{x8664}
%define _libdir32 %{_prefix}/lib
%endif
%description progs -l pl
Narzêdzia do zarz±dzania kartami graficznymi nVidia.
-%package -n kernel-video-nvidia
+%package -n kernel%{_alt_kernel}-video-nvidia
Summary: nVidia kernel module for nVidia Architecture support
Summary(de): Das nVidia-Kern-Modul für die nVidia-Architektur-Unterstützung
Summary(pl): Modu³ j±dra dla obs³ugi kart graficznych nVidia
Provides: X11-driver-nvidia(kernel)
Obsoletes: XFree86-nvidia-kernel
-%description -n kernel-video-nvidia
+%description -n kernel%{_alt_kernel}-video-nvidia
nVidia Architecture support for Linux kernel.
-%description -n kernel-video-nvidia -l de
+%description -n kernel%{_alt_kernel}-video-nvidia -l de
Die nVidia-Architektur-Unterstützung für den Linux-Kern.
-%description -n kernel-video-nvidia -l pl
+%description -n kernel%{_alt_kernel}-video-nvidia -l pl
Obs³uga architektury nVidia dla j±dra Linuksa. Pakiet wymagany przez
sterownik nVidii dla Xorg/XFree86.
-%package -n kernel-smp-video-nvidia
+%package -n kernel%{_alt_kernel}-smp-video-nvidia
Summary: nVidia kernel module for nVidia Architecture support
Summary(de): Das nVidia-Kern-Modul für die nVidia-Architektur-Unterstützung
Summary(pl): Modu³ j±dra dla obs³ugi kart graficznych nVidia
Provides: X11-driver-nvidia(kernel)
Obsoletes: XFree86-nvidia-kernel
-%description -n kernel-smp-video-nvidia
+%description -n kernel%{_alt_kernel}-smp-video-nvidia
nVidia Architecture support for Linux kernel SMP.
-%description -n kernel-smp-video-nvidia -l de
+%description -n kernel%{_alt_kernel}-smp-video-nvidia -l de
Die nVidia-Architektur-Unterstützung für den Linux-Kern SMP.
-%description -n kernel-smp-video-nvidia -l pl
+%description -n kernel%{_alt_kernel}-smp-video-nvidia -l pl
Obs³uga architektury nVidia dla j±dra Linuksa SMP. Pakiet wymagany
przez sterownik nVidii dla Xorg/XFree86.
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
%if %{with userspace}
install -d $RPM_BUILD_ROOT%{_libdir}/modules/{drivers,extensions} \
- $RPM_BUILD_ROOT{/usr/include/GL,/usr/%{_lib}/tls,%{_bindir}}
+ $RPM_BUILD_ROOT{/usr/include/GL,/usr/%{_lib}/tls,%{_bindir},%{_mandir}/man1} \
+ $RPM_BUILD_ROOT{%{_pixmapsdir},%{_desktopdir},/etc/X11/xinit/xinitrc.d}
ln -sf $RPM_BUILD_ROOT%{_libdir} $RPM_BUILD_ROOT%{_prefix}/../lib
install usr/bin/nvidia-settings $RPM_BUILD_ROOT%{_bindir}
+install usr/bin/nvidia-xconfig $RPM_BUILD_ROOT%{_bindir}
+install usr/share/pixmaps/nvidia-settings.png $RPM_BUILD_ROOT%{_pixmapsdir}
+install usr/share/man/man1/nvidia-[sx]* $RPM_BUILD_ROOT%{_mandir}/man1
+install %{SOURCE2} $RPM_BUILD_ROOT%{_desktopdir}/nvidia-settings.desktop
+install %{SOURCE3} $RPM_BUILD_ROOT/etc/X11/xinit/xinitrc.d/nvidia-settings.sh
install usr/lib/libnvidia-tls.so.%{version} $RPM_BUILD_ROOT/usr/%{_lib}
install usr/lib/tls/libnvidia-tls.so.%{version} $RPM_BUILD_ROOT/usr/%{_lib}/tls
install usr/lib/libGL{,core}.so.%{version} $RPM_BUILD_ROOT%{_libdir}
#install usr/lib32/libGL{,core}.so.%{version} $RPM_BUILD_ROOT%{_libdir32}
%endif
-install usr/X11R6/lib/modules/drivers/nvidia_drv.o $RPM_BUILD_ROOT%{_libdir}/modules/drivers
+install usr/X11R6/lib/modules/drivers/nvidia_drv.so $RPM_BUILD_ROOT%{_libdir}/modules/drivers
install usr/X11R6/lib/libXvMCNVIDIA.so.%{version} $RPM_BUILD_ROOT%{_libdir}
install usr/X11R6/lib/libXvMCNVIDIA.a $RPM_BUILD_ROOT%{_libdir}
install usr/include/GL/*.h $RPM_BUILD_ROOT/usr/include/GL
-#install usr/bin/nvidia-settings $RPM_BUILD_ROOT%{_bindir}
ln -sf libGL.so.1 $RPM_BUILD_ROOT%{_libdir}/libGL.so
ln -sf libglx.so.%{version} $RPM_BUILD_ROOT%{_libdir}/modules/extensions/libglx.so
%postun -p /sbin/ldconfig
-%post -n kernel-video-nvidia
+%post -n kernel%{_alt_kernel}-video-nvidia
%depmod %{_kernel_ver}
-%postun -n kernel-video-nvidia
+%postun -n kernel%{_alt_kernel}-video-nvidia
%depmod %{_kernel_ver}
-%post -n kernel-smp-video-nvidia
+%post -n kernel%{_alt_kernel}-smp-video-nvidia
%depmod %{_kernel_ver}smp
-%postun -n kernel-smp-video-nvidia
+%postun -n kernel%{_alt_kernel}-smp-video-nvidia
%depmod %{_kernel_ver}smp
%if %{with userspace}
%attr(755,root,root) /usr/%{_lib}/libGL.so.1
%attr(755,root,root) /usr/%{_lib}/libGL.so
%attr(755,root,root) %{_libdir}/modules/extensions/libglx.so*
-%attr(755,root,root) %{_libdir}/modules/drivers/nvidia_drv.o
+%attr(755,root,root) %{_libdir}/modules/drivers/nvidia_drv.so
%endif
%if %{with kernel}
-%files -n kernel-video-nvidia
+%files -n kernel%{_alt_kernel}-video-nvidia
%defattr(644,root,root,755)
/lib/modules/%{_kernel_ver}/misc/*.ko*
%if %{with smp} && %{with dist_kernel}
-%files -n kernel-smp-video-nvidia
+%files -n kernel%{_alt_kernel}-smp-video-nvidia
%defattr(644,root,root,755)
/lib/modules/%{_kernel_ver}smp/misc/*.ko*
%endif
%files progs
%defattr(644,root,root,755)
-%doc usr/share/doc/nvidia-settings-user-guide.txt
%attr(755,root,root) %{_bindir}/nvidia-settings
+%attr(755,root,root) %{_bindir}/nvidia-xconfig
+%attr(755,root,root) /etc/X11/xinit/xinitrc.d/*.sh
+%{_desktopdir}/*
+%{_mandir}/man1/*
+%{_pixmapsdir}/*
%endif