packages (DEVEL): xorg-driver-video-nvidia/xorg-driver-video-nvidia.spec - ...

[arvenil]

Author: arvenil                      Date: Thu Sep  9 18:20:33 2010 GMT
Module: packages                      Tag: DEVEL
---- Log message:
- up to 260.19.04
- rel 0.1 (more work needed, help is appreciated)

---- Files affected:
packages/xorg-driver-video-nvidia:
   xorg-driver-video-nvidia.spec (1.282 -> 1.282.2.1) 

---- Diffs:

================================================================
Index: packages/xorg-driver-video-nvidia/xorg-driver-video-nvidia.spec
diff -u packages/xorg-driver-video-nvidia/xorg-driver-video-nvidia.spec:1.282 packages/xorg-driver-video-nvidia/xorg-driver-video-nvidia.spec:1.282.2.1
--- packages/xorg-driver-video-nvidia/xorg-driver-video-nvidia.spec:1.282	Sat Sep  4 14:22:55 2010
+++ packages/xorg-driver-video-nvidia/xorg-driver-video-nvidia.spec	Thu Sep  9 20:20:28 2010
@@ -25,25 +25,23 @@
 %endif
 
 %define		pname		xorg-driver-video-nvidia
-%define		rel		1%{?with_multigl:.mgl}
+%define		rel		0.1%{?with_multigl:.mgl}
 
 Summary:	Linux Drivers for nVidia GeForce/Quadro Chips
 Summary(hu.UTF-8):	Linux meghajtók nVidia GeForce/Quadro chipekhez
 Summary(pl.UTF-8):	Sterowniki do kart graficznych nVidia GeForce/Quadro
 Name:		%{pname}
-Version:	256.53
+Version:	260.19.04
 Release:	%{rel}
 Epoch:		1
 License:	nVidia Binary
 Group:		X11
 Source0:	http://download.nvidia.com/XFree86/Linux-x86/%{version}/NVIDIA-Linux-x86-%{version}.run
-# Source0-md5:	21fe3fe0afed7818b7adf383477b2155
+# Source0-md5:	d95ec5375a1753d60bf2dfc743fcd7ac
 Source1:	http://download.nvidia.com/XFree86/Linux-x86_64/%{version}/NVIDIA-Linux-x86_64-%{version}-no-compat32.run
-# Source1-md5:	73f08a19e00d05165cbbfc74e2fa4bdd
+# Source1-md5:	4878be6411ba205ab772ce64101e9575
 Source2:	%{pname}-xinitrc.sh
-Source3:	gl.pc.in
-Patch0:		X11-driver-nvidia-GL.patch
-Patch1:		X11-driver-nvidia-desktop.patch
+Patch0:		X11-driver-nvidia-desktop.patch
 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}
@@ -229,7 +227,6 @@
 %setup -qDT -n NVIDIA-Linux-x86_64-%{version}-no-compat32
 %endif
 %patch0 -p1
-%patch1 -p1
 echo 'EXTRA_CFLAGS += -Wno-pointer-arith -Wno-sign-compare -Wno-unused' >> kernel/Makefile.kbuild
 
 %build
@@ -250,7 +247,7 @@
 
 %if %{with userspace}
 install -d $RPM_BUILD_ROOT%{_libdir}/xorg/modules/{drivers,extensions} \
-	$RPM_BUILD_ROOT{%{_includedir}/{GL,cuda},%{_libdir}/vdpau,%{_bindir},%{_mandir}/man1} \
+	$RPM_BUILD_ROOT{%{_libdir}/vdpau,%{_bindir},%{_mandir}/man1} \
 	$RPM_BUILD_ROOT{%{_desktopdir},%{_pixmapsdir},/etc/X11/xinit/xinitrc.d}
 %if %{with multigl}
 install -d $RPM_BUILD_ROOT{%{_libdir}/nvidia,%{_sysconfdir}/ld.so.conf.d}
@@ -287,9 +284,6 @@
 install -p libnvidia-wfb.so.%{version} \
 	$RPM_BUILD_ROOT%{_libdir}/xorg/modules
 
-cp -a gl*.h $RPM_BUILD_ROOT%{_includedir}/GL
-cp -a cuda*.h $RPM_BUILD_ROOT%{_includedir}/cuda
-
 ln -sf libglx.so.%{version} $RPM_BUILD_ROOT%{_libdir}/xorg/modules/extensions/libglx.so
 ln -sf nvidia_drv.so.%{version} $RPM_BUILD_ROOT%{_libdir}/xorg/modules/drivers/nvidia_drv.so
 ln -sf libvdpau_nvidia.so.%{version} $RPM_BUILD_ROOT%{_libdir}/vdpau/libvdpau_nvidia.so.1
@@ -321,10 +315,6 @@
 %install_kernel_modules -m kernel/nvidia -d misc
 %endif
 
-install -d $RPM_BUILD_ROOT%{_pkgconfigdir}
-sed -e 's|@@prefix@@|%{_prefix}|g;s|@@libdir@@|%{_libdir}|g;s|@@includedir@@|%{_includedir}|g;s|@@version@@|%{version}|g' < %{SOURCE3} \
-	> $RPM_BUILD_ROOT%{_pkgconfigdir}/gl.pc
-
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -409,16 +399,9 @@
 
 %files devel
 %defattr(644,root,root,755)
-%dir %{_includedir}/GL
-%{_includedir}/GL/gl.h
-%{_includedir}/GL/glext.h
-%{_includedir}/GL/glx.h
-%{_includedir}/GL/glxext.h
-%{_includedir}/cuda
 %if %{with multigl}
 %attr(755,root,root) %{_libdir}/libGL.so
 %endif
-%{_pkgconfigdir}/gl.pc
 
 %files static
 %defattr(644,root,root,755)
@@ -452,6 +435,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.282.2.1  2010/09/09 18:20:28  arvenil
+- up to 260.19.04
+- rel 0.1 (more work needed, help is appreciated)
+
 Revision 1.282  2010/09/04 12:22:55  charles
 - rel. 1
 
================================================================

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