Author: baggins Date: Wed Sep 19 14:17:50 2007 GMT Module: SPECS Tag: MULTIGL ---- Log message: - moved libGL to Mesa subdir - added ld.so config
---- Files affected: SPECS: Mesa.spec (1.158.2.1 -> 1.158.2.2) ---- Diffs: ================================================================ Index: SPECS/Mesa.spec diff -u SPECS/Mesa.spec:1.158.2.1 SPECS/Mesa.spec:1.158.2.2 --- SPECS/Mesa.spec:1.158.2.1 Wed Sep 19 15:02:16 2007 +++ SPECS/Mesa.spec Wed Sep 19 16:17:45 2007 @@ -12,7 +12,7 @@ Summary(pl.UTF-8): Wolnodostępna implementacja standardu OpenGL Name: Mesa Version: 7.0.1 -Release: 2 +Release: 3 License: MIT (core), SGI (GLU,libGLw) and others - see COPYRIGHT file Group: X11/Libraries Source0: http://dl.sourceforge.net/mesa3d/%{name}Lib-%{version}.tar.bz2 @@ -36,8 +36,6 @@ BuildRequires: xorg-util-makedepend BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) -%define _sysconfdir /etc/X11 - %description Mesa is a 3-D graphics library with an API which is very similar to that of OpenGL(R). To the extent that Mesa utilizes the OpenGL command @@ -597,12 +595,14 @@ %install rm -rf $RPM_BUILD_ROOT -install -d $RPM_BUILD_ROOT{%{_bindir},%{_libdir},%{_includedir}/GL,%{_examplesdir}/%{name}-%{version}} +install -d $RPM_BUILD_ROOT{%{_bindir},%{_libdir}/Mesa,%{_includedir}/GL,%{_examplesdir}/%{name}-%{version}} install -d $RPM_BUILD_ROOT%{_libdir}/xorg/modules/dri install -d $RPM_BUILD_ROOT%{_sysconfdir}/ld.so.conf.d cp -df lib-static/lib* $RPM_BUILD_ROOT%{_libdir} cp -df lib-dri/lib* $RPM_BUILD_ROOT%{_libdir} +mv -f $RPM_BUILD_ROOT%{_libdir}/libGL.so.* $RPM_BUILD_ROOT%{_libdir}/Mesa +ln -sf Mesa/libGL.so.1 $RPM_BUILD_ROOT%{_libdir}/libGL.so #cp -df lib/libOSMesa* $RPM_BUILD_ROOT%{_libdir} cp -rf include/GL/{gl[!u]*,glu.h,glu_*,osmesa.h,xmesa*} src/glw/GLw*.h $RPM_BUILD_ROOT%{_includedir}/GL cp -df lib-dri/*_dri.so $RPM_BUILD_ROOT%{_libdir}/xorg/modules/dri @@ -637,6 +637,7 @@ %defattr(644,root,root,755) %doc docs/{*.html,README.{3DFX,GGI,MITS,QUAKE,THREADS},RELNOTES*} %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/ld.so.conf.d/Mesa.conf +%dir %{_libdir}/Mesa %attr(755,root,root) %{_libdir}/Mesa/libGL.so.*.* %attr(755,root,root) %ghost %{_libdir}/Mesa/libGL.so.1 @@ -797,6 +798,10 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.158.2.2 2007/09/19 14:17:45 baggins +- moved libGL to Mesa subdir +- added ld.so config + Revision 1.158.2.1 2007/09/19 13:02:16 baggins - attempt to make libGL from different packages (Mesa,fglrx,nvidia) non-conflicting ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/Mesa.spec?r1=1.158.2.1&r2=1.158.2.2&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
