- disable debug packages if kernel only build

[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 ffde266c087fef07c8b53428758bd3913484f79d..5c2c6b7b064cd992549a8a7d8e04aca1e7ecfcdb 100644 (file)
--- a/xorg-driver-video-nvidia.spec
+++ b/xorg-driver-video-nvidia.spec
@@ -9,24 +9,29 @@
 %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             1
+%define                rel             4
 
 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.09
+Version:       169.12
 Release:       %{rel}%{?with_multigl:.mgl}
 License:       nVidia Binary
 Group:         X11
 Source0:       http://http.download.nvidia.com/XFree86/Linux-x86/%{version}/NVIDIA-Linux-x86-%{version}-pkg1.run
-# Source0-md5: 26a7f94908bbe07a1110fd78cfa81320
+# Source0-md5: c1d45a150a90e6a11da21623493a628e
 Source1:       http://http.download.nvidia.com/XFree86/Linux-x86_64/%{version}/NVIDIA-Linux-x86_64-%{version}-pkg2.run
-# Source1-md5: 4a259f3a8a29fb8d9462f470ca42ca67
+# Source1-md5: 8d29f4541f35e10ef06e566c57500cc1
 Source2:       %{pname}-xinitrc.sh
 Patch0:                X11-driver-nvidia-GL.patch
 Patch1:                X11-driver-nvidia-desktop.patch
+Patch2:                NVIDIA_kernel-169.12-2286310.diff
 URL:           http://www.nvidia.com/object/unix.html
 %if %{with kernel}
 %{?with_dist_kernel:BuildRequires:     kernel%{_alt_kernel}-module-build >= 3:2.6.20.2}
@@ -127,6 +132,7 @@ Tools for advanced control of nVidia graphic cards.
 %description progs -l pl.UTF-8
 Narzędzia do zarządzania kartami graficznymi nVidia.
 
+%if %{with kernel}
 %package -n kernel%{_alt_kernel}-video-nvidia
 Summary:       nVidia kernel module for nVidia Architecture support
 Summary(de.UTF-8):     Das nVidia-Kern-Modul für die nVidia-Architektur-Unterstützung
@@ -149,6 +155,7 @@ Die nVidia-Architektur-Unterstützung für den Linux-Kern.
 %description -n kernel%{_alt_kernel}-video-nvidia -l pl.UTF-8
 Obsługa architektury nVidia dla jądra Linuksa. Pakiet wymagany przez
 sterownik nVidii dla Xorg/XFree86.
+%endif
 
 %prep
 cd %{_builddir}
@@ -162,6 +169,9 @@ rm -rf NVIDIA-Linux-x86*-%{version}-pkg*
 %endif
 %patch0 -p1
 %patch1 -p1
+%if "%{_kernel_ver}" >= "2.6.25"
+%patch2 -p0
+%endif
 echo 'EXTRA_CFLAGS += -Wno-pointer-arith -Wno-sign-compare -Wno-unused' >> usr/src/nv/Makefile.kbuild
 
 %build
@@ -264,11 +274,13 @@ fi
 
 %postun        -p /sbin/ldconfig
 
+%if %{with kernel}
 %post  -n kernel%{_alt_kernel}-video-nvidia
 %depmod %{_kernel_ver}
 
 %postun        -n kernel%{_alt_kernel}-video-nvidia
 %depmod %{_kernel_ver}
+%endif
 
 %if %{with userspace}
 %files