From 31e88bf976f8d412e2b23622cfa244249bb264c6 Mon Sep 17 00:00:00 2001 From: Andrew Overholt Date: Jan 14 2005 20:03:00 +0000 Subject: - only add to the db those jar-so combinations that we've compiled --- diff --git a/eclipse.spec b/eclipse.spec index b72ded3..a3fd98c 100644 --- a/eclipse.spec +++ b/eclipse.spec @@ -588,10 +588,12 @@ mkdir $RPM_BUILD_ROOT%{_datadir}/%{name}/buildscripts cp copy-platform $RPM_BUILD_ROOT%{_datadir}/%{name}/buildscripts # Native build -gcj-dbtool4 -n $RPM_BUILD_ROOT%{_libdir}/%{name}/.eclipse.db 80000 +gcj-dbtool4 -n $RPM_BUILD_ROOT%{_libdir}/%{name}/eclipse.db 80000 for j in `find $RPM_BUILD_ROOT%{_datadir}/%{name} -name \*.jar`; do gcj4 -fPIC -fjni -findirect-dispatch -shared \ -o $RPM_BUILD_ROOT%{_libdir}/%{name}/`basename $j`.so $j; + echo $j | sed "s/$RPM_BUILD_ROOT//" >> \ + $RPM_BUILD_ROOT%{_datadir}/%{name}/eclipsecompiledjars.list done # FIXME until libgcj contains gnujaxp (libgcj PR 19301) @@ -618,8 +620,8 @@ ln -s %{_datadir}/%{name}/plugins/org.eclipse.jdt.core_%{eclipse_majmin}.%{eclip %post platform # FIXME: we will need to put the proper .sos in the proper sub-packages' %post # sections -for j in `find %{_datadir}/%{name} -name \*.jar`; do - gcj-dbtool4 -a %{_libdir}/%{name}/.eclipse.db \ +for j in `cat %{_datadir}/%{name}/eclipsecompiledjars.list`; do + gcj-dbtool4 -a %{_libdir}/%{name}/eclipse.db \ $j %{_libdir}/%{name}/`basename $j`.so; done @@ -640,7 +642,8 @@ rm -rf $RPM_BUILD_ROOT %dir %{_libdir}/%{name} %{_libdir}/%{name}/*.so %{_datadir}/%{name}/.eclipseproduct -%{_libdir}/%{name}/.eclipse.db +%{_datadir}/%{name}/eclipsecompiledjars.list +%{_libdir}/%{name}/eclipse.db %{_datadir}/%{name}/startup.jar %{_datadir}/%{name}/icon.xpm %{_datadir}/%{name}/eclipse @@ -679,6 +682,7 @@ rm -rf $RPM_BUILD_ROOT %changelog * Fri Jan 14 2005 Andrew Overholt 3.1-0.M4.13 - fix /usr/share -> /usr/lib error in launcher script +- only add to the db those jar-so combinations that we've compiled * Fri Jan 14 2005 Andrew Overholt 3.1-0.M4.12 - typos in %files