SPECS (AC-branch): X11-driver-nvidia-legacy.spec - merged userspac...

Sat Oct 20 13:52:28 CEST 2007

Author: hawk                         Date: Sat Oct 20 11:52:28 2007 GMT
Module: SPECS                         Tag: AC-branch
---- Log message:
- merged userspace bcond from X11-driver-nvidia.spec, cleanup

---- Files affected:
SPECS:
   X11-driver-nvidia-legacy.spec (1.38.2.14 -> 1.38.2.15) 

---- Diffs:

================================================================
Index: SPECS/X11-driver-nvidia-legacy.spec
diff -u SPECS/X11-driver-nvidia-legacy.spec:1.38.2.14 SPECS/X11-driver-nvidia-legacy.spec:1.38.2.15

--- SPECS/X11-driver-nvidia-legacy.spec:1.38.2.14	Thu Oct 18 14:34:33 2007
+++ SPECS/X11-driver-nvidia-legacy.spec	Sat Oct 20 13:52:22 2007
@@ -5,6 +5,7 @@
 %bcond_without	up		# without up packages
 %bcond_without	smp		# without smp packages
 %bcond_without	kernel		# without kernel packages
+%bcond_without	userspace	# don't build userspace programs
 %bcond_with	verbose		# verbose build (V=1)
 %bcond_with	grsec_kernel	# build for kernel-grsecurity
 #
@@ -12,11 +13,9 @@
 %define	alt_kernel	grsecurity
 %endif
 #
-### DON'T CHANGE THIS ###############
 %define		_nv_ver		71.86.01
 %define		_min_x11	6.7.0
-#####################################
-
+#
 %define		oldname 	X11-driver-nvidia
 %define		_rel	55
 
@@ -27,7 +26,6 @@
 Release:	%{_rel}
 License:	nVidia Binary
 Group:		X11
-# why not pkg0!?
 Source0:	http://download.nvidia.com/XFree86/Linux-x86/%{_nv_ver}/NVIDIA-Linux-x86-%{_nv_ver}-pkg1.run
 # Source0-md5:	a4d0d1eb2841a59a4156122a1c08249a
 Source1:	http://download.nvidia.com/XFree86/Linux-x86_64/%{_nv_ver}/NVIDIA-Linux-x86_64-%{_nv_ver}-pkg2.run
@@ -39,7 +37,6 @@
 Patch2:		%{name}-verbose.patch
 URL:		http://www.nvidia.com/object/linux.html
 BuildRequires:	%{kgcc_package}
-#BuildRequires:	X11-devel >= %{_min_x11}	# disabled for now
 %{?with_dist_kernel:BuildRequires:	kernel%{_alt_kernel}-module-build >= 3:2.6.7}
 BuildRequires:	rpmbuild(macros) >= 1.330
 BuildRequires:	sed >= 4.0
@@ -60,7 +57,6 @@
 Obsoletes:	XFree86-OpenGL-libGL
 Obsoletes:	XFree86-driver-nvidia
 Obsoletes:	XFree86-nvidia
-#Conflicts:	%{oldname}
 Conflicts:	XFree86-OpenGL-devel <= 4.2.0-3
 ExclusiveArch:	%{ix86} %{x8664}
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -207,6 +203,8 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
+
+%if %{with userspace}
 install -d $RPM_BUILD_ROOT%{_libdir}/modules/{drivers,extensions} \
 	$RPM_BUILD_ROOT{/usr/include/GL,/usr/%{_lib}/tls,%{_bindir}} \
 	$RPM_BUILD_ROOT{%{_pixmapsdir},%{_desktopdir},/etc/X11/xinit/xinitrc.d}
@@ -222,12 +220,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.o $RPM_BUILD_ROOT%{_libdir}/modules/drivers
 install usr/X11R6/lib/libXvMCNVIDIA.so.%{version} $RPM_BUILD_ROOT%{_libdir}
@@ -241,6 +233,7 @@
 # OpenGL ABI for Linux compatibility
 ln -sf %{_libdir}/libGL.so.1 $RPM_BUILD_ROOT/usr/%{_lib}/libGL.so.1
 ln -sf %{_libdir}/libGL.so $RPM_BUILD_ROOT/usr/%{_lib}/libGL.so
+%endif
 
 %if %{with kernel}
 %install_kernel_modules -m usr/src/nv/nvidia -d misc
@@ -278,11 +271,11 @@
 %postun	-n kernel%{_alt_kernel}-smp-video-nvidia-legacy
 %depmod %{_kernel_ver}smp
 
+%if %{with userspace}
 %files
 %defattr(644,root,root,755)
 %doc LICENSE
 %doc usr/share/doc/{README,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.*.*
@@ -290,18 +283,11 @@
 %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*
 %attr(755,root,root) %{_libdir}/modules/drivers/nvidia_drv.o
+%endif
 
 %if %{with kernel}
 %files -n kernel%{_alt_kernel}-video-nvidia-legacy
@@ -315,11 +301,11 @@
 %endif
 %endif
 
+%if %{with userspace}
 %files devel
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/libXvMCNVIDIA.so
 /usr/include/GL/*.h
-# -static
 %{_libdir}/libXvMCNVIDIA.a
 
 %files progs
@@ -328,6 +314,7 @@
 %attr(755,root,root) /etc/X11/xinit/xinitrc.d/*.sh
 %{_desktopdir}/*.desktop
 %{_pixmapsdir}/*
+%endif
 
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
@@ -335,6 +322,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.38.2.15  2007/10/20 11:52:22  hawk
+- merged userspace bcond from X11-driver-nvidia.spec, cleanup
+
 Revision 1.38.2.14  2007/10/18 12:34:33  hawk
 - updated to 71.86.01
 
================================================================

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

