Author: hawk Date: Tue Jul 14 17:13:11 2009 GMT
Module: packages Tag: STABLE
---- Log message:
- sync with HEAD (libs subpackage)
---- Files affected:
packages/xorg-driver-video-nvidia:
xorg-driver-video-nvidia.spec (1.212.2.7 -> 1.212.2.8)
---- Diffs:
================================================================
Index: packages/xorg-driver-video-nvidia/xorg-driver-video-nvidia.spec
diff -u
packages/xorg-driver-video-nvidia/xorg-driver-video-nvidia.spec:1.212.2.7
packages/xorg-driver-video-nvidia/xorg-driver-video-nvidia.spec:1.212.2.8
--- packages/xorg-driver-video-nvidia/xorg-driver-video-nvidia.spec:1.212.2.7
Sun Jul 12 21:30:31 2009
+++ packages/xorg-driver-video-nvidia/xorg-driver-video-nvidia.spec Tue Jul
14 19:13:06 2009
@@ -1,5 +1,6 @@
# $Revision$, $Date$
# TODO
+# - should -libs Require main package?
# - solve this (shouldn't there be some obsoletes?):
# error: xorg-driver-video-nvidia-169.12-3.i686 (cnfl Mesa-libGL) conflicts
with installed Mesa-libGL-7.0.3-2.i686
# error: xorg-driver-video-nvidia-169.12-3.i686 (cnfl Mesa-libGL) conflicts
with installed Mesa-libGL-7.0.3-2.i686
@@ -46,24 +47,13 @@
BuildRequires: rpmbuild(macros) >= 1.379
BuildRequires: sed >= 4.0
BuildConflicts: XFree86-nvidia
+Requires: %{pname}-libs = %{epoch}:%{version}-%{rel}
Requires: xorg-xserver-server
-Requires: xorg-xserver-server(videodrv-abi) >= 2.0
Requires: xorg-xserver-server(videodrv-abi) < 6.0
-Provides: OpenGL = 2.1
-Provides: OpenGL-GLX = 1.4
+Requires: xorg-xserver-server(videodrv-abi) >= 2.0
Provides: xorg-xserver-module(glx)
-%if %{without multigl}
-Obsoletes: Mesa
-%endif
-Obsoletes: X11-OpenGL-core < 1:7.0.0
-Obsoletes: X11-OpenGL-libGL < 1:7.0.0
-Obsoletes: XFree86-OpenGL-core < 1:7.0.0
-Obsoletes: XFree86-OpenGL-libGL < 1:7.0.0
Obsoletes: XFree86-driver-nvidia
Obsoletes: XFree86-nvidia
-%if %{without multigl}
-Conflicts: Mesa-libGL
-%endif
Conflicts: XFree86-OpenGL-devel <= 4.2.0-3
ExclusiveArch: %{ix86} %{x8664}
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -105,12 +95,36 @@
- TNT/TNT2/GeForce 256/GeForce 2 Ultra/Quadro 2 są obsługiwane przez
sterowniki -legacy
+%package libs
+Summary: OpenGL (GL and GLX) Nvidia libraries
+Summary(pl.UTF-8): Biblioteki OpenGL (GL i GLX) Nvidia
+Group: X11/Development/Libraries
+#Requires: %{pname} = %{epoch}:%{version}-%{rel}
+Provides: OpenGL = 2.1
+Provides: OpenGL-GLX = 1.4
+%if %{without multigl}
+Obsoletes: Mesa
+%endif
+Obsoletes: X11-OpenGL-core < 1:7.0.0
+Obsoletes: X11-OpenGL-libGL < 1:7.0.0
+Obsoletes: XFree86-OpenGL-core < 1:7.0.0
+Obsoletes: XFree86-OpenGL-libGL < 1:7.0.0
+%if %{without multigl}
+Conflicts: Mesa-libGL
+%endif
+
+%description libs
+NVIDIA OpenGL (GL and GLX only) implementation libraries.
+
+%description libs -l pl.UTF-8
+Implementacja OpenGL (tylko GL i GLX) firmy NVIDIA.
+
%package devel
Summary: OpenGL (GL and GLX) header files
Summary(hu.UTF-8): OpenGL (GL és GLX) fejléc fájlok
Summary(pl.UTF-8): Pliki nagłówkowe OpenGL (GL i GLX)
Group: X11/Development/Libraries
-Requires: %{pname} = %{epoch}:%{version}-%{rel}
+Requires: %{pname}-libs = %{epoch}:%{version}-%{rel}
Provides: OpenGL-GLX-devel = 1.4
Provides: OpenGL-devel = 2.1
Obsoletes: X11-OpenGL-devel-base
@@ -299,7 +313,6 @@
rm -rf $RPM_BUILD_ROOT
%post
-/sbin/ldconfig
cat << 'EOF'
NOTE: You must also install kernel module for this driver to work
kernel-video-nvidia-%{version}
@@ -316,7 +329,8 @@
fi
%endif
-%postun -p /sbin/ldconfig
+%post libs -p /sbin/ldconfig
+%postun libs -p /sbin/ldconfig
%post -n kernel%{_alt_kernel}-video-nvidia
%depmod %{_kernel_ver}
@@ -330,6 +344,16 @@
%doc LICENSE
%doc usr/share/doc/{README.txt,NVIDIA_Changelog,XF86Config.sample,html}
%if %{with multigl}
+%attr(755,root,root) %{_libdir}/xorg/modules/extensions/libglx.so.*
+%ghost %{_libdir}/xorg/modules/extensions/libglx.so
+%else
+%attr(755,root,root) %{_libdir}/xorg/modules/extensions/libglx.so*
+%endif
+%attr(755,root,root) %{_libdir}/xorg/modules/libnvidia-wfb.so.*.*
+%attr(755,root,root) %{_libdir}/xorg/modules/drivers/nvidia_drv.so
+
+%files libs
+%if %{with multigl}
%config(noreplace) %verify(not md5 mtime size)
%{_sysconfdir}/ld.so.conf.d/nvidia.conf
%dir %{_libdir}/nvidia
%attr(755,root,root) %{_libdir}/nvidia/libGL.so.*.*
@@ -360,10 +384,7 @@
%attr(755,root,root) %{_libdir}/libvdpau.so.*.*
%attr(755,root,root) %{_libdir}/libvdpau_nvidia.so.*.*
%attr(755,root,root) %{_libdir}/libvdpau_trace.so.*.*
-%attr(755,root,root) %{_libdir}/xorg/modules/extensions/libglx.so*
%endif
-%attr(755,root,root) %{_libdir}/xorg/modules/libnvidia-wfb.so.*.*
-%attr(755,root,root) %{_libdir}/xorg/modules/drivers/nvidia_drv.so
%files devel
%defattr(644,root,root,755)
@@ -408,6 +429,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.212.2.8 2009/07/14 17:13:06 hawk
+- sync with HEAD (libs subpackage)
+
Revision 1.212.2.7 2009/07/12 19:30:31 hawk
- release 2
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/xorg-driver-video-nvidia/xorg-driver-video-nvidia.spec?r1=1.212.2.7&r2=1.212.2.8&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
