SPECS: xorg-driver-video-nvidia-legacy.spec - separated -static (l...

qboosh qboosh at pld-linux.org
Mon Aug 27 08:28:55 CEST 2007 

Author: qboosh                       Date: Mon Aug 27 06:28:55 2007 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- separated -static (libXvMCNVIDIA.a)
- better description for -devel
- versioned OpenGL-GLX* Provides (1.3)
- dropped OpenGL-devel-base cap; obsolete old X*-OpenGL-devel-base packages
- fixed libGL* symlinks, include libGL.so.1 symlink as ghost

---- Files affected:
SPECS:
   xorg-driver-video-nvidia-legacy.spec (1.35 -> 1.36) 

---- Diffs:

================================================================
Index: SPECS/xorg-driver-video-nvidia-legacy.spec
diff -u SPECS/xorg-driver-video-nvidia-legacy.spec:1.35 SPECS/xorg-driver-video-nvidia-legacy.spec:1.36
--- SPECS/xorg-driver-video-nvidia-legacy.spec:1.35	Mon Jul 23 20:21:16 2007
+++ SPECS/xorg-driver-video-nvidia-legacy.spec	Mon Aug 27 08:28:50 2007
@@ -3,6 +3,7 @@
 # Conditional build:
 %bcond_without	dist_kernel	# without distribution kernel
 %bcond_without	kernel		# without kernel packages
+%bcond_without	userspace	# don't build userspace programs
 %bcond_with	verbose		# verbose build (V=1)
 #
 %define		_nv_ver		1.0
@@ -35,7 +36,7 @@
 BuildConflicts:	XFree86-nvidia
 Requires:	xorg-xserver-server
 Provides:	OpenGL = 1.5
-Provides:	OpenGL-GLX
+Provides:	OpenGL-GLX = 1.3
 Provides:	xorg-xserver-libglx
 Obsoletes:	Mesa
 Obsoletes:	Mesa-libGL
@@ -74,23 +75,36 @@
 obsługiwane przez własnościowe sterowniki producenta.
 
 %package devel
-Summary:	OpenGL for X11R6 development (only gl?.h)
-Summary(pl.UTF-8):	Pliki nagłówkowe OpenGL dla systemu X11R6 (tylko gl?.h)
+Summary:	OpenGL (GL and GLX) header files
+Summary(pl.UTF-8):	Pliki nagłówkowe OpenGL (GL i GLX)
 Group:		X11/Development/Libraries
 Requires:	%{name} = %{version}-%{release}
-Provides:	OpenGL-GLX-devel
+Provides:	OpenGL-GLX-devel = 1.3
 Provides:	OpenGL-devel = 1.5
-Provides:	OpenGL-devel-base
-Obsoletes:	OpenGL-devel-base
+Obsoletes:	X11-OpenGL-devel-base
+Obsoletes:	XFree86-OpenGL-devel-base
 Obsoletes:	XFree86-driver-nvidia-devel
 Conflicts:	XFree86-OpenGL-devel < 4.3.99.902-0.3
 
 %description devel
-Base headers (only gl?.h) for OpenGL for X11R6 for nvidia drivers.
+OpenGL header files (GL and GLX only) for NVIDIA OpenGL
+implementation.
 
 %description devel -l pl.UTF-8
-Podstawowe pliki nagłówkowe (tylko gl?.h) OpenGL dla systemu X11R6 dla
-sterowników nvidii.
+Pliki nagłówkowe OpenGL (tylko GL i GLX) dla implementacji OpenGL
+firmy NVIDIA.
+
+%package static
+Summary:	Static XvMCNVIDIA library
+Summary(pl.UTF-8):	Statyczna biblioteka XvMCNVIDIA
+Group:		X11/Development/Libraries
+Requires:	%{name}-devel = %{version}-%{release}
+
+%description static
+Static XvMCNVIDIA library.
+
+%description static -l pl.UTF-8
+Statyczna biblioteka XvMCNVIDIA.
 
 %package progs
 Summary:	Tools for advanced control of nVidia graphic cards
@@ -160,10 +174,11 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT%{_libdir}/{tls,xorg/modules/{drivers,extensions}} \
-$RPM_BUILD_ROOT{%{_includedir}/GL,%{_bindir}}
+%if %{with userspace}
+install -d $RPM_BUILD_ROOT%{_libdir}/xorg/modules/{drivers,extensions} \
+	$RPM_BUILD_ROOT{%{_includedir}/GL,%{_bindir}}
 
-ln -sf $RPM_BUILD_ROOT%{_libdir} $RPM_BUILD_ROOT%{_prefix}/../lib
+#ln -sf $RPM_BUILD_ROOT%{_libdir} $RPM_BUILD_ROOT%{_prefix}/../lib
 
 install usr/bin/nvidia-settings $RPM_BUILD_ROOT%{_bindir}
 install usr/lib/libnvidia-tls.so.%{version} $RPM_BUILD_ROOT%{_libdir}
@@ -182,9 +197,14 @@
 install usr/X11R6/lib/modules/drivers/nvidia_drv.so $RPM_BUILD_ROOT%{_libdir}/xorg/modules/drivers
 install usr/include/GL/*.h	$RPM_BUILD_ROOT%{_includedir}/GL
 
-ln -sf libGL.so.%{version} $RPM_BUILD_ROOT%{_libdir}/libGL.so
 ln -sf libglx.so.%{version} $RPM_BUILD_ROOT%{_libdir}/xorg/modules/extensions/libglx.so
 ln -sf libXvMCNVIDIA.so.%{version} $RPM_BUILD_ROOT%{_libdir}/libXvMCNVIDIA.so
+ln -sf libXvMCNVIDIA.so.%{version} $RPM_BUILD_ROOT%{_libdir}/libXvMCNVIDIA_dynamic.so.1
+
+# OpenGL ABI for Linux compatibility
+ln -sf libGL.so.%{version} $RPM_BUILD_ROOT%{_libdir}/libGL.so.1
+ln -sf libGL.so.1 $RPM_BUILD_ROOT%{_libdir}/libGL.so
+%endif
 
 %if %{with kernel}
 %install_kernel_modules -m usr/src/nv/nvidia -d misc
@@ -209,38 +229,45 @@
 %postun	-n kernel%{_alt_kernel}-video-nvidia-legacy
 %depmod %{_kernel_ver}
 
+%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
+%doc LICENSE usr/share/doc/{README,NVIDIA_Changelog,XF86Config.sample}
 %attr(755,root,root) %{_libdir}/libGL.so.*.*
 %attr(755,root,root) %ghost %{_libdir}/libGL.so.1
+# symlink for binary apps which fail to conform Linux OpenGL ABI
+# (and dlopen libGL.so instead of libGL.so.1)
 %attr(755,root,root) %{_libdir}/libGL.so
 %attr(755,root,root) %{_libdir}/libGLcore.so.*.*
 %attr(755,root,root) %{_libdir}/libXvMCNVIDIA.so.*.*
+%attr(755,root,root) %{_libdir}/libXvMCNVIDIA_dynamic.so.1
 %attr(755,root,root) %{_libdir}/libnvidia-tls.so.*.*.*
-%attr(755,root,root) %{_libdir}/xorg/modules/extensions/libglx.so*
 %attr(755,root,root) %{_libdir}/xorg/modules/drivers/nvidia_drv.so
-
-%if %{with kernel}
-%files -n kernel%{_alt_kernel}-video-nvidia-legacy
-%defattr(644,root,root,755)
-/lib/modules/%{_kernel_ver}/misc/*.ko*
-%endif
+%attr(755,root,root) %{_libdir}/xorg/modules/extensions/libglx.so*
 
 %files devel
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/libXvMCNVIDIA.so
-# FIXME: include %dir or -devel: R: xorg-proto-glproto-devel
 %dir %{_includedir}/GL
-%{_includedir}/GL/*.h
-# -static
+%{_includedir}/GL/gl.h
+%{_includedir}/GL/glext.h
+%{_includedir}/GL/glx.h
+%{_includedir}/GL/glxtokens.h
+
+%files static
+%defattr(644,root,root,755)
 %{_libdir}/libXvMCNVIDIA.a
 
 %files progs
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/nvidia-settings
+%endif
+
+%if %{with kernel}
+%files -n kernel%{_alt_kernel}-video-nvidia-legacy
+%defattr(644,root,root,755)
+/lib/modules/%{_kernel_ver}/misc/*.ko*
+%endif
 
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
@@ -248,6 +275,13 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.36  2007/08/27 06:28:50  qboosh
+- separated -static (libXvMCNVIDIA.a)
+- better description for -devel
+- versioned OpenGL-GLX* Provides (1.3)
+- dropped OpenGL-devel-base cap; obsolete old X*-OpenGL-devel-base packages
+- fixed libGL* symlinks, include libGL.so.1 symlink as ghost
+
 Revision 1.35  2007/07/23 18:21:16  qboosh
 - no circular symlinks
 
================================================================

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

More information about the pld-cvs-commit mailing list