- release 3

[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 4b3aff934c75d3b5b950a6e8a5bfc5a8eec13aa5..8b750141db1608db8857bf8321465c3bbc394853 100644 (file)
--- a/xorg-driver-video-nvidia.spec
+++ b/xorg-driver-video-nvidia.spec
@@ -1,3 +1,7 @@
+# TODO
+# - solve this (shouldn't there be some obsoletes?):
+#   error: xorg-driver-video-nvidia-169.12-3.i686 (cnfl Mesa-libGL) conflicts with installed Mesa-libGL-7.0.3-2.i686
+#   error: xorg-driver-video-nvidia-169.12-3.i686 (cnfl Mesa-libGL) conflicts with installed Mesa-libGL-7.0.3-2.i686
 #
 # Conditional build:
 %bcond_without dist_kernel     # without distribution kernel
@@ -9,21 +13,25 @@
 %if "%{_alt_kernel}" != "%{nil}"
 %undefine      with_userspace
 %endif
+%if %{without userspace}
+# nothing to be placed to debuginfo package
+%define                _enable_debug_packages  0
+%endif
 
 %define                pname           xorg-driver-video-nvidia
-%define                rel             2
+%define                rel             3
 
 Summary:       Linux Drivers for nVidia GeForce/Quadro Chips
 Summary(pl.UTF-8):     Sterowniki do kart graficznych nVidia GeForce/Quadro
 Name:          %{pname}%{_alt_kernel}
-Version:       169.07
+Version:       173.14.12
 Release:       %{rel}%{?with_multigl:.mgl}
 License:       nVidia Binary
 Group:         X11
 Source0:       http://us.download.nvidia.com/XFree86/Linux-x86/%{version}/NVIDIA-Linux-x86-%{version}-pkg1.run
-# Source0-md5: c4e9374dc4e7ce1a84dbfe25a800188a
+# Source0-md5: c099b6e15ef34187571403fb017d58a1
 Source1:       http://us.download.nvidia.com/XFree86/Linux-x86_64/%{version}/NVIDIA-Linux-x86_64-%{version}-pkg2.run
-# Source1-md5: 7011bafddac098c5792b7fa73e86d610
+# Source1-md5: 220b8dbe64d976e0045ee875cfa33c03
 Source2:       %{pname}-xinitrc.sh
 Patch0:                X11-driver-nvidia-GL.patch
 Patch1:                X11-driver-nvidia-desktop.patch
@@ -40,7 +48,7 @@ Requires:     xorg-xserver-server(videodrv-abi) = 2.0
 Provides:      OpenGL = 2.1
 Provides:      OpenGL-GLX = 1.4
 Provides:      xorg-xserver-libglx
-%if !%{with multigl}
+%if %{without multigl}
 Obsoletes:     Mesa
 %endif
 Obsoletes:     X11-OpenGL-core < 1:7.0.0
@@ -49,7 +57,7 @@ Obsoletes:    XFree86-OpenGL-core < 1:7.0.0
 Obsoletes:     XFree86-OpenGL-libGL < 1:7.0.0
 Obsoletes:     XFree86-driver-nvidia
 Obsoletes:     XFree86-nvidia
-%if !%{with multigl}
+%if %{without multigl}
 Conflicts:     Mesa-libGL
 %endif
 Conflicts:     XFree86-OpenGL-devel <= 4.2.0-3
@@ -119,6 +127,7 @@ Summary:    Tools for advanced control of nVidia graphic cards
 Summary(pl.UTF-8):     Narzędzia do zarządzania kartami graficznymi nVidia
 Group:         Applications/System
 Requires:      %{name} = %{version}-%{release}
+Suggests:      pkgconfig
 Obsoletes:     XFree86-driver-nvidia-progs
 
 %description progs
@@ -131,12 +140,12 @@ Narzędzia do zarządzania kartami graficznymi nVidia.
 Summary:       nVidia kernel module for nVidia Architecture support
 Summary(de.UTF-8):     Das nVidia-Kern-Modul für die nVidia-Architektur-Unterstützung
 Summary(pl.UTF-8):     Moduł jądra dla obsługi kart graficznych nVidia
-Version:       %{version}
 Release:       %{rel}@%{_kernel_ver_str}
 Group:         Base/Kernel
 Requires(post,postun): /sbin/depmod
 Requires:      dev >= 2.7.7-10
 %{?with_dist_kernel:%requires_releq_kernel}
+Requires:      %{pname} = %{version}-%{rel}
 Provides:      X11-driver-nvidia(kernel)
 Obsoletes:     XFree86-nvidia-kernel
 
@@ -166,7 +175,7 @@ echo 'EXTRA_CFLAGS += -Wno-pointer-arith -Wno-sign-compare -Wno-unused' >> usr/s
 
 %build
 %if %{with kernel}
-cd usr/src/nv/
+cd usr/src/nv
 ln -sf Makefile.kbuild Makefile
 cat >> Makefile <<'EOF'
 
@@ -199,7 +208,7 @@ for f in \
        usr/lib/libnvidia-cfg.so.%{version}             \
        usr/lib/libGL{,core}.so.%{version}              \
        usr/X11R6/lib/libXvMCNVIDIA.so.%{version}       \
-%if !%{with multigl}
+%if %{without multigl}
        usr/X11R6/lib/libXvMCNVIDIA.a                   \
 ; do
        install $f $RPM_BUILD_ROOT%{_libdir}
@@ -251,10 +260,15 @@ rm -rf $RPM_BUILD_ROOT
 
 %post
 /sbin/ldconfig
-cat << EOF
-NOTE: You must install:
-kernel-video-nvidia-%{version}
-for this driver to work
+cat << 'EOF'
+NOTE: You must also install kernel module for this driver to work
+  kernel-video-nvidia-%{version}
+  kernel-desktop-video-nvidia-%{version}
+  kernel-laptop-video-nvidia-%{version}
+  kernel-vanilla-video-nvidia-%{version}
+
+Depending on which kernel brand you use.
+
 EOF
 %if %{with multigl}
 if [ ! -e %{_libdir}/xorg/modules/extensions/libglx.so ]; then