SPECS: xorg-driver-video-nvidia.spec - unified

[qboosh]

Author: qboosh                       Date: Wed Jul  9 19:11:25 2008 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- unified

---- Files affected:
SPECS:
   xorg-driver-video-nvidia.spec (1.159 -> 1.160) 

---- Diffs:

================================================================
Index: SPECS/xorg-driver-video-nvidia.spec
diff -u SPECS/xorg-driver-video-nvidia.spec:1.159 SPECS/xorg-driver-video-nvidia.spec:1.160
--- SPECS/xorg-driver-video-nvidia.spec:1.159	Thu Jul  3 16:00:00 2008
+++ SPECS/xorg-driver-video-nvidia.spec	Wed Jul  9 21:11:20 2008
@@ -128,8 +128,8 @@
 Summary(pl.UTF-8):	Narzędzia do zarządzania kartami graficznymi nVidia
 Group:		Applications/System
 Requires:	%{name} = %{version}-%{release}
-Obsoletes:	XFree86-driver-nvidia-progs
 Suggests:	pkgconfig
+Obsoletes:	XFree86-driver-nvidia-progs
 
 %description progs
 Tools for advanced control of nVidia graphic cards.
@@ -137,7 +137,6 @@
 %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
@@ -160,7 +159,6 @@
 %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}
@@ -280,13 +278,11 @@
 
 %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
@@ -361,6 +357,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.160  2008/07/09 19:11:20  qboosh
+- unified
+
 Revision 1.159  2008/07/03 14:00:00  blues
 - nvidia-settings tries to use pkg-config
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/xorg-driver-video-nvidia.spec?r1=1.159&r2=1.160&f=u