SPECS (AC-branch): X11-driver-nvidia-legacy2.spec - src.rpm conten...

[hawk]

Author: hawk                         Date: Sat Oct 20 11:59:15 2007 GMT
Module: SPECS                         Tag: AC-branch
---- Log message:
- src.rpm contents shouldn't be arch or bcond dependent
- updated URL, removed obsolete conftest.patch, cleanup

---- Files affected:
SPECS:
   X11-driver-nvidia-legacy2.spec (1.1.2.15 -> 1.1.2.16) 

---- Diffs:

================================================================
Index: SPECS/X11-driver-nvidia-legacy2.spec
diff -u SPECS/X11-driver-nvidia-legacy2.spec:1.1.2.15 SPECS/X11-driver-nvidia-legacy2.spec:1.1.2.16
--- SPECS/X11-driver-nvidia-legacy2.spec:1.1.2.15	Thu Oct 18 14:35:21 2007
+++ SPECS/X11-driver-nvidia-legacy2.spec	Sat Oct 20 13:59:09 2007
@@ -1,9 +1,9 @@
 # $Revision$, $Date$
 # Conditional build:
 %bcond_without	dist_kernel	# without distribution kernel
+%bcond_without	up		# without up packages
 %bcond_without	smp		# without smp packages
 %bcond_without	kernel		# without kernel packages
-%bcond_without	incall		# include all tarballs
 %bcond_without	userspace	# don't build userspace programs
 %bcond_with	verbose		# verbose build (V=1)
 %bcond_with	grsec_kernel	# build for kernel-grsecurity
@@ -16,20 +16,6 @@
 %define		_min_x11	6.7.0
 %define		_rel	55
 #
-%define		need_x86	0
-%define		need_x8664	0
-%if %{with incall}
-%define		need_x86	1
-%define		need_x8664	1
-%else
-%ifarch %{ix86}
-%define		need_x86	1
-%endif
-%ifarch %{x8664}
-%define		need_x8664	1
-%endif
-%endif
-#
 
 Summary:	Linux Drivers for NVIDIA GeForce/Quadro Chips
 Summary(pl):	Sterowniki do kart graficznych NVIDIA GeForce/Quadro
@@ -38,26 +24,18 @@
 Release:	%{_rel}
 License:	nVidia Binary
 Group:		X11
-# why not pkg0!?
-%if %{need_x86}
 Source0:	http://download.nvidia.com/XFree86/Linux-x86/%{_nv_ver}/NVIDIA-Linux-x86-%{_nv_ver}-pkg1.run
 # Source0-md5:	66f8b5e243aad22162e40d0f05f0bf1e
-%endif
-%if %{need_x8664}
 Source1:	http://download.nvidia.com/XFree86/Linux-x86_64/%{_nv_ver}/NVIDIA-Linux-x86_64-%{_nv_ver}-pkg1.run
 # Source1-md5:	1cb134675bbdce8e172a0edc78618ed3
-%endif
 Source2:	%{name}-settings.desktop
 Source3:	%{name}-xinitrc.sh
 Patch0:		%{name}-GL.patch
-Patch1:		%{name}-conftest.patch
-# http://www.minion.de/files/1.0-6629/
-URL:		http://www.nvidia.com/object/linux.html
+URL:		http://www.nvidia.com/object/unix.html
 %if %{with kernel}
 %{?with_dist_kernel:BuildRequires:	kernel%{_alt_kernel}-module-build >= 3:2.6.7}
 %endif
 BuildRequires:	%{kgcc_package}
-#BuildRequires:	X11-devel >= %{_min_x11}	# disabled for now
 BuildRequires:	rpmbuild(macros) >= 1.308
 BuildRequires:	sed >= 4.0
 BuildConflicts:	XFree86-nvidia
@@ -196,7 +174,6 @@
 %setup -qDT -n NVIDIA-Linux-x86_64-%{_nv_ver}-pkg1
 %endif
 %patch0 -p1
-#%patch1 -p1
 sed -i 's:-Wpointer-arith::' usr/src/nv/Makefile.kbuild
 
 %build
@@ -253,12 +230,6 @@
 install usr/lib/libGL{,core}.so.%{version} $RPM_BUILD_ROOT%{_libdir}
 install usr/X11R6/lib/modules/extensions/libglx.so.%{version} \
 	$RPM_BUILD_ROOT%{_libdir}/modules/extensions
-%ifarch %{x8664}
-# support for running 32-bit OpenGL applications on 64-bit AMD64 Linux installations
-#install -d $RPM_BUILD_ROOT%{_libdir32}
-#install usr/lib32%{?with_tls:/tls}/libnvidia-tls.so.%{version} $RPM_BUILD_ROOT%{_libdir32}
-#install usr/lib32/libGL{,core}.so.%{version} $RPM_BUILD_ROOT%{_libdir32}
-%endif
 
 install usr/X11R6/lib/modules/drivers/nvidia_drv.so $RPM_BUILD_ROOT%{_libdir}/modules/drivers
 install usr/X11R6/lib/libXvMCNVIDIA.so.%{version} $RPM_BUILD_ROOT%{_libdir}
@@ -322,7 +293,6 @@
 %defattr(644,root,root,755)
 %doc LICENSE
 %doc usr/share/doc/{README.txt,NVIDIA_Changelog,XF86Config.sample}
-#%%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.*.*
@@ -330,14 +300,6 @@
 %dir /usr/%{_lib}/tls
 %attr(755,root,root) /usr/%{_lib}/libnvidia-tls.so.*.*.*
 %attr(755,root,root) /usr/%{_lib}/tls/libnvidia-tls.so.*.*.*
-%ifarch %{x8664}
-# support for running 32-bit OpenGL applications on 64-bit AMD64 Linux installations
-#dir %{_libdir32}
-#attr(755,root,root) %{_libdir32}/libGL.so.*.*
-#attr(755,root,root) %{_libdir32}/libGLcore.so.*.*
-#attr(755,root,root) %{_libdir32}/libXvMCNVIDIA.so.*.*
-#attr(755,root,root) %{_libdir32}/libnvidia-tls.so.*.*.*
-%endif
 %attr(755,root,root) /usr/%{_lib}/libGL.so.1
 %attr(755,root,root) /usr/%{_lib}/libGL.so
 %attr(755,root,root) %{_libdir}/modules/extensions/libglx.so*
@@ -361,7 +323,6 @@
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/libXvMCNVIDIA.so
 /usr/include/GL/*.h
-# -static
 %{_libdir}/libXvMCNVIDIA.a
 
 %files progs
@@ -379,6 +340,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.1.2.16  2007/10/20 11:59:09  hawk
+- src.rpm contents shouldn't be arch or bcond dependent
+- updated URL, removed obsolete conftest.patch, cleanup
+
 Revision 1.1.2.15  2007/10/18 12:35:21  hawk
 - updated to 96.43.01
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/X11-driver-nvidia-legacy2.spec?r1=1.1.2.15&r2=1.1.2.16&f=u