# Conditional build:
%bcond_without dist_kernel # without distribution kernel
%bcond_without smp # without smp packages
+%bcond_without kernel # without kernel packages
%bcond_with verbose # verbose build (V=1)
%bcond_with tls # install libraries with tls support
#
%define _nv_ver 1.0
-%define _nv_rel 6106
+%define _nv_rel 6111
%define _min_x11 6.7.0
%define _rel 2
#
Vendor: nVidia Corp.
Group: X11/XFree86
Source0: http://download.nvidia.com/XFree86/Linux-x86/%{_nv_ver}-%{_nv_rel}/NVIDIA-Linux-x86-%{_nv_ver}-%{_nv_rel}-pkg1.run
-# Source0-md5: 5432f919f0211ce36b854d87108d7db0
+# Source0-md5: 51e83be46f83c52102ccb8995b54f4e2
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: 024f21a3fa134bee8339adac64bdc77a
+# Source1-md5: 6c7b0c8b3ce5c34186e0c80042e6d046
Patch0: %{name}-gcc34.patch
URL: http://www.nvidia.com/object/linux.html
BuildConflicts: XFree86-nvidia
BuildRequires: rpmbuild(macros) >= 1.153
BuildRequires: sed >= 4.0
BuildRequires: textutils
+#BuildRequires: X11-devel >= %{_min_x11} # disabled for now
Requires: X11-Xserver
Requires: X11-libs >= %{_min_x11}
Requires: X11-modules >= %{_min_x11}
Provides: X11-OpenGL-libGL
Provides: XFree86-OpenGL-core
Provides: XFree86-OpenGL-libGL
-Provides: XFree86-driver-nvidia
Obsoletes: Mesa
Obsoletes: X11-OpenGL-core
Obsoletes: X11-OpenGL-libGL
%package progs
Summary: Tools for advanced control of nVidia graphic cards
Summary(pl): Narzêdzia do zarz±dzania kartami graficznymi nVidia
-Group: Application/System
+Group: Applications/System
+Obsoletes: XFree86-driver-nvidia-progs
Requires: %{name} = %{version}-%{release}
%description progs
%clean
rm -rf $RPM_BUILD_ROOT
-%post -p /sbin/ldconfig
-%postun -p /sbin/ldconfig
-
+%post
+/sbin/ldconfig
cat << EOF
*******************************************************
* *
* NOTE: *
* You must install: *
- * kernel-video-nvidia-%{version}-%{release} *
- * for this driver to work correctly *
- * *
+ * kernel(24)(-smp)-video-nvidia-%{version} *
+ * for this driver to work *
*******************************************************
EOF
-%postun -p /sbin/ldconfig
-
-%post st -p /sbin/ldconfig
-%postun st -p /sbin/ldconfig
+%postun -p /sbin/ldconfig
%post -n kernel-video-nvidia
%depmod %{_kernel_ver}
%attr(755,root,root) %{_libdir}/modules/extensions/libglx.so*
%attr(755,root,root) %{_libdir}/modules/drivers/nvidia_drv.o
+%if %{with kernel}
%files -n kernel-video-nvidia
%defattr(644,root,root,755)
/lib/modules/%{_kernel_ver}/misc/*.ko*
%defattr(644,root,root,755)
/lib/modules/%{_kernel_ver}smp/misc/*.ko*
%endif
+%endif
%files devel
%defattr(644,root,root,755)