- unified

Changed files:
    xorg-driver-video-nvidia.spec -> 1.160

diff --git a/xorg-driver-video-nvidia.spec b/xorg-driver-video-nvidia.spec
index 316a264062ba5432385c7d03cf52c70bfcb69fc2..14e4976c8c81352a4c9e1a374179401b80f78b7b 100644 (file)
--- a/xorg-driver-video-nvidia.spec
+++ b/xorg-driver-video-nvidia.spec
@@ -127,8 +127,8 @@ 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}
 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
 Suggests:      pkgconfig

+Obsoletes:     XFree86-driver-nvidia-progs

 
 %description progs
 Tools for advanced control of nVidia graphic cards.
 
 %description progs
 Tools for advanced control of nVidia graphic cards.


@@ -136,7 +136,6 @@ Tools for advanced control of nVidia graphic cards.
 %description progs -l pl.UTF-8
 Narzędzia do zarządzania kartami graficznymi nVidia.
 
 %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
 %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


@@ -159,7 +158,6 @@ 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.
 %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}
 
 %prep
 cd %{_builddir}


@@ -279,13 +277,11 @@ fi
 
 %postun        -p /sbin/ldconfig
 
 
 %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}
 %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
 
 %if %{with userspace}
 %files