Hello community, here is the log from the commit of package Mesa checked in at Tue May 23 00:59:12 CEST 2006. -------- --- Mesa/Mesa.changes 2006-05-16 16:32:21.000000000 +0200 +++ Mesa/Mesa.changes 2006-05-22 22:31:44.000000000 +0200 @@ -1,0 +2,7 @@ +Mon May 22 22:30:52 CEST 2006 - sndirsch@suse.de + +- reverted Mesa/MesaGLU split +- fixed libGLcore.so.1 (e.g. soname); required to create a + non-conflicting package for the NVIDIA driver (Bug #175683) + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ Mesa.spec ++++++ --- /var/tmp/diff_new_pack.WHLElx/_old 2006-05-23 00:58:49.000000000 +0200 +++ /var/tmp/diff_new_pack.WHLElx/_new 2006-05-23 00:58:49.000000000 +0200 @@ -20,7 +20,7 @@ Obsoletes: xorg-x11-Mesa Autoreqprov: on Version: 6.4.2 -Release: 19 +Release: 20 Summary: Mesa is a 3-D graphics library with an API which is very similar to that of OpenGL.* Source: Mesa-%{version}.tar.bz2 Source1: missing-headers.tar.bz2 @@ -105,35 +105,6 @@ -------- Brian Paul -%package -n MesaGLU -Summary: Mesa GLU library -Group: System/Libraries -Provides: Mesa:/usr/%{_lib}/libGLU.so.1 xorg-x11-Mesa:/usr/%{_lib}/libGLU.so.1 - -%description -n MesaGLU -Mesa GLU library. - - - -Authors: --------- - Brian Paul - -%package -n MesaGLU-devel -Requires: Mesa-devel = %version -Summary: Libraries, includes and more to develop Mesa/GLU applications -Group: System/Libraries -Provides: Mesa:/usr/%{_lib}/libGLU.so xorg-x11-Mesa:/usr/%{_lib}/libGLU.so - -%description -n MesaGLU-devel -Libraries, includes and more to develop Mesa/GLU applications - - - -Authors: --------- - Brian Paul - %prep %if !%{USE_EXTERNAL_MESA} %setup -n %name -a1 @@ -221,9 +192,10 @@ #%endif # create dummy nvidia libGLcore.so.1 for applications, which are still # linked against libGL.so.1 of older nvidia driver releases -touch libGLcore.c -gcc -Wall -ansi -pedantic -c libGLcore.c -gcc -shared -Wl -o $RPM_BUILD_ROOT/usr/%{_lib}/libGLcore.so.1 libGLcore.o +> libGLcore.c +gcc -Wall -ansi -pedantic -c libGLcore.c -fPIC +ld -shared -soname libGLcore.so.1 -o $RPM_BUILD_ROOT/usr/%{_lib}/libGLcore.so.1.0 libGLcore.o +/sbin/ldconfig -n $RPM_BUILD_ROOT/usr/%_lib # duplicate libGL to make workarounds like LD_PRELOAD possible if # nvidia driver is installed and its libGl does not work mkdir -p $RPM_BUILD_ROOT/usr/%{_lib}/GL @@ -252,8 +224,7 @@ /usr/include/GL/ %dir /usr/%{_lib}/GL/ /usr/%{_lib}/libGL.so -/usr/%{_lib}/libGL.so.* -/usr/%{_lib}/libGLcore.so.1 +/usr/%{_lib}/lib*.so.* /usr/%{_lib}/GL/lib*.so.* #%ifarch %ix86 #%{_libdir}/libglide3-v3.so @@ -267,25 +238,20 @@ %files devel %defattr(-,root,root) /usr/include/GLES/ +/usr/%{_lib}/libGLU.so +/usr/%{_lib}/libGLw.so +/usr/%{_lib}/libOSMesa.so %files devel-static %defattr(-,root,root) /usr/%{_lib}/libGL.a /usr/%{_lib}/libMesaGL.a -%files -n MesaGLU -%defattr(-,root,root) -/usr/%{_lib}/libGLU.so.* -/usr/%{_lib}/libGLw.so.* -/usr/%{_lib}/libOSMesa.so.* - -%files -n MesaGLU-devel -%defattr(-,root,root) -/usr/%{_lib}/libGLU.so -/usr/%{_lib}/libGLw.so -/usr/%{_lib}/libOSMesa.so - %changelog -n Mesa +* Mon May 22 2006 - sndirsch@suse.de +- reverted Mesa/MesaGLU split +- fixed libGLcore.so.1 (e.g. soname); required to create a + non-conflicting package for the NVIDIA driver (Bug #175683) * Tue May 16 2006 - sndirsch@suse.de - splitted off MesaGLU/MesaGLU-devel - added ldconfig to %%postun ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun...
participants (1)
-
root＠suse.de