X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;ds=sidebyside;f=xorg-driver-video-nvidia.spec;h=7c74ef267260610e69b991633128aececef675df;hb=380df383e6210a0246e89290bdfb182024cfa90f;hp=93e64ac8101e8ac34f2a29f2866db4cf432773b4;hpb=d0d9d7e68197e27780336acfb6ab570539763000;p=packages%2Fxorg-driver-video-nvidia.git

diff --git a/xorg-driver-video-nvidia.spec b/xorg-driver-video-nvidia.spec
index 93e64ac..7c74ef2 100644
--- a/xorg-driver-video-nvidia.spec
+++ b/xorg-driver-video-nvidia.spec
@@ -7,9 +7,9 @@
 %bcond_with	tls		# install libraries with tls support
 #
 %define		_nv_ver		1.0
-%define		_nv_rel		6111
+%define		_nv_rel		6629
 %define		_min_x11	6.7.0
-%define		_rel		5
+%define		_rel		0.1
 #
 Summary:	Linux Drivers for nVidia TNT/TNT2/GeForce/Quadro Chips
 Summary(pl):	Sterowniki do kart graficznych nVidia TNT/TNT2/GeForce/Quadro
@@ -19,17 +19,15 @@ Release:	%{_rel}
 License:	nVidia Binary
 Vendor:		nVidia Corp.
 Group:		X11/XFree86
+# why not pkg0!?
 Source0:	http://download.nvidia.com/XFree86/Linux-x86/%{_nv_ver}-%{_nv_rel}/NVIDIA-Linux-x86-%{_nv_ver}-%{_nv_rel}-pkg1.run
-# Source0-md5:	51e83be46f83c52102ccb8995b54f4e2
+# Source0-md5:	f7737c1e95371f37a4fd30da2f11e72c
 # Source0-size:	8167999
 Source1:	http://download.nvidia.com/XFree86/Linux-x86_64/%{_nv_ver}-%{_nv_rel}/NVIDIA-Linux-x86_64-%{_nv_ver}-%{_nv_rel}-pkg2.run
-# Source1-md5:	6c7b0c8b3ce5c34186e0c80042e6d046
+# Source1-md5:	652e69f549c81a7a3f2806daa74b9c36
 # Source1-size:	7333486
 Patch0:		%{name}-gcc34.patch
 Patch1:		%{name}-GL.patch
-Patch2:		%{name}-pci_x_class.patch
-Patch3:		%{name}-enable-pci.patch 
-Patch4:		%{name}-power-suspend.patch
 URL:		http://www.nvidia.com/object/linux.html
 BuildConflicts:	XFree86-nvidia
 BuildRequires:	grep
@@ -173,12 +171,10 @@ rm -rf NVIDIA-Linux-x86*-%{_nv_ver}-%{_nv_rel}-pkg*
 %endif
 %patch0 -p1
 %patch1 -p1
-%patch2 -p1
-%patch3 -p1
-%patch4 -p1
 sed -i 's:-Wpointer-arith::' usr/src/nv/Makefile.kbuild
 
 %build
+%if %{with kernel}
 cd usr/src/nv/
 ln -sf Makefile.kbuild Makefile
 for cfg in %{?with_dist_kernel:%{?with_smp:smp} up}%{!?with_dist_kernel:nondist}; do
@@ -193,14 +189,19 @@ for cfg in %{?with_dist_kernel:%{?with_smp:smp} up}%{!?with_dist_kernel:nondist}
 	touch include/config/MARKER
 	%{__make} -C %{_kernelsrcdir} clean \
 		RCS_FIND_IGNORE="-name '*.ko' -o -name nv-kernel.o -o" \
+		SYSSRC=%{_kernelsrcdir} \
+		SYSOUT=`pwd` \
 		M=$PWD O=$PWD \
 		%{?with_verbose:V=1}
 	%{__make} -C %{_kernelsrcdir} modules \
 		CC="%{__cc}" CPP="%{__cpp}" \
+		SYSSRC=%{_kernelsrcdir} \
+		SYSOUT=`pwd` \
 		M=$PWD O=$PWD \
 		%{?with_verbose:V=1}
 	mv nvidia.ko nvidia-$cfg.ko
 done
+%endif
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -222,7 +223,8 @@ install usr/X11R6/lib/modules/extensions/libglx.so.%{version} \
 %endif
 
 install usr/X11R6/lib/modules/drivers/nvidia_drv.o $RPM_BUILD_ROOT%{_libdir}/modules/drivers
-install usr/X11R6/lib/libXvMCNVIDIA.* $RPM_BUILD_ROOT%{_libdir}
+install usr/X11R6/lib/libXvMCNVIDIA.so.%{version} $RPM_BUILD_ROOT%{_libdir}
+install usr/X11R6/lib/libXvMCNVIDIA.a $RPM_BUILD_ROOT%{_libdir}
 install usr/include/GL/*.h	$RPM_BUILD_ROOT/usr/include/GL
 #install usr/bin/nvidia-settings $RPM_BUILD_ROOT%{_bindir}
 
@@ -279,7 +281,7 @@ EOF
 %defattr(644,root,root,755)
 %doc LICENSE
 %doc usr/share/doc/{README,NVIDIA_Changelog,XF86Config.sample}
-%lang(de) %doc usr/share/doc/README.DE
+#%%lang(de) %doc usr/share/doc/README.DE
 %attr(755,root,root) %{_libdir}/libGL.so.*.*
 %attr(755,root,root) %{_libdir}/libGL.so
 %attr(755,root,root) %{_libdir}/libGLcore.so.*.*