From b1d3637915ceb4c8baa8ecfe1d13c983c53d6279 Mon Sep 17 00:00:00 2001
From: Andrew Overholt <overholt@fedoraproject.org>
Date: Jan 14 2005 15:35:11 +0000
Subject: - make PDE depend upon JDT

- move precompiled db to %{_libdir}/eclipse
- modify launching script to use compiled .sos
- rename compiled .sos to be .jar.so instead of .so
- for now, do dbtool adding in platform install

---

diff --git a/eclipse.spec b/eclipse.spec
index 0e95d8d..423de3c 100644
--- a/eclipse.spec
+++ b/eclipse.spec
@@ -55,7 +55,7 @@ ExclusiveArch:		i386 ppc
 Summary:        %{pkg_summary}
 Name:           eclipse
 Version:        %{eclipse_majmin}
-Release:        0.%{eclipse_milestone}.9
+Release:        0.%{eclipse_milestone}.10
 License:        CPL
 Group:          Text Editors/Integrated Development Environments (IDE)
 URL:            http://www.eclipse.org/
@@ -176,8 +176,7 @@ Summary:        Eclipse PDE
 Group:          Text Editors/Integrated Development Environments (IDE)
 Requires:       %{name}-ui = %{version}-%{release}
 Requires:       %{name}-source = %{version}-%{release}
-# FIXME:  Should PDE require JDT?
-#Requires:       %{name}-jdt = %{version}-%{release}
+Requires:       %{name}-jdt = %{version}-%{release}
 
 %description    pde
 Eclipse PDE.
@@ -589,10 +588,10 @@ mkdir $RPM_BUILD_ROOT%{_datadir}/%{name}/buildscripts
 cp copy-platform $RPM_BUILD_ROOT%{_datadir}/%{name}/buildscripts
 
 # Native build
-gcj-dbtool4 -n $RPM_BUILD_ROOT%{_datadir}/%{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 .jar`.so $j;
+      -o $RPM_BUILD_ROOT%{_libdir}/%{name}/`basename $j`.so $j;
 done
 
 # FIXME until libgcj contains gnujaxp (libgcj PR 19301)
@@ -606,7 +605,7 @@ gcj4 -fPIC -fjni -findirect-dispatch -shared \
       -o $RPM_BUILD_ROOT%{_libdir}/%{name}/xerces-j2-2.6.2.so \
       %{_datadir}/java/xerces-j2-2.6.2.jar
 
-# Copy jdtcore.jar to %{_datadir}/java
+# Copy jdtcore.jar to %{_datadir}/java for eclipse-ecj
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/java
 ln -s %{_datadir}/%{name}/plugins/org.eclipse.jdt.core_%{eclipse_majmin}.%{eclipse_micro}/jdtcore.jar \
   $RPM_BUILD_ROOT%{_datadir}/java/jdtcore.jar
@@ -616,10 +615,12 @@ ln -s %{_datadir}/%{name}/plugins/org.eclipse.jdt.core_%{eclipse_majmin}.%{eclip
 #rm ecj-bootstrap.jar
 %endif
 
-%post
+%post -n 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 %{_datadir}/%{name}/.eclipse.db \
-      $j %{_libdir}/%{name}/`basename $j .jar`.so;
+    gcj-dbtool4 -a %{_libdir}/%{name}/.eclipse.db \
+      $j %{_libdir}/%{name}/`basename $j`.so;
 done
 
 
@@ -676,6 +677,13 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(0644,root,root,0755)
 
 %changelog
+* Fri Jan 14 2005 Andrew Overholt <overholt@redhat.com> 3.1-0.M4.10
+- make PDE depend upon JDT
+- move precompiled db to %{_libdir}/eclipse
+- modify launching script to use compiled .sos
+- rename compiled .sos to be .jar.so instead of .so
+- for now, do dbtool adding in platform install
+
 * Wed Jan 12 2005 Andrew Overholt <overholt@redhat.com> 3.1-0.M4.9
 - add ppc
 - add launcher and swt patches