SPECS (DEVEL): xorg-driver-video-nvidia.spec - updated to 177.13 - merged f...

paszczus paszczus at pld-linux.org
Sat Aug 9 17:20:53 CEST 2008 

Author: paszczus                     Date: Sat Aug  9 15:20:52 2008 GMT
Module: SPECS                         Tag: DEVEL
---- Log message:
- updated to 177.13
- merged from HEAD

---- Files affected:
SPECS:
   xorg-driver-video-nvidia.spec (1.144 -> 1.144.4.1) 

---- Diffs:

================================================================
Index: SPECS/xorg-driver-video-nvidia.spec
diff -u SPECS/xorg-driver-video-nvidia.spec:1.144 SPECS/xorg-driver-video-nvidia.spec:1.144.4.1
--- SPECS/xorg-driver-video-nvidia.spec:1.144	Sat Apr 12 14:09:03 2008
+++ SPECS/xorg-driver-video-nvidia.spec	Sat Aug  9 17:20:47 2008
@@ -1,4 +1,8 @@
 # $Revision$, $Date$
+# 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
@@ -10,6 +14,10 @@
 %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
@@ -17,14 +25,14 @@
 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.08
+Version:	177.13
 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:	b809290b6c4ed638a29b850be8d19e7d
-Source1:	http://http.download.nvidia.com/XFree86/Linux-x86_64/%{version}/NVIDIA-Linux-x86_64-%{version}-pkg2.run
-# Source1-md5:	7cc3f6319df6fa62cf1666347241c22a
+Source0:	http://us.download.nvidia.com/XFree86/Linux-x86/%{version}/NVIDIA-Linux-x86-%{version}-pkg1.run
+# Source0-md5:	4a752f725a0989c513d89434a465504e
+Source1:	http://us.download.nvidia.com/XFree86/Linux-x86_64/%{version}/NVIDIA-Linux-x86_64-%{version}-pkg2.run
+# Source1-md5:	82640e1a84da050130bed8edf994f57a
 Source2:	%{pname}-xinitrc.sh
 Patch0:		X11-driver-nvidia-GL.patch
 Patch1:		X11-driver-nvidia-desktop.patch
@@ -41,7 +49,7 @@
 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
@@ -50,7 +58,7 @@
 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
@@ -120,6 +128,7 @@
 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
@@ -128,17 +137,16 @@
 %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
 
@@ -151,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}
@@ -169,7 +176,7 @@
 
 %build
 %if %{with kernel}
-cd usr/src/nv/
+cd usr/src/nv
 ln -sf Makefile.kbuild Makefile
 cat >> Makefile <<'EOF'
 
@@ -202,7 +209,7 @@
 	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}
@@ -254,10 +261,15 @@
 
 %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
@@ -267,13 +279,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
@@ -348,7 +358,94 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
-Revision 1.144  2008/04/12 12:09:03  wolf
+Revision 1.144.4.1  2008/08/09 15:20:47  paszczus
+- updated to 177.13
+- merged from HEAD
+
+Revision 1.171  2008/08/06 20:20:41  hawk
+- release 4
+
+Revision 1.170  2008/08/04 20:23:59  hawk
+- release 3
+
+Revision 1.169  2008/08/03 10:20:11  arekm
+- release 2
+
+Revision 1.168  2008/07/31 23:31:32  wolf
+- 173.14.12
+
+Revision 1.167  2008/07/28 10:21:20  glen
+- argh!
+
+Revision 1.166  2008/07/28 09:33:12  glen
+- fix for alt kernel; rel 11
+
+Revision 1.165  2008/07/27 10:53:34  arekm
+- rel 10
+
+Revision 1.164  2008/07/25 13:23:43  glen
+- let kernel require userspace, so there won't be situations when userspace is upgraded and kernel is not; rel 9
+
+Revision 1.163  2008/07/25 07:10:20  arekm
+- release 8
+
+Revision 1.162  2008/07/19 08:01:50  arekm
+- release 7
+
+Revision 1.161  2008/07/15 09:16:21  arekm
+- release 6
+
+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
+
+Revision 1.158  2008/07/02 20:44:25  arekm
+- release 5
+
+Revision 1.157  2008/07/01 16:09:39  arekm
+- release 4
+
+Revision 1.156  2008/06/26 06:46:51  arekm
+- release 3
+
+Revision 1.155  2008/06/24 11:27:28  arekm
+- release 2
+
+Revision 1.154  2008/06/17 23:10:14  vip
+- up to 173.14.09
+
+Revision 1.153  2008/06/11 15:52:14  hawk
+- release 2
+
+Revision 1.152  2008-05-31 15:08:21  hawk
+- updated to 173.14.05
+
+Revision 1.151  2008-05-24 10:08:08  hawk
+- release 5
+
+Revision 1.150  2008-05-15 13:13:50  glen
+- specific
+
+Revision 1.149  2008-05-15 13:02:48  glen
+- add todo about Mesa-libGL
+- more advanced %post message for different kernel brands
+
+Revision 1.148  2008-05-15 12:56:10  glen
+- disable debug packages if kernel only build
+
+Revision 1.147  2008-05-05 06:53:37  hawk
+- release 4
+
+Revision 1.146  2008-04-30 21:47:10  hawk
+- fix building with kernel 2.6.25
+
+Revision 1.145  2008-04-30 21:03:01  hawk
+- reverted back to stable drivers, beta branched as DEVEL (they doesn't
+  work ok, screen gets corrupted)
+
+Revision 1.144  2008-04-12 12:09:03  wolf
 - rel 1
 
 Revision 1.143  2008-04-12 12:03:17  wolf
================================================================

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

More information about the pld-cvs-commit mailing list