From 175226f88f6e1d8903b7eb117597da8c1582cb6a Mon Sep 17 00:00:00 2001
From: Andrew Overholt <overholt@fedoraproject.org>
Date: Apr 04 2005 03:19:46 +0000
Subject: - Fix eclipse.script to not leave a sh process around (Joe Orton)

- Use proper sub-dbs.
- Don't compile jars that are symlinked from elsewhere.
- Add jar-so combinations to .db based on .jar.so existence (not .jar).
- Rename sub-dbs to be eclipse-*.db.
- Use rebuild-gcj-db script.

---

diff --git a/eclipse.spec b/eclipse.spec
index 0ad5a90..504b2a7 100644
--- a/eclipse.spec
+++ b/eclipse.spec
@@ -22,7 +22,7 @@ ExclusiveArch: i386 x86_64 ppc
 Summary:        %{pkg_summary}
 Name:           eclipse
 Version:        %{eclipse_majmin}.%{eclipse_micro}_fc
-Release: 0.M5.15
+Release:	0.M5.16
 License:        CPL
 Group:          Text Editors/Integrated Development Environments (IDE)
 URL:            http://www.eclipse.org/
@@ -93,7 +93,7 @@ BuildRequires:  mozilla-devel >= 1.7.6
 BuildRequires:  mozilla-nspr-devel >= 1.7.6
 BuildRequires:  xorg-x11-devel
 BuildRequires:	gcc-java >= 4.0.0-0.35
-BuildRequires:	java-1.4.2-gcj-compat-devel >= 1.4.2.0-40jpp_13rh
+BuildRequires:	java-1.4.2-gcj-compat-devel >= 1.4.2.0-40jpp_14rh
 
 BuildRequires: ant-antlr ant-apache-bcel ant-apache-log4j ant-apache-oro ant-apache-regexp ant-apache-resolver ant-commons-logging
 #BuildRequires: ant-apache-bsf ant-commons-net ant-jsch lucene 
@@ -127,7 +127,7 @@ Obsoletes:	%{name}-sdk %{name}-ui %{name}-gtk2 eclipse
 Provides:	%{name}-sdk = %{epoch}:%{version}-%{release}
 Provides:       %{name}-ui = %{epoch}:%{version}-%{release}
 Provides:       %{name}-gtk2 = %{epoch}:%{version}-%{release}
-Requires:	java-1.4.2-gcj-compat >= 1.4.2.0-40jpp_11rh
+Requires:	java-1.4.2-gcj-compat >= 1.4.2.0-40jpp_14rh
 Requires:       /usr/bin/perl
 Requires:	gcc-java >= 4.0.0-0.35
 Requires:       %{libname}-gtk2 = %{epoch}:%{version}-%{release}
@@ -422,7 +422,28 @@ tar zxf org.eclipse.sdk-%{build_id}-linux.gtk.%{eclipse_arch}.zip
 
 pushd eclipse
 
+# Remove the jars that we're using from other packages so that we don't
+# natively-compile them again
+rm -f plugins/org.apache.ant_1.6.2/lib/ant-antlr.jar
+rm -f plugins/org.apache.ant_1.6.2/lib/ant-apache-bcel.jar
+rm -f plugins/org.apache.ant_1.6.2/lib/ant-apache-log4j.jar
+rm -f plugins/org.apache.ant_1.6.2/lib/ant-apache-oro.jar
+rm -f plugins/org.apache.ant_1.6.2/lib/ant-apache-regexp.jar
+rm -f plugins/org.apache.ant_1.6.2/lib/ant-apache-resolver.jar
+rm -f plugins/org.apache.ant_1.6.2/lib/ant-commons-logging.jar
+rm -f plugins/org.apache.ant_1.6.2/lib/ant-jdepend.jar
+rm -f plugins/org.apache.ant_1.6.2/lib/ant-jmf.jar
+rm -f plugins/org.apache.ant_1.6.2/lib/ant-junit.jar
+rm -f plugins/org.apache.ant_1.6.2/lib/ant-launcher.jar
+rm -f plugins/org.apache.ant_1.6.2/lib/ant-nodeps.jar
+rm -f plugins/org.apache.ant_1.6.2/lib/ant-swing.jar
+rm -f plugins/org.apache.ant_1.6.2/lib/ant-trax.jar
+rm -f plugins/org.apache.ant_1.6.2/lib/ant.jar
+rm -f plugins/org.eclipse.team.cvs.ssh2_3.1.0/jsch-0.1.17.jar
+rm -f plugins/org.junit_3.8.1/junit.jar
+
 # Native build -- do -O2 on x86 and ppc only (for now)
+# see http://gcc.gnu.org/bugzilla/show_bug.cgi?id=20606, for example
 %ifarch %{ix86} ppc
   mkdir -p $RPM_BUILD_ROOT%{_libdir}/%{name}
   for j in `find -name \*.jar`; do
@@ -475,7 +496,8 @@ tar -C $RPM_BUILD_ROOT -zxf result/%{name}-nativelycompiledjars.tar.gz
 install -d -m 755 $RPM_BUILD_ROOT%{_bindir}
 
 # Directory to hold all the .jar->.so mapping dbs
-install -d -m 755 $RPM_BUILD_ROOT%{_libdir}/%{name}/mappings
+install -d -m 755 $RPM_BUILD_ROOT`gcj-dbtool -p %{_libdir}`
+install -d -m 755 $RPM_BUILD_ROOT`gcj-dbtool -p %{_libdir}`.d
 
 # Eclipse binary
 mv $RPM_BUILD_ROOT%{_datadir}/%{name}/eclipse \
@@ -652,49 +674,63 @@ ln -s %{_datadir}/%{name}/plugins/org.eclipse.jdt.core_%{eclipse_majmin}.%{eclip
   $RPM_BUILD_ROOT%{_datadir}/java/jdtcore.jar
 
 # Create the gcj dbs for libswt, ecj, platform, jdt, and pde
-gcj-dbtool -n $RPM_BUILD_ROOT%{_libdir}/%{name}/mappings/ecj.db 80000
-gcj-dbtool -n $RPM_BUILD_ROOT%{_libdir}/%{name}/mappings/libswt3-gtk2.db 80000
-gcj-dbtool -n $RPM_BUILD_ROOT%{_libdir}/%{name}/mappings/platform.db 80000
-gcj-dbtool -n $RPM_BUILD_ROOT%{_libdir}/%{name}/mappings/jdt.db 80000
-gcj-dbtool -n $RPM_BUILD_ROOT%{_libdir}/%{name}/mappings/pde.db 80000
+gcjdbdir=$RPM_BUILD_ROOT`gcj-dbtool -p %{_libdir}`.d
+mkdir -p $gcjdbdir
+gcj-dbtool -n $gcjdbdir/%{name}-ecj.db 80000
+gcj-dbtool -n $gcjdbdir/libswt3-gtk2.db 80000
+gcj-dbtool -n $gcjdbdir/%{name}-platform.db 80000
+gcj-dbtool -n $gcjdbdir/%{name}-jdt.db 80000
+gcj-dbtool -n $gcjdbdir/%{name}-pde.db 80000
 
 # ecj db
-gcj-dbtool -f $RPM_BUILD_ROOT%{_libdir}/%{name}/mappings/ecj.db \
+gcj-dbtool -f $gcjdbdir/%{name}-ecj.db \
   $RPM_BUILD_ROOT%{_datadir}/%{name}/plugins/org.eclipse.jdt.core_%{eclipse_majmin}.%{eclipse_micro}/jdtcore.jar \
   %{_libdir}/%{name}/plugins/org.eclipse.jdt.core_%{eclipse_majmin}.%{eclipse_micro}/jdtcore.jar.so
-gcj-dbtool -f $RPM_BUILD_ROOT%{_libdir}/%{name}/mappings/ecj.db \
+gcj-dbtool -f $gcjdbdir/%{name}-ecj.db \
   $RPM_BUILD_ROOT%{_datadir}/%{name}/plugins/org.eclipse.jdt.core_%{eclipse_majmin}.%{eclipse_micro}/jdtCompilerAdapter.jar \
   %{_libdir}/%{name}/plugins/org.eclipse.jdt.core_%{eclipse_majmin}.%{eclipse_micro}/jdtCompilerAdapter.jar.so
 
 # jdt db
 for dir in `cat %{SOURCE7}`; do
     for j in `find $RPM_BUILD_ROOT/$dir -name \*.jar`; do
-	gcj-dbtool -f $RPM_BUILD_ROOT%{_libdir}/%{name}/mappings/jdt.db \
-	  $j `echo $j | sed "s:$RPM_BUILD_ROOT/::" | sed "s:%{_datadir}:%{_libdir}:"`.so;
+	lib=`echo $j | sed "s:%{_datadir}:%{_libdir}:"`.so;
+	if [ -f $RPM_BUILD_ROOT/$lib ]; then
+	  gcj-dbtool -f $gcjdbdir/%{name}-jdt.db \
+	    $j `echo $j | sed "s:$RPM_BUILD_ROOT/::"`;
+	fi;
     done;
 done
 
 # pde db
 for dir in `cat %{SOURCE8}`; do
     for j in `find $RPM_BUILD_ROOT/$dir -name \*.jar`; do
-	gcj-dbtool -f $RPM_BUILD_ROOT%{_libdir}/%{name}/mappings/jdt.db \
-	  $j `echo $j | sed "s:$RPM_BUILD_ROOT/::" | sed "s:%{_datadir}:%{_libdir}:"`.so;
+	lib=`echo $j | sed "s:%{_datadir}:%{_libdir}:"`.so;
+	if [ -f $RPM_BUILD_ROOT/$lib ]; then
+	  gcj-dbtool -f $gcjdbdir/%{name}-pde.db \
+	    $j `echo $j | sed "s:$RPM_BUILD_ROOT/::"`;
+	fi;
     done;
 done
 
 # platform db
 for dir in `cat %{SOURCE9}`; do
     for j in `find $RPM_BUILD_ROOT/$dir -name \*.jar`; do
-	gcj-dbtool -f $RPM_BUILD_ROOT%{_libdir}/%{name}/mappings/jdt.db \
-	  $j `echo $j | sed "s:$RPM_BUILD_ROOT/::" | sed "s:%{_datadir}:%{_libdir}:"`.so;
+	lib=`echo $j | sed "s:%{_datadir}:%{_libdir}:"`.so;
+	if [ -f $RPM_BUILD_ROOT/$lib ]; then
+	  gcj-dbtool -f $gcjdbdir/%{name}-platform.db \
+	    $j `echo $j | sed "s:$RPM_BUILD_ROOT/::"`;
+	fi;
     done;
 done
 
 # swt db
 for dir in `cat %{SOURCE10}`; do
     for j in `find $RPM_BUILD_ROOT/$dir -name \*.jar`; do
-	gcj-dbtool -f $RPM_BUILD_ROOT%{_libdir}/%{name}/mappings/jdt.db \
-	  $j `echo $j | sed "s:$RPM_BUILD_ROOT/::" | sed "s:%{_datadir}:%{_libdir}:"`.so;
+	lib=`echo $j | sed "s:%{_datadir}:%{_libdir}:"`.so;
+	if [ -f $RPM_BUILD_ROOT/$lib ]; then
+	  gcj-dbtool -f $gcjdbdir/libswt3-gtk2.db \
+	    $j `echo $j | sed "s:$RPM_BUILD_ROOT/::"`;
+	fi;
     done;
 done
 
@@ -702,97 +738,42 @@ done
 rm -rf $RPM_BUILD_ROOT
 
 %post ecj
-dbLocation=`gcj-dbtool -p`
-if ! [ -e $dbLocation ]; then
-    dirname $dbLocation | xargs mkdir -p
-    gcj-dbtool -n $dbLocation
-fi
-
-if [ -n "`find %{_libdir}/%{name}/mappings -name \*.db`" ]; then
-    gcj-dbtool -m $dbLocation `find %{_libdir}/%{name}/mappings -name \*.db` $dbLocation
-fi
+rebuild-gcj-db %{_libdir}
 
 %post jdt
-dbLocation=`gcj-dbtool -p`
-if ! [ -e $dbLocation ]; then
-    dirname $dbLocation | xargs mkdir -p
-    gcj-dbtool -n $dbLocation
-fi
-
-if [ -n "`find %{_libdir}/%{name}/mappings -name \*.db`" ]; then
-    gcj-dbtool -m $dbLocation `find %{_libdir}/%{name}/mappings -name \*.db` $dbLocation
-fi
+rebuild-gcj-db %{_libdir}
 
 %post pde
-dbLocation=`gcj-dbtool -p`
-if ! [ -e $dbLocation ]; then
-    dirname $dbLocation | xargs mkdir -p
-    gcj-dbtool -n $dbLocation
-fi
-
-if [ -n "`find %{_libdir}/%{name}/mappings -name \*.db`" ]; then
-    gcj-dbtool -m $dbLocation `find %{_libdir}/%{name}/mappings -name \*.db` $dbLocation
-fi
+rebuild-gcj-db %{_libdir}
 
 %post platform
-dbLocation=`gcj-dbtool -p`
-if ! [ -e $dbLocation ]; then
-    dirname $dbLocation | xargs mkdir -p
-    gcj-dbtool -n $dbLocation
-fi
-
-if [ -n "`find %{_libdir}/%{name}/mappings -name \*.db`" ]; then
-    gcj-dbtool -m $dbLocation `find %{_libdir}/%{name}/mappings -name \*.db` $dbLocation
-fi
+rebuild-gcj-db %{_libdir}
 touch --no-create %{_datadir}/icons/hicolor
 if [ -x /usr/bin/gtk-update-icon-cache ]; then
   gtk-update-icon-cache %{_datadir}/icons/hicolor
 fi
 
 %post -n %{libname}-gtk2
-dbLocation=`gcj-dbtool -p`
-mkdir -p `dirname $dbLocation`
-if ! [ -e $dbLocation ]; then
-    gcj-dbtool -n $dbLocation
-fi
-
-if [ -n "`find %{_libdir}/%{name}/mappings -name \*.db`" ]; then
-    gcj-dbtool -m $dbLocation `find %{_libdir}/%{name}/mappings -name \*.db` $dbLocation
-fi
+rebuild-gcj-db %{_libdir}
 
 %postun ecj
-dbLocation=`gcj-dbtool -p`
-if [ -n "`find %{_libdir}/%{name}/mappings -name \*.db`" ]; then
-    gcj-dbtool -m $dbLocation `find %{_libdir}/%{name}/mappings -name \*.db` $dbLocation
-fi
+rebuild-gcj-db %{_libdir}
 
 %postun jdt
-dbLocation=`gcj-dbtool -p`
-if [ -n "`find %{_libdir}/%{name}/mappings -name \*.db`" ]; then
-    gcj-dbtool -m $dbLocation `find %{_libdir}/%{name}/mappings -name \*.db` $dbLocation
-fi
+rebuild-gcj-db %{_libdir}
 
 %postun pde
-dbLocation=`gcj-dbtool -p`
-if [ -n "`find %{_libdir}/%{name}/mappings -name \*.db`" ]; then
-    gcj-dbtool -m $dbLocation `find %{_libdir}/%{name}/mappings -name \*.db` $dbLocation
-fi
+rebuild-gcj-db %{_libdir}
 
 %postun platform
-dbLocation=`gcj-dbtool -p`
-if [ -n "`find %{_libdir}/%{name}/mappings -name \*.db`" ]; then
-    gcj-dbtool -m $dbLocation `find %{_libdir}/%{name}/mappings -name \*.db` $dbLocation
-fi
+rebuild-gcj-db %{_libdir}
 touch --no-create %{_datadir}/icons/hicolor
 if [ -x /usr/bin/gtk-update-icon-cache ]; then
   gtk-update-icon-cache %{_datadir}/icons/hicolor
 fi
 
 %postun -n %{libname}-gtk2
-dbLocation=`gcj-dbtool -p`
-if [ -n "`find %{_libdir}/%{name}/mappings -name \*.db`" ]; then
-    gcj-dbtool -m $dbLocation `find %{_libdir}/%{name}/mappings -name \*.db` $dbLocation
-fi
+rebuild-gcj-db %{_libdir}
 
 # FIXME:  add the native directories to these lists
 %files ecj
@@ -801,8 +782,7 @@ fi
 %{_datadir}/%{name}/plugins/org.eclipse.jdt.core_3.*
 %{_datadir}/java/jdtcore*.jar
 # Native bits
-%dir %{_libdir}/%{name}/mappings
-%{_libdir}/%{name}/mappings/ecj.db
+%{_libdir}/gcj-4.0.0/classmap.db.d/%{name}-ecj.db
 %attr(0755,root,root) %{_libdir}/%{name}/plugins/org.eclipse.jdt.core_3.1.0/jdtcore.jar.so
 %attr(0755,root,root) %{_libdir}/%{name}/plugins/org.eclipse.jdt.core_3.1.0/jdtCompilerAdapter.jar.so
 
@@ -820,8 +800,7 @@ fi
 %{_javadir}/swt-mozilla*.jar
 %{_javadir}/swt-cairo*.jar
 # Native bits
-%dir %{_libdir}/%{name}/mappings
-%{_libdir}/%{name}/mappings/libswt3-gtk2.db
+%{_libdir}/gcj-4.0.0/classmap.db.d/libswt3-gtk2.db
 %ifarch alpha ia64 ppc64 sparc64 x86_64
 %attr(0755,root,root) %{_libdir}/%{name}/plugins/org.eclipse.swt.gtk64_3.1.0/ws/gtk/swt-pi.jar.so
 %attr(0755,root,root) %{_libdir}/%{name}/plugins/org.eclipse.swt.gtk64_3.1.0/ws/gtk/swt-mozilla.jar.so
@@ -839,8 +818,7 @@ fi
 %files jdt -f %{name}-jdt.install
 %defattr(0644,root,root,0755)
 # Native bits
-%dir %{_libdir}/%{name}/mappings
-%{_libdir}/%{name}/mappings/jdt.db
+%{_libdir}/gcj-4.0.0/classmap.db.d/%{name}-jdt.db
 %attr(0755,root,root) %{_libdir}/%{name}/plugins/org.eclipse.jdt.debug.ui_3.1.0/jdiui.jar.so
 %attr(0755,root,root) %{_libdir}/%{name}/plugins/org.eclipse.jdt.debug.ui_3.1.0/snippetsupport.jar.so
 %attr(0755,root,root) %{_libdir}/%{name}/plugins/org.eclipse.jdt.debug_3.1.0/jdimodel.jar.so
@@ -851,7 +829,6 @@ fi
 %attr(0755,root,root) %{_libdir}/%{name}/plugins/org.eclipse.jdt.launching_3.1.0/lib/launchingsupport.jar.so
 %attr(0755,root,root) %{_libdir}/%{name}/plugins/org.eclipse.jdt.ui_3.1.0/jdt.jar.so
 %attr(0755,root,root) %{_libdir}/%{name}/plugins/org.eclipse.jdt.ui_3.1.0/serialsupport.jar.so
-%attr(0755,root,root) %{_libdir}/%{name}/plugins/org.junit_3.8.1/junit.jar.so
 
 %files jdt-devel
 %{_datadir}/%{name}/plugins/org.eclipse.jdt.source_3.*
@@ -860,8 +837,7 @@ fi
 %files pde -f %{name}-pde.install
 %defattr(0644,root,root,0755)
 # Native bits
-%dir %{_libdir}/%{name}/mappings
-%{_libdir}/%{name}/mappings/pde.db
+%{_libdir}/gcj-4.0.0/classmap.db.d/%{name}-pde.db
 %attr(0755,root,root) %{_libdir}/%{name}/plugins/org.eclipse.pde.build_3.1.0/lib/pdebuild-ant.jar.so
 %attr(0755,root,root) %{_libdir}/%{name}/plugins/org.eclipse.pde.build_3.1.0/pdebuild.jar.so
 %attr(0755,root,root) %{_libdir}/%{name}/plugins/org.eclipse.pde.core_3.1.0/pdecore.jar.so
@@ -894,8 +870,7 @@ fi
 %{_datadir}/icons/*/*/apps/*
 %config(noreplace) %{_sysconfdir}/eclipse.conf
 # Native bits
-%dir %{_libdir}/%{name}/mappings
-%{_libdir}/%{name}/mappings/platform.db
+%{_libdir}/gcj-4.0.0/classmap.db.d/%{name}-platform.db
 %attr(0755,root,root) %{_libdir}/%{name}/plugins/org.eclipse.ant.core_3.1.0/antsupport.jar.so
 %attr(0755,root,root) %{_libdir}/%{name}/plugins/org.eclipse.compare_3.1.0/compare.jar.so
 %attr(0755,root,root) %{_libdir}/%{name}/plugins/org.eclipse.core.boot_3.0.0/boot.jar.so
@@ -925,7 +900,6 @@ fi
 %attr(0755,root,root) %{_libdir}/%{name}/plugins/org.eclipse.team.cvs.ssh_3.1.0/teamcvsssh.jar.so
 %attr(0755,root,root) %{_libdir}/%{name}/plugins/org.eclipse.team.cvs.ssh2_3.1.0/jsch-0.1.16.jar.so
 %attr(0755,root,root) %{_libdir}/%{name}/plugins/org.eclipse.team.cvs.ssh2_3.1.0/jsch-0.1.18.jar.so
-%attr(0755,root,root) %{_libdir}/%{name}/plugins/org.eclipse.team.cvs.ssh2_3.1.0/jsch-0.1.17.jar.so
 %attr(0755,root,root) %{_libdir}/%{name}/plugins/org.eclipse.team.ui_3.1.0/teamui.jar.so
 %attr(0755,root,root) %{_libdir}/%{name}/plugins/org.eclipse.text_3.1.0/text.jar.so
 %attr(0755,root,root) %{_libdir}/%{name}/plugins/org.eclipse.ui.cheatsheets_3.0.0/cheatsheets.jar.so
@@ -984,29 +958,14 @@ fi
 %attr(0755,root,root) %{_libdir}/%{name}/plugins/org.eclipse.team.cvs.ssh2_3.1.0/cvsssh2.jar.so
 %attr(0755,root,root) %{_libdir}/%{name}/plugins/org.apache.ant_1.6.2/lib/ant-stylebook.jar.so
 %attr(0755,root,root) %{_libdir}/%{name}/plugins/org.apache.ant_1.6.2/lib/ant-javamail.jar.so
-%attr(0755,root,root) %{_libdir}/%{name}/plugins/org.apache.ant_1.6.2/lib/ant-apache-bcel.jar.so
-%attr(0755,root,root) %{_libdir}/%{name}/plugins/org.apache.ant_1.6.2/lib/ant-jmf.jar.so
 %attr(0755,root,root) %{_libdir}/%{name}/plugins/org.apache.ant_1.6.2/lib/ant-weblogic.jar.so
-%attr(0755,root,root) %{_libdir}/%{name}/plugins/org.apache.ant_1.6.2/lib/ant-apache-oro.jar.so
 %attr(0755,root,root) %{_libdir}/%{name}/plugins/org.apache.ant_1.6.2/lib/ant-netrexx.jar.so
-%attr(0755,root,root) %{_libdir}/%{name}/plugins/org.apache.ant_1.6.2/lib/ant.jar.so
-%attr(0755,root,root) %{_libdir}/%{name}/plugins/org.apache.ant_1.6.2/lib/ant-trax.jar.so
-%attr(0755,root,root) %{_libdir}/%{name}/plugins/org.apache.ant_1.6.2/lib/ant-jdepend.jar.so
-%attr(0755,root,root) %{_libdir}/%{name}/plugins/org.apache.ant_1.6.2/lib/ant-nodeps.jar.so
 %attr(0755,root,root) %{_libdir}/%{name}/plugins/org.apache.ant_1.6.2/lib/ant-commons-net.jar.so
-%attr(0755,root,root) %{_libdir}/%{name}/plugins/org.apache.ant_1.6.2/lib/ant-commons-logging.jar.so
-%attr(0755,root,root) %{_libdir}/%{name}/plugins/org.apache.ant_1.6.2/lib/ant-apache-log4j.jar.so
-%attr(0755,root,root) %{_libdir}/%{name}/plugins/org.apache.ant_1.6.2/lib/ant-junit.jar.so
 %attr(0755,root,root) %{_libdir}/%{name}/plugins/org.apache.ant_1.6.2/lib/ant-icontract.jar.so
 %attr(0755,root,root) %{_libdir}/%{name}/plugins/org.apache.ant_1.6.2/lib/ant-vaj.jar.so
-%attr(0755,root,root) %{_libdir}/%{name}/plugins/org.apache.ant_1.6.2/lib/ant-antlr.jar.so
-%attr(0755,root,root) %{_libdir}/%{name}/plugins/org.apache.ant_1.6.2/lib/ant-launcher.jar.so
 %attr(0755,root,root) %{_libdir}/%{name}/plugins/org.apache.ant_1.6.2/lib/ant-apache-bsf.jar.so
 %attr(0755,root,root) %{_libdir}/%{name}/plugins/org.apache.ant_1.6.2/lib/ant-xslp.jar.so
-%attr(0755,root,root) %{_libdir}/%{name}/plugins/org.apache.ant_1.6.2/lib/ant-apache-resolver.jar.so
-%attr(0755,root,root) %{_libdir}/%{name}/plugins/org.apache.ant_1.6.2/lib/ant-swing.jar.so
 %attr(0755,root,root) %{_libdir}/%{name}/plugins/org.apache.ant_1.6.2/lib/ant-xalan1.jar.so
-%attr(0755,root,root) %{_libdir}/%{name}/plugins/org.apache.ant_1.6.2/lib/ant-apache-regexp.jar.so
 %attr(0755,root,root) %{_libdir}/%{name}/plugins/org.apache.ant_1.6.2/lib/ant-jai.jar.so
 %attr(0755,root,root) %{_libdir}/%{name}/plugins/org.apache.ant_1.6.2/lib/ant-starteam.jar.so
 %attr(0755,root,root) %{_libdir}/%{name}/plugins/org.apache.ant_1.6.2/lib/ant-jsch.jar.so
@@ -1021,6 +980,14 @@ fi
 %{_datadir}/%{name}/plugins/org.eclipse.platform.source.linux.gtk.*_3.1.0
 
 %changelog
+* Thu Mar 31 2005 Andrew Overholt <overholt@redhat.com> 3.1.0_fc-0.M5.16
+- Fix eclipse.script to not leave a sh process around (Joe Orton)
+- Use proper sub-dbs.
+- Don't compile jars that are symlinked from elsewhere.
+- Add jar-so combinations to .db based on .jar.so existence (not .jar).
+- Rename sub-dbs to be eclipse-*.db.
+- Use rebuild-gcj-db script.
+
 * Mon Mar 28 2005 Christopher Aillon <caillon@redhat.com>
 - rebuilt