X-Git-Url: https://git.pld-linux.org/?a=blobdiff_plain;f=xorg-driver-video-nvidia.spec;h=0ad9671448f6a15131e92fefddd2767922d8e49b;hb=refs%2Ftags%2Fauto%2Fth%2Fxorg-driver-video-nvidia-173_14_12-4;hp=316a264062ba5432385c7d03cf52c70bfcb69fc2;hpb=c29343e3cca001bfaf525b917a0dd2517b0abf13;p=packages%2Fxorg-driver-video-nvidia.git

diff --git a/xorg-driver-video-nvidia.spec b/xorg-driver-video-nvidia.spec
index 316a264..0ad9671 100644
--- a/xorg-driver-video-nvidia.spec
+++ b/xorg-driver-video-nvidia.spec
@@ -19,19 +19,19 @@
 %endif
 
 %define		pname		xorg-driver-video-nvidia
-%define		rel		5
+%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:	173.14.09
+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:	02bc9536ad2800855c66684f4c981a74
+# Source0-md5:	c099b6e15ef34187571403fb017d58a1
 Source1:	http://us.download.nvidia.com/XFree86/Linux-x86_64/%{version}/NVIDIA-Linux-x86_64-%{version}-pkg2.run
-# Source1-md5:	5f174d4fa50d774df8667c1c063adfb2
+# Source1-md5:	220b8dbe64d976e0045ee875cfa33c03
 Source2:	%{pname}-xinitrc.sh
 Patch0:		X11-driver-nvidia-GL.patch
 Patch1:		X11-driver-nvidia-desktop.patch
@@ -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}
-Obsoletes:	XFree86-driver-nvidia-progs
 Suggests:	pkgconfig
+Obsoletes:	XFree86-driver-nvidia-progs
 
 %description progs
 Tools for advanced control of nVidia graphic cards.
@@ -136,17 +136,16 @@ 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
 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
 
@@ -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.
-%endif
 
 %prep
 cd %{_builddir}
@@ -177,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'
 
@@ -265,8 +263,9 @@ rm -rf $RPM_BUILD_ROOT
 cat << 'EOF'
 NOTE: You must also install kernel module for this driver to work
   kernel-video-nvidia-%{version}
-  kernel-laptop-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.
 
@@ -279,13 +278,11 @@ 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