- removed senseless provides

[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 0a6476e90d5175b47c1529449e329603aa062cb9..1562418ff9ef8d2ecbce25564f0ead3d18d334eb 100644 (file)
--- a/xorg-driver-video-nvidia.spec
+++ b/xorg-driver-video-nvidia.spec
@@ -2,13 +2,14 @@
 # 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                _min_x11        6.7.0
-%define                _rel            1
+%define                _rel            3
 #
 Summary:       Linux Drivers for nVidia TNT/TNT2/GeForce/Quadro Chips
 Summary(pl):   Sterowniki do kart graficznych nVidia TNT/TNT2/GeForce/Quadro
@@ -31,7 +32,7 @@ BuildRequires:        %{kgcc_package}
 BuildRequires: rpmbuild(macros) >= 1.153
 BuildRequires: sed >= 4.0
 BuildRequires: textutils
-Requires:      X11-driver-nvidia(kernel)
+#BuildRequires:        X11-devel >= %{_min_x11}        # disabled for now
 Requires:      X11-Xserver
 Requires:      X11-libs >= %{_min_x11}
 Requires:      X11-modules >= %{_min_x11}
@@ -40,7 +41,6 @@ Provides:     X11-OpenGL-core
 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
@@ -54,7 +54,9 @@ BuildRoot:    %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define                _noautoreqdep   libGL.so.1 libGLcore.so.1
 %define                _prefix         /usr/X11R6
-%define                _libdir32       %{_prefix}/lib32
+%ifarch amd64
+%define                _libdir32       %{_prefix}/lib
+%endif
 
 %description
 This driver set adds improved 2D functionality to the XFree86 4.0 X
@@ -97,6 +99,7 @@ sterownik
 Summary:       Tools for advanced control of nVidia graphic cards
 Summary(pl):   Narzêdzia do zarz±dzania kartami graficznymi nVidia
 Group:         Application/System
+Obsoletes:     XFree86-driver-nvidia-progs
 Requires:      %{name} = %{version}-%{release}
 
 %description progs
@@ -233,7 +236,21 @@ install nvidia-smp.ko \
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%post  -p /sbin/ldconfig
+%post  
+/sbin/ldconfig
+cat << EOF
+
+ *******************************************************
+ *                                                     *
+ *  NOTE:                                              *
+ *  You must install:                                  *
+ *  kernel-video-nvidia-%{version}-%{release}                       *
+ *  for this driver to work correctly                  *
+ *                                                     *
+ *******************************************************
+
+EOF
+
 %postun        -p /sbin/ldconfig
 
 %post  -n kernel-video-nvidia
@@ -271,6 +288,7 @@ rm -rf $RPM_BUILD_ROOT
 %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*
@@ -280,6 +298,7 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(644,root,root,755)
 /lib/modules/%{_kernel_ver}smp/misc/*.ko*
 %endif
+%endif
 
 %files devel
 %defattr(644,root,root,755)