From a02f5e9e3397fa3f4e4a904dd29012f6082681fb1d9f3b705eb40a292820d413 Mon Sep 17 00:00:00 2001 From: Stefan Dirsch Date: Mon, 24 Sep 2012 19:39:55 +0000 Subject: [PATCH] - removed any .la file - moved libglapi.so from Mesa-devel to Mesa-libglapi-devel package; Mesa-devel requires Mesa-libglapi-devel package anyway OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/Mesa?expand=0&rev=248 --- Mesa.changes | 7 +++++++ Mesa.spec | 14 ++------------ 2 files changed, 9 insertions(+), 12 deletions(-) diff --git a/Mesa.changes b/Mesa.changes index f11a29a..d1fdf5b 100644 --- a/Mesa.changes +++ b/Mesa.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Mon Sep 24 17:04:35 UTC 2012 - sndirsch@suse.com + +- removed any .la file +- moved libglapi.so from Mesa-devel to Mesa-libglapi-devel package; + Mesa-devel requires Mesa-libglapi-devel package anyway + ------------------------------------------------------------------- Fri Sep 21 08:28:28 UTC 2012 - sndirsch@suse.com diff --git a/Mesa.spec b/Mesa.spec index 0bfa705..cc0f576 100644 --- a/Mesa.spec +++ b/Mesa.spec @@ -520,6 +520,7 @@ autoreconf -fi CFLAGS="$RPM_OPT_FLAGS -DNDEBUG" make %{?_smp_mflags} make install DESTDIR=$RPM_BUILD_ROOT +find $RPM_BUILD_ROOT -name "*.la" -exec rm {} \; # build and install Indirect Rendering only libGL make clean-local %configure --enable-xlib-glx \ @@ -534,9 +535,7 @@ make clean-local make %{?_smp_mflags} cp -a \ src/mesa/drivers/x11/.libs/libIndirectGL.so* \ - ./src/mesa/drivers/x11/libIndirectGL.la \ src/mesa/drivers/osmesa/.libs/libOSMesa.so* \ - src/mesa/drivers/osmesa/libOSMesa.la \ $RPM_BUILD_ROOT/usr/%{_lib} install -m 644 src/mesa/drivers/osmesa/osmesa.pc \ $RPM_BUILD_ROOT/usr/%{_lib}/pkgconfig @@ -642,7 +641,6 @@ install -m 644 $RPM_SOURCE_DIR/drirc $RPM_BUILD_ROOT/etc %_includedir/KHR %_libdir/libEGL.so %_libdir/pkgconfig/egl.pc -%_libdir/libEGL.la %files -n Mesa-libGL1 %defattr(-,root,root) @@ -655,7 +653,6 @@ install -m 644 $RPM_SOURCE_DIR/drirc $RPM_BUILD_ROOT/etc %exclude %_includedir/GL/osmesa.h %_libdir/libGL.so %_libdir/pkgconfig/gl.pc -%_libdir/libGL.la %_mandir/man3/gl[A-Z]* %files -n Mesa-libGLESv1_CM1 @@ -666,7 +663,6 @@ install -m 644 $RPM_SOURCE_DIR/drirc $RPM_BUILD_ROOT/etc %defattr(-,root,root) %_includedir/GLES %_libdir/libGLESv1_CM.so -%_libdir/libGLESv1_CM.la %_libdir/pkgconfig/glesv1_cm.pc %files -n Mesa-libGLESv2-2 @@ -677,7 +673,6 @@ install -m 644 $RPM_SOURCE_DIR/drirc $RPM_BUILD_ROOT/etc %defattr(-,root,root) %_includedir/GLES2 %_libdir/libGLESv2.so -%_libdir/libGLESv2.la %_libdir/pkgconfig/glesv2.pc %files -n Mesa-libIndirectGL1 @@ -687,7 +682,6 @@ install -m 644 $RPM_SOURCE_DIR/drirc $RPM_BUILD_ROOT/etc %files -n Mesa-libIndirectGL-devel %defattr(-,root,root) %_libdir/libIndirectGL.so -%_libdir/libIndirectGL.la %files -n libOSMesa9 %defattr(-,root,root) @@ -698,7 +692,6 @@ install -m 644 $RPM_SOURCE_DIR/drirc $RPM_BUILD_ROOT/etc %defattr(-,root,root) %_includedir/GL/osmesa.h %_libdir/libOSMesa.so -%_libdir/libOSMesa.la %_libdir/pkgconfig/osmesa.pc %files -n libgbm1 @@ -709,7 +702,6 @@ install -m 644 $RPM_SOURCE_DIR/drirc $RPM_BUILD_ROOT/etc %defattr(-,root,root) %_includedir/gbm.h %_libdir/libgbm.so -%_libdir/libgbm.la %_libdir/pkgconfig/gbm.pc %ifnarch s390 s390x %arm ppc ppc64 @@ -785,15 +777,13 @@ install -m 644 $RPM_SOURCE_DIR/drirc $RPM_BUILD_ROOT/etc %files -n Mesa-libglapi-devel %defattr(-,root,root) -%_libdir/libglapi.la +%_libdir/libglapi.so %files devel %defattr(-,root,root) %doc docs/*.html docs/*.spec %_includedir/GL/internal -%_libdir/libglapi.so %_libdir/libdricore9*.so -%_libdir/libdricore9*.la %_libdir/pkgconfig/dri.pc %changelog