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

Mon Aug 27 08:09:43 CEST 2007

Author: qboosh                       Date: Mon Aug 27 06:09:42 2007 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- separated -static (libXvMCNVIDIA.a)
- better description for -devel
- versioned OpenGL-GLX* Provides (1.4)
- 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-legacy2.spec (1.14 -> 1.15) 

---- Diffs:

================================================================
Index: SPECS/xorg-driver-video-nvidia-legacy2.spec
diff -u SPECS/xorg-driver-video-nvidia-legacy2.spec:1.14 SPECS/xorg-driver-video-nvidia-legacy2.spec:1.15

--- SPECS/xorg-driver-video-nvidia-legacy2.spec:1.14	Tue Jun 26 18:24:03 2007
+++ SPECS/xorg-driver-video-nvidia-legacy2.spec	Mon Aug 27 08:09:37 2007
@@ -54,7 +54,7 @@
 BuildConflicts:	XFree86-nvidia
 Requires:	xorg-xserver-server
 Provides:	OpenGL = 1.5
-Provides:	OpenGL-GLX
+Provides:	OpenGL-GLX = 1.4
 Provides:	xorg-xserver-libglx
 Obsoletes:	Mesa
 Obsoletes:	Mesa-libGL
@@ -113,23 +113,36 @@
 pakietu xorg-driver-video-nvidia-legacy.
 
 %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.4
 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
@@ -221,22 +234,16 @@
         $RPM_BUILD_ROOT%{_libdir}/xorg/modules/extensions
 install usr/X11R6/lib/modules/drivers/nvidia_drv.so \
         $RPM_BUILD_ROOT%{_libdir}/xorg/modules/drivers
-#install usr/X11R6/lib/modules/libnvidia-wfb.so.%{version} \
-#        $RPM_BUILD_ROOT%{_libdir}/xorg/modules
 
 install usr/include/GL/*.h $RPM_BUILD_ROOT%{_includedir}/GL
 
-ln -sf libGL.so.1 $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
-#ln -sf libnvidia-wfb.so.%{version} $RPM_BUILD_ROOT%{_libdir}/xorg/modules/wfb.so
 
 # OpenGL ABI for Linux compatibility
 ln -sf libGL.so.%{version} $RPM_BUILD_ROOT%{_libdir}/libGL.so.1
-ln -sf %{_libdir}/libGL.so.1 $RPM_BUILD_ROOT%{_prefix}/%{_lib}/libGL.so.1
-ln -sf %{_libdir}/libGL.so.1 $RPM_BUILD_ROOT%{_prefix}/%{_lib}/libGL.so
-
+ln -sf libGL.so.1 $RPM_BUILD_ROOT%{_libdir}/libGL.so
 %endif
 
 %if %{with kernel}
@@ -267,11 +274,11 @@
 %defattr(644,root,root,755)
 %doc LICENSE
 %doc usr/share/doc/{README.txt,NVIDIA_Changelog,XF86Config.sample,html}
-# OpenGL ABI for Linux compatibility
-%attr(755,root,root) %{_libdir}/libGL.so
-%attr(755,root,root) %{_libdir}/libGL.so.1
-#
 %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
@@ -279,20 +286,17 @@
 %attr(755,root,root) %{_libdir}/libnvidia-tls.so.*.*.*
 %attr(755,root,root) %{_libdir}/xorg/modules/drivers/nvidia_drv.so
 %attr(755,root,root) %{_libdir}/xorg/modules/extensions/libglx.so*
-%endif
-
-%if %{with kernel}
-%files -n kernel%{_alt_kernel}-video-nvidia-legacy2
-%defattr(644,root,root,755)
-/lib/modules/%{_kernel_ver}/misc/*.ko*
-%endif
 
-%if %{with userspace}
 %files devel
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/libXvMCNVIDIA.so
-%{_includedir}/GL/*.h
-# -static
+%{_includedir}/GL/gl.h
+%{_includedir}/GL/glext.h
+%{_includedir}/GL/glx.h
+%{_includedir}/GL/glxext.h
+
+%files static
+%defattr(644,root,root,755)
 %{_libdir}/libXvMCNVIDIA.a
 
 %files progs
@@ -305,12 +309,25 @@
 %{_pixmapsdir}/nvidia-settings.png
 %endif
 
+%if %{with kernel}
+%files -n kernel%{_alt_kernel}-video-nvidia-legacy2
+%defattr(644,root,root,755)
+/lib/modules/%{_kernel_ver}/misc/*.ko*
+%endif
+
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
 * %{date} PLD Team <feedback at pld-linux.org>
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.15  2007/08/27 06:09:37  qboosh
+- separated -static (libXvMCNVIDIA.a)
+- better description for -devel
+- versioned OpenGL-GLX* Provides (1.4)
+- dropped OpenGL-devel-base cap; obsolete old X*-OpenGL-devel-base packages
+- fixed libGL* symlinks, include libGL.so.1 symlink as ghost
+
 Revision 1.14  2007/06/26 16:24:03  qboosh
 - updated banners (no more 24 or smp), decreased their annoyance
 
@@ -361,4 +378,3 @@
 - new
 - graphics card should be included in description (I don't know where I can find it)
 - works for me
-
================================================================

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

