diff --git a/.cvsignore b/.cvsignore
index fd9eb20..e69de29 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1,3 +0,0 @@
-eclipse-rhdocs-r20040726.tar.gz
-eclipse-sourceBuild-srcIncluded-3.0.zip
-eclipse-sourceBuild-srcIncluded-3.1M4.zip
diff --git a/eclipse-build.patch b/eclipse-build.patch
new file mode 100644
index 0000000..06af277
--- /dev/null
+++ b/eclipse-build.patch
@@ -0,0 +1,18 @@
+--- build.xml.orig 2005-02-19 11:43:10.000000000 -0500
++++ build.xml 2005-02-19 11:44:30.000000000 -0500
+@@ -91,6 +91,15 @@
+
+
+
++
++
++
++
++
++
++
++
++
+
+
+
diff --git a/eclipse-libupdatebuild.patch b/eclipse-libupdatebuild.patch
new file mode 100644
index 0000000..7995cb9
--- /dev/null
+++ b/eclipse-libupdatebuild.patch
@@ -0,0 +1,29 @@
+--- plugins/org.eclipse.update.core.linux/src/build.xml.orig 2005-02-07 14:16:05.353485675 -0500
++++ plugins/org.eclipse.update.core.linux/src/build.xml 2005-02-07 14:17:04.365259400 -0500
+@@ -47,7 +47,7 @@
+
+
+
+-
++
+
+
+
+@@ -56,9 +56,8 @@
+
+
+
++
+
+-
+-
+
+
+
+@@ -67,4 +66,4 @@
+
+
+
+-
+\ No newline at end of file
++
diff --git a/eclipse-libupdatebuild2.patch b/eclipse-libupdatebuild2.patch
new file mode 100644
index 0000000..52ff2b6
--- /dev/null
+++ b/eclipse-libupdatebuild2.patch
@@ -0,0 +1,10 @@
+--- plugins/org.eclipse.update.core.linux/src/build.xml.orig 2005-02-07 15:33:34.513890526 -0500
++++ plugins/org.eclipse.update.core.linux/src/build.xml 2005-02-07 15:33:50.705301151 -0500
+@@ -5,7 +5,7 @@
+
+
+
+-
++
+
+
diff --git a/eclipse.spec b/eclipse.spec
index 2571060..459c76e 100644
--- a/eclipse.spec
+++ b/eclipse.spec
@@ -1,62 +1,34 @@
-# Uncomment this if you have pre-jpackage ant.
-#%%define ant JAVA_HOME=%{java_home} classic-ant
+Epoch: 1
-# The intersection of the IBM-supported platforms and
-# the platforms we want.
-ExclusiveArch: i386 x86_64
-Epoch: 1
-
-%define pkg_summary An open extensible IDE
+%define pkg_summary An open, extensible IDE
%define section free
-%define swt_version 3063
-%define corelib_version 2_1_0b
+%define swt_version 3123
%define eclipse_major 3
-%define eclipse_minor 0
+%define eclipse_minor 1
%define eclipse_majmin %{eclipse_major}.%{eclipse_minor}
-%define eclipse_micro 1
+%define eclipse_micro 0
+%define eclipse_oldmajminmic 3.0.0
%define libname libswt3
+%define build_id I20050219-1500
%ifarch %{ix86}
%define eclipse_arch x86
-%define java_arch i386
-%endif
-%ifarch alpha
-%define eclipse_arch alpha
-%define java_arch alpha
-%endif
-%ifarch ia64
-%define eclipse_arch ia64
-%define java_arch ia64
-%endif
-%ifarch ppc
-%define eclipse_arch ppc
-%define java_arch ppc
-%endif
-%ifarch ppc64
-%define eclipse_arch ppc64
-%define java_arch ppc
%endif
%ifarch ppc64pseries
%define eclipse_arch ppc64
-%define java_arch ppc
-%endif
-%ifarch sparc64
-%define eclipse_arch sparc64
-%define java_arch sparc
%endif
%ifarch x86_64
%define eclipse_arch amd64
-%define java_arch amd64
%endif
Summary: %{pkg_summary}
Name: eclipse
Version: %{eclipse_majmin}.%{eclipse_micro}_fc
-Release: 14
+Release: 0.M5.1
License: CPL
Group: Text Editors/Integrated Development Environments (IDE)
URL: http://www.eclipse.org/
-Source0: http://download.eclipse.org/downloads/drops/R-3.0.1-200409161125/eclipse-sourceBuild-srcIncluded-3.0.1.zip
+Source0: http://download.eclipse.org/eclipse/downloads/drops/S-3.1M5a-200502191500/eclipse-sourceBuild-srcIncluded-3.1M5a.zip
Source1: %{name}.script
Source2: %{name}.desktop
Source3: %{name}-16.gif
@@ -66,61 +38,47 @@ Source6: %{name}.conf
Source7: %{name}-jdt.install
Source8: %{name}-pde.install
Source9: %{name}-platform.install
-Source10: %{name}-source.install
-Source14: %{name}-gtk.install
-Source17: %{name}-tools-build.xml
-Source18: %{name}-redhat-splash.png
-Source20: %{name}-rhdocs-r20041017.tar.gz
-Source21: %{name}-copy-platform.sh
-Source22: %{name}-tutorials.pdf
-Source23: %{name}-jdt.jarswithnativelibs
-Source24: %{name}-pde.jarswithnativelibs
-Source25: %{name}-platform.jarswithnativelibs
-Source26: %{libname}-gtk2.jarswithnativelibs
-
-Patch0: %{name}-make-gtk.patch
-Patch1: %{name}-make-core.patch
-Patch2: %{name}-make-gtk2.patch
-Patch9: %{name}-org.eclipse.core.resources-Makefile.patch
-Patch16: %{name}-make-gtk3.patch
-Patch17: %{name}-platformOptions.patch
-# We don't use this one yet but we want to keep it around.
-# The mozilla stuff requires 1.6.
-Patch18: %{name}-make-gtk4.patch
-Patch19: %{name}-jnigen.patch
-Patch20: %{name}-gtk-launcher.patch
-Patch21: %{name}-org.eclipse.help.appserver-host.patch
-Patch22: %{name}-welcome-screen.patch
-Patch23: %{name}-cvs-permission-bits.patch
-Patch24: %{name}-cvs-permission-bits2.patch
-Patch25: %{name}-search.patch
-Patch26: %{name}-textsearch.patch
-Patch27: %{name}-webappcpfix.patch
-Patch28: %{name}-textbinarysearch.patch
+Source11: %{name}-redhat-splash.png
+Source12: %{name}-jdt.jarswithnativelibs
+Source13: %{name}-pde.jarswithnativelibs
+Source14: %{name}-platform.jarswithnativelibs
+Source15: %{libname}-gtk2.jarswithnativelibs
+Source16: %{name}-copy-platform.sh
+
+# Don't build AWT
+Patch0: %{name}-make-linux.patch
+# Work around libgcj #19132
+# http://gcc.gnu.org/bugzilla/show_bug.cgi?id=19132
+Patch1: %{name}-textsearch.patch
+# Build JNI libs
+# FIXME: these should be built by upstream build method
+Patch2: %{name}-build.patch
+Patch4: %{name}-libupdatebuild.patch
+Patch5: %{name}-libupdatebuild2.patch
+# This will hopefully be pushed upstream
+Patch6: %{name}-bootstrapbuild.patch
+# This is so that we can build ecj native during the build
+Patch7: %{name}-nobootstrapbuild.patch
+# https://bugs.eclipse.org/bugs/show_bug.cgi?id=85915
+Patch8: %{name}-antsecuritymanager.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
BuildRequires: ant
BuildRequires: perl
BuildRequires: jpackage-utils >= 0:1.5, make, gcc
-# Until we get gnujaxp into libgcj (libgcj PR 19301),
-# we need xalan, xerces and xml-common-apis
-BuildRequires: xalan-j2, xerces-j2, xml-commons-apis
-# MDK 9.1 libgnome-vfs2_0-devel
-# RH 8.0, 9, FC 1: gnome-vfs2-devel
-# BuildRequires: %{_libdir}/pkgconfig/gnome-vfs-2.0.pc
-# Trying to use %{_libdir} causes problems on 64-bit arches
BuildRequires: gnome-vfs2-devel
-# MDK 9.1: libgtk+2.0_0-devel
-# RH 8.0, 9, FC 1: gtk2-devel
-# BuildRequires: %{_libdir}/pkgconfig/gtk+-2.0.pc
BuildRequires: gtk2-devel
-# MDK 9.1: libglib2.0_0-devel
-# RH 8.0, 9, FC 1: glib2-devel
-# BuildRequires: %{_libdir}/pkgconfig/gthread-2.0.pc
BuildRequires: glib2-devel
-BuildRequires: gcc4-java >= 4.0.0-0.21
+BuildRequires: gcc4-java >= 4.0.0-0.27
BuildRequires: java-1.4.2-gcj4-compat-devel >= 1.4.2.0-2jpp
+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
+BuildRequires: ant-jdepend ant-jmf ant-junit ant-nodeps ant-swing ant-trax
+#BuildRequires: jsch
+BuildRequires: jakarta-commons-beanutils jakarta-commons-collections jakarta-commons-digester jakarta-commons-logging
+#BuildRequires: jakarta-commons-modeler mx4j servlet lucene-demo jasper4 tomcat4
+BuildRequires: regexp junit
%description
The Eclipse Platform is designed for building integrated development
@@ -133,7 +91,7 @@ Summary: Eclipse Compiler for Java
Group: Development/Languages
Obsoletes: ecj
Provides: ecj
-Requires: gcc4-java >= 4.0.0-0.21
+Requires: gcc4-java >= 4.0.0-0.27
%description ecj
Eclipse compiler for Java.
@@ -142,53 +100,71 @@ Eclipse compiler for Java.
Summary: Eclipse platform common files
Group: Text Editors/Integrated Development Environments (IDE)
Provides: %{name} = %{version}-%{release}
-Obsoletes: %{name}-sdk eclipse
-Provides: %{name}-sdk
+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
-Requires: %{name}-gtk2
Requires: /usr/bin/perl
-Requires: gcc4-java >= 4.0.0-0.21
+Requires: gcc4-java >= 4.0.0-0.27
+Requires: %{libname}-gtk2 = %{epoch}:%{version}-%{release}
+Requires: /usr/bin/mozilla
+
+Requires: ant-antlr ant-apache-bcel ant-apache-log4j ant-apache-oro ant-apache-regexp ant-apache-resolver ant-commons-logging
+#Requires: ant-apache-bsf ant-commons-net ant-jsch lucene
+Requires: ant-jdepend ant-jmf ant-junit ant-nodeps ant-swing ant-trax
+#Requires: jsch
+Requires: jakarta-commons-beanutils jakarta-commons-collections jakarta-commons-digester jakarta-commons-logging
+#Requires: jakarta-commons-modeler mx4j servlet lucene-demo jasper4 tomcat4
+Requires: regexp junit
%description platform
-Eclipse platform common files. In addition to this, you'll need a UI package
-(GTK2) to be able to run the IDE.
+Eclipse platform common files. This package now contains the GTK2 UI (the
+former eclipse-gtk2 package).
-%package gtk2
-Summary: GTK2 UI for the Eclipse IDE
+%package platform-devel
+Summary: Eclipse platform Source
Group: Text Editors/Integrated Development Environments (IDE)
-Provides: %{name}-ui = %{epoch}:%{version}-%{release}
Requires: %{name}-platform = %{epoch}:%{version}-%{release}
-Requires: %{libname}-gtk2 = %{epoch}:%{version}-%{release}
-Requires: /usr/bin/mozilla
-%description gtk2
-GTK2 UI for the Eclipse IDE.
+%description platform-devel
+Source for Eclipse platform for use within Eclipse.
%package jdt
Summary: Eclipse Java development tools
Group: Text Editors/Integrated Development Environments (IDE)
-Requires: %{name}-ui = %{epoch}:%{version}-%{release}
+Requires: %{name}-platform = %{epoch}:%{version}-%{release}
Requires: %{name}-ecj = %{epoch}:%{version}-%{release}
-Requires: gcc4-java >= 4.0.0-0.21
-Requires: java-1.4.2-gcj4-compat-devel >= 1.4.2.0-2jpp
+Requires: gcc4-java >= 4.0.0-0.27
%description jdt
Eclipse Java developments tools.
-%package source
-Summary: Eclipse Source
+%package jdt-devel
+Summary: Eclipse JDT Source
Group: Text Editors/Integrated Development Environments (IDE)
+Requires: %{name}-jdt = %{epoch}:%{version}-%{release}
-%description source
-Eclipse Source.
+%description jdt-devel
+Source for JDT for use within Eclipse.
%package pde
Summary: Eclipse PDE
Group: Text Editors/Integrated Development Environments (IDE)
-Requires: %{name}-ui = %{epoch}:%{version}-%{release}
-Requires: %{name}-source = %{epoch}:%{version}-%{release}
Requires: %{name}-jdt = %{epoch}:%{version}-%{release}
-Requires: gcc4-java >= 4.0.0-0.21
+Requires: %{name}-platform-devel = %{epoch}:%{version}-%{release}
+Requires: gcc4-java >= 4.0.0-0.27
+
+%package pde-devel
+Summary: Eclipse PDE Source
+Group: Text Editors/Integrated Development Environments (IDE)
+Requires: %{name}-pde = %{epoch}:%{version}-%{release}
+Requires: %{name}-jdt-devel = %{epoch}:%{version}-%{release}
+Obsoletes: %{name}-source
+Provides: %{name}-source = %{epoch}:%{version}-%{release}
+
+%description pde-devel
+Source for PDE for use within Eclipse.
%description pde
Eclipse PDE.
@@ -196,328 +172,268 @@ Eclipse PDE.
%package -n %{libname}-gtk2
Summary: SWT Library for GTK2
Group: Text Editors/Integrated Development Environments (IDE)
-Requires: gcc4-java >= 4.0.0-0.21
%description -n %{libname}-gtk2
SWT Library for GTK2.
%prep
%setup -q -c
-pushd "plugins/org.eclipse.swt.tools"
-cp %{SOURCE17} build.xml
-popd
-pushd "plugins/org.eclipse.swt/Eclipse SWT PI/gtk/library"
+
+# I hate spaces in paths with patch!
+pushd plugins/org.eclipse.swt/Eclipse\ SWT\ PI/gtk/library
%patch0 -p0
popd
-%patch1 -p1
-%patch2 -p1
-%patch9 -p0
-pushd "plugins/org.eclipse.swt/Eclipse SWT PI/gtk/library"
-%patch16 -p0
-popd
-%patch17 -p0
-pushd "plugins/org.eclipse.swt.tools/JNI Generation"
-%patch19 -p0
-popd
-%patch20 -p0
-pushd "plugins/org.eclipse.help.appserver"
-%patch21 -p0
-popd
-pushd "plugins/org.eclipse.platform"
-%patch22 -p0
-popd
-pushd "plugins/org.eclipse.team.cvs.core"
-%patch23 -p0
-popd
-pushd "plugins/org.eclipse.team.cvs.ui"
-%patch24 -p0
-popd
-pushd "plugins/org.eclipse.search"
-%patch25 -p0
-popd
-%patch26 -p0
-%patch27 -p0
-%patch28 -p0
-
+%patch1 -p0
+%patch2 -p0
+%patch4 -p0
+%patch5 -p0
+%patch6 -p0
+%patch7 -p0
+%patch8 -p0
# Red Hat splash screen.
pushd plugins/org.eclipse.platform
-cp %{SOURCE18} splash.bmp
+cp %{SOURCE11} splash.bmp
popd
-# Nuke platform-dependent libs and executables
-find . -type f -name "*.s[lo]" -exec rm -f {} ';'
-find plugins/platform-launcher/bin -type f -name eclipse -exec rm -f {} ';'
-
-# That's a bit too verbose to me...
-perl -pi -e 's|(]+verbose=)"true"|${1}"false"|g' \
- `find . -type f -name "build*.xml"`
-
-# Fail on error...
-perl -pi -e 's|failonerror="[A-Za-z]*"|failonerror="yes"|g' \
- `find . -type f -name "build*.xml"`
-
-# Eclipse assumes you will only want to build on platforms for which
-# they ship. There are hard-coded files and directories in a few
-# places. For "non-approved" platforms we make a copy and massage it
-# into shape. This is written in a somewhat funny way so we can
-# extend it later if need be.
-src=
-dest=
-%ifarch ia64 ppc64 sparc64 x86_64
-src=amd64
-dest=%{eclipse_arch}
-%endif
-
-if test -n "$src"; then
- find . -name "*$src*" -print |
- while read f; do
- d=$(echo $f | sed -e "s/$src/$dest/g")
- mv $f $d
- done
-
- # Now update all the xml files to report our real arch.
- find . -name '*.xml' -print0 |
- xargs -0 perl -pi -e "s/$src/$dest/g;"
-fi
+# Remove existing .sos
+find -name \*.so -exec rm "-f" "{}" ";"
+
+## Remove these as well
+#rm jdtcore.jar jdtCompilerAdapter.jar
+
+# Symlinks
+
+## BEGIN ANT ##
+ln -sf %{_javadir}/ant/ant-antlr.jar plugins/org.apache.ant/lib/ant-antlr.jar
+ln -sf %{_javadir}/ant/ant-apache-bcel.jar plugins/org.apache.ant/lib/ant-apache-bcel.jar
+#ln -sf %{_javadir}/ant/ant-apache-bsf.jar plugins/org.apache.ant/lib/ant-apache-bsf.jar
+ln -sf %{_javadir}/ant/ant-apache-log4j.jar plugins/org.apache.ant/lib/ant-apache-log4j.jar
+ln -sf %{_javadir}/ant/ant-apache-oro.jar plugins/org.apache.ant/lib/ant-apache-oro.jar
+ln -sf %{_javadir}/ant/ant-apache-regexp.jar plugins/org.apache.ant/lib/ant-apache-regexp.jar
+ln -sf %{_javadir}/ant/ant-apache-resolver.jar plugins/org.apache.ant/lib/ant-apache-resolver.jar
+ln -sf %{_javadir}/ant/ant-commons-logging.jar plugins/org.apache.ant/lib/ant-commons-logging.jar
+#ln -sf %{_javadir}/ant/ant-commons-net.jar plugins/org.apache.ant/lib/ant-commons-net.jar
+# ------------------------------------------------------------------------
+# FIXME: can we just remove these?
+#rm -f plugins/org.apache.ant/lib/ant-icontract.jar
+##ln -sf %{_javadir}/ant/ant-icontract.jar plugins/org.apache.ant/lib/ant-icontract.jar
+#rm -f plugins/org.apache.ant/lib/ant-jai.jar
+##ln -sf %{_javadir}/ant/ant-jai.jar plugins/org.apache.ant/lib/ant-jai.jar
+#ln -sf %{_javadir}/ant.jar plugins/org.apache.ant/lib/ant.jar
+#rm -f plugins/org.apache.ant/lib/ant-javamail.jar
+##ln -sf %{_javadir}/ant/ant-javamail.jar plugins/org.apache.ant/lib/ant-javamail.jar
+# ------------------------------------------------------------------------
+ln -sf %{_javadir}/ant/ant-jdepend.jar plugins/org.apache.ant/lib/ant-jdepend.jar
+ln -sf %{_javadir}/ant/ant-jmf.jar plugins/org.apache.ant/lib/ant-jmf.jar
+#ln -sf %{_javadir}/ant/ant-jsch.jar plugins/org.apache.ant/lib/ant-jsch.jar
+ln -sf %{_javadir}/ant/ant-junit.jar plugins/org.apache.ant/lib/ant-junit.jar
+ln -sf %{_javadir}/ant-launcher.jar plugins/org.apache.ant/lib/ant-launcher.jar
+# ------------------------------------------------------------------------
+# FIXME: can we just remove these?
+rm -f plugins/org.apache.ant/lib/ant-netrexx.jar
+#ln -sf %{_javadir}/ant/ant-netrexx.jar plugins/org.apache.ant/lib/ant-netrexx.jar
+# ------------------------------------------------------------------------
+ln -sf %{_javadir}/ant/ant-nodeps.jar plugins/org.apache.ant/lib/ant-nodeps.jar
+# ------------------------------------------------------------------------
+## FIXME: can we just remove these?
+#rm -f plugins/org.apache.ant/lib/ant-starteam.jar
+##ln -sf %{_javadir}/ant/ant-starteam.jar plugins/org.apache.ant/lib/ant-starteam.jar
+#rm -f plugins/org.apache.ant/lib/ant-stylebook.jar
+##ln -sf %{_javadir}/ant/ant-stylebook.jar plugins/org.apache.ant/lib/ant-stylebook.jar
+# ------------------------------------------------------------------------
+ln -sf %{_javadir}/ant/ant-swing.jar plugins/org.apache.ant/lib/ant-swing.jar
+ln -sf %{_javadir}/ant/ant-trax.jar plugins/org.apache.ant/lib/ant-trax.jar
+# ------------------------------------------------------------------------
+# FIXME: can we just remove these?
+#rm -f plugins/org.apache.ant/lib/ant-vaj.jar
+##ln -sf %{_javadir}/ant/ant-vaj.jar plugins/org.apache.ant/lib/ant-vaj.jar
+#rm -f plugins/org.apache.ant/lib/ant-weblogic.jar
+##ln -sf %{_javadir}/ant/ant-weblogic.jar plugins/org.apache.ant/lib/ant-weblogic.jar
+#rm -f plugins/org.apache.ant/lib/ant-xalan1.jar
+##ln -sf %{_javadir}/ant/ant-xalan1.jar plugins/org.apache.ant/lib/ant-xalan1.jar
+#rm -f plugins/org.apache.ant/lib/ant-xslp.jar
+##ln -sf %{_javadir}/ant/ant-xslp.jar plugins/org.apache.ant/lib/ant-xslp.jar
+# ------------------------------------------------------------------------
+## END ANT ##
+#ln -sf %{_javadir}/lucene.jar plugins/org.apache.lucene/lucene-1.4.3.jar
+#ln -sf %{_datadir}/lucene/lucene-demos-1.4.3.jar plugins/org.apache.lucene/parser.jar
+# plugins/org.eclipse.core.boot/boot.jar
+ln -sf %{_javadir}/ant.jar plugins/org.eclipse.core.resources/lib/ant.jar
+# plugins/org.eclipse.core.resources/lib/antsupport.jar
+# plugins/org.eclipse.osgi/osgi/collx.jar
+# plugins/org.eclipse.osgi/osgi/ee.foundation.jar
+# plugins/org.eclipse.osgi/osgi/ee.minimum.jar
+# plugins/org.eclipse.osgi/osgi/exceptions.jar
+# plugins/org.eclipse.osgi/osgi/osgi-r3-jdk131-notsigned.jar
+#ln -sf %{_javadir}/xml-commons-apis.jar plugins/org.eclipse.osgi/osgi/xmlParserAPIs.jar
+# plugins/org.eclipse.osgi.services/services.jar
+# plugins/org.eclipse.osgi.util/util.jar
+# plugins/org.eclipse.platform.doc.isv/activeHelpSample.jar
+#ln -sf %{_javadir}/jsch.jar plugins/org.eclipse.team.cvs.ssh2/jsch-0.1.16.jar
+# plugins/org.eclipse.text/text.jar
+# ------------------------------------------------------------------------
+# FIXME: need tomcat4 rpm
+## BEGIN TOMCAT4 ##
+#ln -sf %{tomcat4dir}/bin/bootstrap.jar plugins/org.eclipse.tomcat/bootstrap.jar
+#ln -sf %{tomcat4dir}/server/lib/catalina.jar plugins/org.eclipse.tomcat/catalina.jar
+#ln -sf %{_javadir}/commons-beanutils.jar plugins/org.eclipse.tomcat/commons-beanutils.jar
+#ln -sf %{_javadir}/commons-collections.jar plugins/org.eclipse.tomcat/commons-collections.jar
+#ln -sf %{_javadir}/commons-digester.jar plugins/org.eclipse.tomcat/commons-digester.jar
+#ln -sf %{_javadir}/commons-logging-api.jar plugins/org.eclipse.tomcat/commons-logging-api.jar
+#ln -sf %{_javadir}/commons-logging.jar plugins/org.eclipse.tomcat/commons-logging.jar
+#ln -sf %{_javadir}/commons-modeler.jar plugins/org.eclipse.tomcat/commons-modeler.jar
+#ln -sf %{_javadir}/regexp.jar plugins/org.eclipse.tomcat/jakarta-regexp-1.3.jar
+#ln -sf %{_javadir}/jasper4-compiler.jar plugins/org.eclipse.tomcat/jasper-compiler.jar
+#ln -sf %{_javadir}/jasper4-runtime.jar plugins/org.eclipse.tomcat/jasper-runtime.jar
+#ln -sf %{_javadir}/mx4j/mx4j-jmx.jar plugins/org.eclipse.tomcat/mx4j-jmx.jar
+#ln -sf %{tomcat4dir}/common/lib/naming-common.jar plugins/org.eclipse.tomcat/naming-common.jar
+#ln -sf %{tomcat4dir}/common/lib/naming-factory.jar plugins/org.eclipse.tomcat/naming-factory.jar
+#ln -sf %{tomcat4dir}/common/lib/naming-resources.jar plugins/org.eclipse.tomcat/naming-resources.jar
+#ln -sf %{_javadir}/servlet.jar plugins/org.eclipse.tomcat/servlet.jar
+#ln -sf %{tomcat4dir}/server/lib/servlets-common.jar plugins/org.eclipse.tomcat/servlets-common.jar
+#ln -sf %{tomcat4dir}/server/lib/servlets-default.jar plugins/org.eclipse.tomcat/servlets-default.jar
+#ln -sf %{tomcat4dir}/server/lib/servlets-invoker.jar plugins/org.eclipse.tomcat/servlets-invoker.jar
+#ln -sf %{tomcat4dir}/server/lib/servlets-manager.jar plugins/org.eclipse.tomcat/servlets-manager.jar
+#ln -sf %{tomcat4dir}/server/lib/tomcat-coyote.jar plugins/org.eclipse.tomcat/tomcat-coyote.jar
+#ln -sf %{tomcat4dir}/server/lib/tomcat-http11.jar plugins/org.eclipse.tomcat/tomcat-http11.jar
+#ln -sf %{tomcat4dir}/server/lib/tomcat-util.jar plugins/org.eclipse.tomcat/tomcat-util.jar
+## END TOMCAT4 ##
+# ------------------------------------------------------------------------
+ln -sf %{_javadir}/junit.jar plugins/org.junit/junit.jar
%build
-## -------- ecj build --------
-# Build ecj that we can use for the rest of the build
-#
+## Build jdtcore.jar and jdtCompilerAdapter.jar
+#ant \
+# -DinstallOs=linux -DinstallWs=gtk -DinstallArch=%{eclipse_arch} \
+# bootstrap
-# We're going to muck with this, so let's keep a clean copy
-cp -r plugins/org.eclipse.jdt.core plugins/org.eclipse.jdt.core.original
+## Build a native ecj
+#gcj4 -fPIC -fjni -findirect-dispatch -shared -Wl,-Bsymbolic \
+# -o jdtcore.jar.so jdtcore.jar
+#gcj4 -fPIC -fjni -findirect-dispatch -shared -Wl,-Bsymbolic \
+# -o jdtCompilerAdapter.jar.so jdtCompilerAdapter.jar
+#gcj4 -O2 --main=org.eclipse.jdt.internal.compiler.batch.Main \
+# jdtcore.jar.so jdtCompilerAdapter.jar.so -o ecj
-pushd plugins/org.eclipse.jdt.core
-cp model/org/eclipse/jdt/core/Signature.java compiler/org/eclipse/jdt/core
-cp -r batch/org/eclipse/jdt/internal/compiler/batch \
- compiler/org/eclipse/jdt/internal/compiler
-cd compiler
-for f in `find -name '*.java' -o -name '*.properties' | cut -c 3-`; do
- gcj4 -I. -Wno-deprecated -C $f
-done
+## Use this ecj and our built jars
+#export LD_LIBRARY_PATH=.:$LD_LIBRARY_PATH
+#export PATH=.:$PATH
+export CLASSPATH=jdtcore.jar:jdtCompilerAdapter.jar:$CLASSPATH
-find -name '*.class' -or -name '*.properties' -or -name '*.rsc' |\
- xargs jar cf ../../../ecj-bootstrap.jar
+ant \
+ -Dnobootstrap=true \
+ -DinstallOs=linux -DinstallWs=gtk -DinstallArch=%{eclipse_arch} \
+ -Dlibsconfig=true
-popd
+pushd result
+# De-compress resulting tarball ... yeah, it's a .zip but actually a .tar.gz
+# See https://bugs.eclipse.org/bugs/show_bug.cgi?id=79711
+tar zxf org.eclipse.sdk-%{build_id}-linux.gtk.%{eclipse_arch}.zip
-# Let's return o.e.jdt.core to its original src state
-rm -rf plugins/org.eclipse.jdt.core
-mv plugins/org.eclipse.jdt.core.original plugins/org.eclipse.jdt.core
-
-# Now use this built ecj for the rest of the build
-#export CLASSPATH=`pwd`/ecj-bootstrap.jar:$CLASSPATH
-gcj4 -fPIC -fjni -findirect-dispatch -shared -Wl,-Bsymbolic \
- -o ecj-bootstrap.jar.so ecj-bootstrap.jar
-export LD_LIBRARY_PATH=`pwd`:$LD_LIBRARY_PATH
-# -------- ecj build --------
-
-pushd plugins/org.eclipse.swt.tools
-# FIXME: why were we removing this?
-#rm -f swttools.jar
-%{ant} \
- -DinstallOs=linux -DinstallWs=gtk -DinstallArch=%{eclipse_arch} \
- -Dbuild.compiler=modern \
- -DjavacVerbose=false -DjavacFailOnError=true \
- -Dbootclasspath=
-popd
+pushd eclipse
-mkdir -p './JNI Generation/org/eclipse/swt/tools/internal/'
-%{ant} -buildfile build.xml \
- -DinstallOs=linux -DinstallWs=gtk -DinstallArch=%{eclipse_arch} \
- -Dbuild.compiler=modern \
- -DjavacVerbose=false -DjavacFailOnError=true \
- -Dbootclasspath=%{_datadir}/java/libgcj-4.0.0.jar:%{_datadir}/java/xml-commons-apis-1.0.jar \
- compile
-
-# FIXME: need a gjdoc RPM
-## Overwrite eclipse.org documentation with our own and then build the docs
-#pushd plugins
-#ln org.eclipse.platform/startup.jar ../.
-#for buildDoc in `/usr/bin/gzip -dc %{SOURCE20} | tar -vxf - | grep build.xml`; do
-# pushd `echo $buildDoc | sed -e 's/build.xml//g'`
-# if [ -e buildDoc.xml ]; then
-# java -cp ../../startup.jar org.eclipse.core.launcher.Main -application org.eclipse.ant.core.antRunner -v -f buildDoc.xml
-# fi
-# popd
-#done
-#rm ../startup.jar
-#popd
-
-suff=
-%ifarch alpha ia64 ppc64 sparc64 x86_64
-suff=.gtk64/src
-%endif
-
-# Symlink some gtk sources.
-pushd "plugins/org.eclipse.swt${suff}/Eclipse SWT PI/gtk/library" &&
-ln -sf "../../../Eclipse SWT Program/gnome/library/"*.[ch] . &&
-ln -sf "../../../Eclipse SWT AWT/gtk/library/"*.[ch] . &&
-ln -sf "../../../Eclipse SWT Mozilla/common/library/"*.cpp . &&
-popd
-
-pushd "plugins/org.eclipse.swt${suff}/Eclipse SWT/common/library"
-cp -p callback.c callback.h make_common.mak swt.h swt.c \
- "../../../Eclipse SWT PI/gtk/library"
-popd
+# Native build
+mkdir -p $RPM_BUILD_ROOT%{_libdir}/%{name}
+for j in `find -name \*.jar`; do
+ d=".%{_libdir}/%{name}/`dirname $j | sed 's:\./::'`";
+ mkdir -p $d;
+ s=`echo $j | sed "s:\./::"`;
+ gcj4 -fPIC -fjni -findirect-dispatch -shared -Wl,-Bsymbolic \
+ -o $d/`basename $j`.so $j;
+done
-pushd "plugins/org.eclipse.swt${suff}/Eclipse SWT PI/gtk/library"
-swtflags=
-%ifarch alpha ia64 ppc64 sparc64 x86_64
-swtflags='SWT_PTR_CFLAGS=-DSWT_PTR_SIZE_64'
-%ifarch ia64
-# Sigh.
-swtflags="$swtflags XTEST_LIB_PATH=/usr/X11R6/lib"
-%endif
-%ifarch x86_64
-# Double sigh.
-swtflags="$swtflags XTEST_LIB_PATH=/usr/X11R6/lib64"
-%endif
-%endif
-make \
-$swtflags \
-JAVA_HOME="%{java_home}" \
-JAVA_JNI="%{java_home}/include" \
-AWT_LIB_PATH="%{java_home}/jre/bin" \
-JPACKAGE_CFLAGS="$RPM_OPT_FLAGS -DNO_LONG -I%{java_home}/include -I%{java_home}/include/linux" \
-MOZILLA_HOME="" \
-MOZILLA_INCLUDE_BASE="/usr/include/mozilla-1.4.2" \
-MOZILLA_LIBFLAG="" \
--f make_gtk.mak all
-mkdir -p ../../../os/linux/%{eclipse_arch}
-cp -p libswt-*.so ../../../os/linux/%{eclipse_arch}
-popd
+## Remove ecj binary and re-build it
+#rm ../../ecj
+#pushd .%{_libdir}/%{name}/plugins/org.eclipse.jdt.core_3.1.0
+# gcj4 -O2 --main=org.eclipse.jdt.internal.compiler.batch.Main \
+# -Wl,-R,%{_libdir}/%{name}/plugins/org.eclipse.jdt.core_3.1.0 \
+# jdtcore.jar.so jdtCompilerAdapter.jar.so -o ecj
+#popd
+#mv .%{_libdir}/%{name}/plugins/org.eclipse.jdt.core_3.1.0/ecj ../..
-pushd plugins/platform-launcher/library/gtk
-make \
-JPACKAGE_CFLAGS="$RPM_OPT_FLAGS" \
-DEFAULT_OS="linux" \
-DEFAULT_OS_ARCH="%{eclipse_arch}" \
-DEFAULT_WS="gtk" \
-PROGRAM_OUTPUT="eclipse" \
-PROGRAM_NAME="Eclipse" \
--f make_gtk.mak clean all
-cp -p eclipse ../../bin/linux/gtk
-popd
-cp -p plugins/platform-launcher/bin/linux/gtk/eclipse .
+# FIXME: temporarily remove resources.jar
+rm \
+ .%{_libdir}/%{name}/plugins/org.eclipse.core.resources_%{eclipse_majmin}.%{eclipse_micro}/resources.jar.so
-pushd plugins/org.eclipse.core.resources.linux/src
-make JDK_INCLUDE="%{java_home}/include" JPACKAGE_CFLAGS="$RPM_OPT_FLAGS -I%{java_home}/include -I%{java_home}/include/linux"
-mkdir -p ../os/linux/%{eclipse_arch}
-cp -p libcore_*.so ../os/linux/%{eclipse_arch}
-popd
+# Tar up the native libs
+tar czvf ../%{name}-nativelycompiledjars.tar.gz .%{_libdir}/%{name}
-pushd plugins/org.eclipse.update.core.linux/src
-gcc $RPM_OPT_FLAGS -fPIC -o libupdate.so -shared *.c -I. -I%{java_home}/include -I%{java_home}/include/linux
popd
-pushd plugins/org.eclipse.team.cvs.core/library
-make \
-JAVA_HOME="%{java_home}" \
-OS="linux" \
-clean all
+# Remove expanded eclipse build
+rm -rf eclipse
+ls
popd
%install
rm -rf $RPM_BUILD_ROOT
-export LD_LIBRARY_PATH=`pwd`:$LD_LIBRARY_PATH
-#export CLASSPATH=`pwd`/ecj-bootstrap.jar:$CLASSPATH
-%{ant} \
- -DinstallOs=linux -DinstallWs=gtk -DinstallArch=%{eclipse_arch} \
- -Dbuild.compiler=modern \
- -DjavacVerbose=false -DjavacFailOnError=true \
- -Djavadoc=%{javadoc} \
- -Dbootclasspath=%{_datadir}/java/libgcj-4.0.0.jar:%{_datadir}/java/xml-commons-apis-1.0.jar \
- install
-
-
install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/%{name}
-find result -type f -name "*.zip" -exec unzip -d $RPM_BUILD_ROOT%{_datadir} {} \;
-install -m 644 plugins/org.eclipse.platform/startup.jar $RPM_BUILD_ROOT%{_datadir}/%{name}/startup.jar
-rm -f $RPM_BUILD_ROOT%{_datadir}/%{name}/plugins/org.eclipse.platform_*/startup.jar
-install -m 644 plugins/platform-launcher/bin/linux/gtk/icon.xpm $RPM_BUILD_ROOT%{_datadir}/%{name}/icon.xpm
+# https://bugs.eclipse.org/bugs/show_bug.cgi?id=79711
+tar -C $RPM_BUILD_ROOT%{_datadir} -zxf \
+ result/org.eclipse.sdk-%{build_id}-linux.gtk.%{eclipse_arch}.zip
-# binaries and libs
+# Binaries, libraries, and natively-built shared libraries
install -d -m 755 $RPM_BUILD_ROOT%{_libdir}/%{name}
-install -m 755 eclipse $RPM_BUILD_ROOT%{_libdir}/%{name}/eclipse
-touch $RPM_BUILD_ROOT%{_libdir}/%{name}/eclipse
+# Natively-compiled jars (shared libraries)
+tar -C $RPM_BUILD_ROOT -zxf result/%{name}-nativelycompiledjars.tar.gz
-install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/%{name}
+install -d -m 755 $RPM_BUILD_ROOT%{_bindir}
+
+## Rebuild ecj binary
+## FIXME: is this the best place for this?
+#gcj4 -O2 --main=org.eclipse.jdt.internal.compiler.batch.Main \
+# $RPM_BUILD_ROOT%{_libdir}/%{name}/plugins/org.eclipse.jdt.core_3.1.0/jdtCompilerAdapter.jar.so \
+# $RPM_BUILD_ROOT%{_libdir}/%{name}/plugins/org.eclipse.jdt.core_3.1.0/jdtcore.jar.so \
+# -o $RPM_BUILD_ROOT%{_bindir}/ecj
+
+# Eclipse binary
+mv $RPM_BUILD_ROOT%{_datadir}/%{name}/eclipse \
+ $RPM_BUILD_ROOT%{_libdir}/%{name}/eclipse
pushd $RPM_BUILD_ROOT%{_datadir}/%{name}
ln -sf %{_libdir}/%{name}/eclipse eclipse
-popd
+# JNI libraries
+cp -p plugins/org.eclipse.update.core.linux_%{eclipse_oldmajminmic}/os/linux/%{eclipse_arch}/libupdate.so \
+ $RPM_BUILD_ROOT%{_libdir}/%{name}/
+cp -p plugins/org.eclipse.core.resources.linux_%{eclipse_oldmajminmic}/os/linux/%{eclipse_arch}/libcore_*.so \
+ $RPM_BUILD_ROOT%{_libdir}/%{name}/
suff=
%ifarch alpha ia64 ppc64 sparc64 x86_64
-suff=.gtk64/src
+suff=64
%endif
-
-cp -p plugins/org.eclipse.update.core.linux/src/libupdate*.so $RPM_BUILD_ROOT%{_libdir}/%{name}/
-cp -p plugins/org.eclipse.core.resources.linux/os/linux/%{eclipse_arch}/libcore_*.so $RPM_BUILD_ROOT%{_libdir}/%{name}/
-cp -p plugins/org.eclipse.swt${suff}/os/linux/%{eclipse_arch}/libswt*.so $RPM_BUILD_ROOT%{_libdir}/%{name}/
-cp -p plugins/org.eclipse.team.cvs.core/library/libcvs.so $RPM_BUILD_ROOT%{_libdir}/%{name}/
-
-pushd $RPM_BUILD_ROOT%{_libdir}/%{name}
-chmod 755 eclipse *.so
+cp -p plugins/org.eclipse.swt.gtk${suff}_%{eclipse_majmin}.%{eclipse_micro}/os/linux/%{eclipse_arch}/libswt*.so \
+ $RPM_BUILD_ROOT%{_libdir}/%{name}/
popd
-install -d -m 755 $RPM_BUILD_ROOT%{_jnidir}
-install -d -m 755 $RPM_BUILD_ROOT%{_libdir}
-
-### begin core lib symlinks
-install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/%{name}/plugins/org.eclipse.core.resources.linux_%{eclipse_majmin}.%{eclipse_micro}/os/linux/%{eclipse_arch}
-pushd $RPM_BUILD_ROOT%{_datadir}/%{name}/plugins/org.eclipse.core.resources.linux_%{eclipse_majmin}.%{eclipse_micro}/os/linux/%{eclipse_arch}
-ln -sf %{_libdir}/%{name}/libcore_%{corelib_version}.so libcore_%{corelib_version}.so
-popd
-
-install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/%{name}/plugins/org.eclipse.update.core.linux_%{eclipse_majmin}.%{eclipse_micro}/os/linux
-pushd $RPM_BUILD_ROOT%{_datadir}/%{name}/plugins/org.eclipse.update.core.linux_%{eclipse_majmin}.%{eclipse_micro}/os/linux
-ln -sf %{_libdir}/%{name}/libupdate.so libupdate.so
+pushd $RPM_BUILD_ROOT%{_libdir}/%{name}
+chmod -R 755 eclipse *.so
popd
-### end core lib symlinks
### begin libswt-gtk2 symlinks
pushd $RPM_BUILD_ROOT%{_libdir}
+#for base in mozilla-gtk atk-gtk gnome-gtk gtk pi-gtk; do
for base in atk-gtk gnome-gtk gtk pi-gtk; do
ln -sf %{_libdir}/%{name}/libswt-${base}-%{swt_version}.so \
libswt-${base}-%{swt_version}.so
done
popd
-pushd $RPM_BUILD_ROOT%{_jnidir}
-ln -sf %{_datadir}/%{name}/plugins/org.eclipse.swt.gtk*_%{eclipse_majmin}.%{eclipse_micro}/ws/gtk/swt.jar swt-gtk-%{version}.jar
-ln -sf %{_datadir}/%{name}/plugins/org.eclipse.swt.gtk*_%{eclipse_majmin}.%{eclipse_micro}/ws/gtk/swt-pi.jar swt-pi-gtk-%{version}.jar
-popd
+install -d -m 755 $RPM_BUILD_ROOT%{_javadir}
-mkdir -p $RPM_BUILD_ROOT%{_datadir}/%{name}/plugins/org.eclipse.swt.gtk*_%{eclipse_majmin}.%{eclipse_micro}/os/linux/%{eclipse_arch}
-pushd $RPM_BUILD_ROOT%{_datadir}/%{name}/plugins/org.eclipse.swt.gtk*_%{eclipse_majmin}.%{eclipse_micro}/os/linux/%{eclipse_arch}
-for base in atk-gtk gnome-gtk gtk pi-gtk; do
- ln -sf %{_libdir}/%{name}/libswt-${base}-%{swt_version}.so \
- libswt-${base}-%{swt_version}.so
-done
+pushd $RPM_BUILD_ROOT%{_javadir}
+ln -sf %{_datadir}/%{name}/plugins/org.eclipse.swt.gtk${suff}_%{eclipse_majmin}.%{eclipse_micro}/ws/gtk/swt.jar swt-gtk-%{version}.jar
+ln -sf %{_datadir}/%{name}/plugins/org.eclipse.swt.gtk${suff}_%{eclipse_majmin}.%{eclipse_micro}/ws/gtk/swt-pi.jar swt-pi-gtk-%{version}.jar
+ln -sf %{_datadir}/%{name}/plugins/org.eclipse.swt.gtk${suff}_%{eclipse_majmin}.%{eclipse_micro}/ws/gtk/swt-mozilla.jar swt-mozilla-%{version}.jar
popd
-
### end libswt-gtk2 symlinks
-### begin libcvs symlink
-mkdir -p $RPM_BUILD_ROOT%{_datadir}/%{name}/plugins/org.eclipse.team.cvs.core_%{eclipse_majmin}.%{eclipse_micro}/os/linux/%{eclipse_arch}
-pushd $RPM_BUILD_ROOT%{_datadir}/%{name}/plugins/org.eclipse.team.cvs.core_%{eclipse_majmin}.%{eclipse_micro}/os/linux/%{eclipse_arch}
-ln -sf %{_libdir}/%{name}/libcvs.so libcvs.so
-popd
-### end libcvs symlink
-
-### begin jar symlinks
-(cd $RPM_BUILD_ROOT%{_jnidir} && for jar in *-%{version}*; do ln -sf ${jar} ${jar/-%{version}/}; done)
-### end jar symlinks
-
-# Script
+# Launching script
mkdir -p $RPM_BUILD_ROOT%{_bindir}
perl -pe \
's|/usr/lib/eclipse/|%{_libdir}/%{name}/|g ;
@@ -530,11 +446,6 @@ mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}
perl -pe 's|/usr/lib/eclipse/|%{_datadir}/%{name}/|g' \
%{SOURCE6} > $RPM_BUILD_ROOT%{_sysconfdir}/eclipse.conf
-# symlink for build scripts that rely on 3.0.0 path
-pushd $RPM_BUILD_ROOT%{_datadir}/%{name}/plugins
-ln -s org.eclipse.pde.build_%{eclipse_majmin}.%{eclipse_micro} org.eclipse.pde.build_3.0.0
-popd
-
# rh/freedesktop.org icons
install -p -D -m0644 %{SOURCE5} \
$RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/apps/%{name}.png
@@ -546,10 +457,6 @@ install -d -m0755 $RPM_BUILD_ROOT%{_datadir}/pixmaps
ln -s ../icons/hicolor/48x48/apps/%{name}.png \
$RPM_BUILD_ROOT%{_datadir}/pixmaps
-# rh docs
-install -p -D -m0644 %{SOURCE22} \
- $RPM_BUILD_ROOT%{_datadir}/doc/%{name}-%{eclipse_majmin}.%{eclipse_micro}/%{name}-tutorial.pdf
-
# A sanity check.
desktop-file-validate %{SOURCE2}
@@ -561,9 +468,6 @@ cat %{SOURCE7} > %{name}-jdt.install
cat %{SOURCE8} > %{name}-pde.install
cat %{SOURCE9} > %{name}-platform.install
-cat %{SOURCE10} > %{name}-source.install
-cat %{SOURCE14} > %{name}-gtk.install
-
cat >> $RPM_BUILD_ROOT%{_datadir}/%{name}/.eclipseproduct << EOF
name=Eclipse Platform
id=org.eclipse.platform
@@ -572,7 +476,7 @@ EOF
# Create a script that can be used to make a symlink tree of the
# eclipse platform.
-cp %{SOURCE21} copy-platform
+cp %{SOURCE16} copy-platform
(
cd $RPM_BUILD_ROOT%{_datadir}/%{name}
ls -d * | egrep -v '^(plugins|features)$'
@@ -580,521 +484,385 @@ cp %{SOURCE21} copy-platform
) |
sed -e's/^\(.*\)$/\1 \1/' -e's,^,ln -s $eclipse/,' >> copy-platform
-mkdir $RPM_BUILD_ROOT%{_datadir}/%{name}/buildscripts
+mkdir -p $RPM_BUILD_ROOT%{_datadir}/%{name}/buildscripts
cp copy-platform $RPM_BUILD_ROOT%{_datadir}/%{name}/buildscripts
-# Native build
+pushd $RPM_BUILD_ROOT%{_datadir}/%{name}
+## BEGIN ANT ##
+ln -sf %{_javadir}/ant/ant-antlr.jar plugins/org.apache.ant_*/lib/ant-antlr.jar
+ln -sf %{_javadir}/ant/ant-apache-bcel.jar plugins/org.apache.ant_*/lib/ant-apache-bcel.jar
+#ln -sf %{_javadir}/ant/ant-apache-bsf.jar plugins/org.apache.ant_*/lib/ant-apache-bsf.jar
+ln -sf %{_javadir}/ant/ant-apache-log4j.jar plugins/org.apache.ant_*/lib/ant-apache-log4j.jar
+ln -sf %{_javadir}/ant/ant-apache-oro.jar plugins/org.apache.ant_*/lib/ant-apache-oro.jar
+ln -sf %{_javadir}/ant/ant-apache-regexp.jar plugins/org.apache.ant_*/lib/ant-apache-regexp.jar
+ln -sf %{_javadir}/ant/ant-apache-resolver.jar plugins/org.apache.ant_*/lib/ant-apache-resolver.jar
+ln -sf %{_javadir}/ant/ant-commons-logging.jar plugins/org.apache.ant_*/lib/ant-commons-logging.jar
+#ln -sf %{_javadir}/ant/ant-commons-net.jar plugins/org.apache.ant_*/lib/ant-commons-net.jar
+#ln -sf %{_javadir}/ant/ant-icontract.jar plugins/org.apache.ant_*/lib/ant-icontract.jar
+#ln -sf %{_javadir}/ant/ant-jai.jar plugins/org.apache.ant_*/lib/ant-jai.jar
+ln -sf %{_javadir}/ant.jar plugins/org.apache.ant_*/lib/ant.jar
+#ln -sf %{_javadir}/ant/ant-javamail.jar plugins/org.apache.ant_*/lib/ant-javamail.jar
+ln -sf %{_javadir}/ant/ant-jdepend.jar plugins/org.apache.ant_*/lib/ant-jdepend.jar
+ln -sf %{_javadir}/ant/ant-jmf.jar plugins/org.apache.ant_*/lib/ant-jmf.jar
+#ln -sf %{_javadir}/ant/ant-jsch.jar plugins/org.apache.ant_*/lib/ant-jsch.jar
+ln -sf %{_javadir}/ant/ant-junit.jar plugins/org.apache.ant_*/lib/ant-junit.jar
+ln -sf %{_javadir}/ant-launcher.jar plugins/org.apache.ant_*/lib/ant-launcher.jar
+#ln -sf %{_javadir}/ant/ant-netrexx.jar plugins/org.apache.ant_*/lib/ant-netrexx.jar
+ln -sf %{_javadir}/ant/ant-nodeps.jar plugins/org.apache.ant_*/lib/ant-nodeps.jar
+#ln -sf %{_javadir}/ant/ant-starteam.jar plugins/org.apache.ant_*/lib/ant-starteam.jar
+#ln -sf %{_javadir}/ant/ant-stylebook.jar plugins/org.apache.ant_*/lib/ant-stylebook.jar
+ln -sf %{_javadir}/ant/ant-swing.jar plugins/org.apache.ant_*/lib/ant-swing.jar
+ln -sf %{_javadir}/ant/ant-trax.jar plugins/org.apache.ant_*/lib/ant-trax.jar
+#ln -sf %{_javadir}/ant/ant-vaj.jar plugins/org.apache.ant_*/lib/ant-vaj.jar
+#ln -sf %{_javadir}/ant/ant-weblogic.jar plugins/org.apache.ant_*/lib/ant-weblogic.jar
+#ln -sf %{_javadir}/ant/ant-xalan1.jar plugins/org.apache.ant_*/lib/ant-xalan1.jar
+#ln -sf %{_javadir}/ant/ant-xslp.jar plugins/org.apache.ant_*/lib/ant-xslp.jar
+## END ANT ##
+#ln -sf %{_javadir}/lucene.jar plugins/org.apache.lucene_*/lucene-1.4.3.jar
+#ln -sf %{_datadir}/lucene/lucene-demos-1.4.3.jar plugins/org.apache.lucene_*/parser.jar
+# plugins/org.eclipse.core.boot_*/boot.jar
+###ln -sf %{_javadir}/ant.jar plugins/org.eclipse.core.resources_*/lib/ant.jar
+# plugins/org.eclipse.core.resources_*/lib/antsupport.jar
+# plugins/org.eclipse.osgi_*/osgi/collx.jar
+# plugins/org.eclipse.osgi_*/osgi/ee.foundation.jar
+# plugins/org.eclipse.osgi_*/osgi/ee.minimum.jar
+# plugins/org.eclipse.osgi_*/osgi/exceptions.jar
+# plugins/org.eclipse.osgi_*/osgi/osgi-r3-jdk131-notsigned.jar
+###ln -sf %{_javadir}/xml-commons-apis.jar plugins/org.eclipse.osgi_*/osgi/xmlParserAPIs.jar
+# plugins/org.eclipse.osgi.services_*/services.jar
+# plugins/org.eclipse.osgi.util_*/util.jar
+# plugins/org.eclipse.platform.doc.isv_*/activeHelpSample.jar
+#ln -sf %{_javadir}/jsch.jar plugins/org.eclipse.team.cvs.ssh2_*/jsch-0.1.16.jar
+# plugins/org.eclipse.text/text_*.jar
+## BEGIN TOMCAT4 ##
+##ln -sf %{tomcat4dir}/bin/bootstrap.jar plugins/org.eclipse.tomcat_*/bootstrap.jar
+#ln -sf %{tomcat4dir}/server/lib/catalina.jar plugins/org.eclipse.tomcat_*/catalina.jar
+#ln -sf %{_javadir}/commons-beanutils.jar plugins/org.eclipse.tomcat_*/commons-beanutils.jar
+#ln -sf %{_javadir}/commons-collections.jar plugins/org.eclipse.tomcat_*/commons-collections.jar
+#ln -sf %{_javadir}/commons-digester.jar plugins/org.eclipse.tomcat_*/commons-digester.jar
+#ln -sf %{_javadir}/commons-logging-api.jar plugins/org.eclipse.tomcat_*/commons-logging-api.jar
+#ln -sf %{_javadir}/commons-logging.jar plugins/org.eclipse.tomcat_*/commons-logging.jar
+#ln -sf %{_javadir}/commons-modeler.jar plugins/org.eclipse.tomcat_*/commons-modeler.jar
+#ln -sf %{_javadir}/regexp.jar plugins/org.eclipse.tomcat_*/jakarta-regexp-1.3.jar
+#ln -sf %{_javadir}/jasper4-compiler.jar plugins/org.eclipse.tomcat_*/jasper-compiler.jar
+#ln -sf %{_javadir}/jasper4-runtime.jar plugins/org.eclipse.tomcat_*/jasper-runtime.jar
+#ln -sf %{_javadir}/mx4j/mx4j-jmx.jar plugins/org.eclipse.tomcat_*/mx4j-jmx.jar
+#ln -sf %{tomcat4dir}/common/lib/naming-common.jar plugins/org.eclipse.tomcat_*/naming-common.jar
+#ln -sf %{tomcat4dir}/common/lib/naming-factory.jar plugins/org.eclipse.tomcat_*/naming-factory.jar
+#ln -sf %{tomcat4dir}/common/lib/naming-resources.jar plugins/org.eclipse.tomcat_*/naming-resources.jar
+#ln -sf %{_javadir}/servlet.jar plugins/org.eclipse.tomcat_*/servlet.jar
+#ln -sf %{tomcat4dir}/server/lib/servlets-common.jar plugins/org.eclipse.tomcat_*/servlets-common.jar
+#ln -sf %{tomcat4dir}/server/lib/servlets-default.jar plugins/org.eclipse.tomcat_*/servlets-default.jar
+#ln -sf %{tomcat4dir}/server/lib/servlets-invoker.jar plugins/org.eclipse.tomcat_*/servlets-invoker.jar
+#ln -sf %{tomcat4dir}/server/lib/servlets-manager.jar plugins/org.eclipse.tomcat_*/servlets-manager.jar
+#ln -sf %{tomcat4dir}/server/lib/tomcat-coyote.jar plugins/org.eclipse.tomcat_*/tomcat-coyote.jar
+#ln -sf %{tomcat4dir}/server/lib/tomcat-http11.jar plugins/org.eclipse.tomcat_*/tomcat-http11.jar
+#ln -sf %{tomcat4dir}/server/lib/tomcat-util.jar plugins/org.eclipse.tomcat_*/tomcat-util.jar
+## END TOMCAT4 ##
+ln -sf %{_javadir}/junit.jar plugins/org.junit_*/junit.jar
+
+# Create the gcj db
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 -Wl,-Bsymbolic \
- -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
-
-# Remove resources.jar
-rm $RPM_BUILD_ROOT%{_libdir}/%{name}/resources.jar.so
-cat $RPM_BUILD_ROOT%{_datadir}/%{name}/eclipsecompiledjars.list | \
- sed "/\/resources.jar$/d" > eclipsecompiledjars.list.1
-mv eclipsecompiledjars.list.1 \
- $RPM_BUILD_ROOT%{_datadir}/%{name}/eclipsecompiledjars.list
-
-# FIXME until libgcj contains gnujaxp (libgcj PR 19301)
-gcj4 -fPIC -fjni -findirect-dispatch -shared -Wl,-Bsymbolic \
- -o $RPM_BUILD_ROOT%{_libdir}/%{name}/xml-commons-apis-1.0.jar.so \
- %{_datadir}/java/xml-commons-apis-1.0.jar
-gcj4 -fPIC -fjni -findirect-dispatch -shared -Wl,-Bsymbolic \
- -o $RPM_BUILD_ROOT%{_libdir}/%{name}/xalan-j2-2.6.0.jar.so \
- %{_datadir}/java/xalan-j2-2.6.0.jar
-gcj4 -fPIC -fjni -findirect-dispatch -shared -Wl,-Bsymbolic \
- -o $RPM_BUILD_ROOT%{_libdir}/%{name}/xerces-j2-2.6.2.jar.so \
- %{_datadir}/java/xerces-j2-2.6.2.jar
# Copy these file lists for use at install time
-install -m 644 %{SOURCE23} $RPM_BUILD_ROOT%{_libdir}/%{name}
-install -m 644 %{SOURCE24} $RPM_BUILD_ROOT%{_libdir}/%{name}
-install -m 644 %{SOURCE25} $RPM_BUILD_ROOT%{_libdir}/%{name}
-install -m 644 %{SOURCE26} $RPM_BUILD_ROOT%{_libdir}/%{name}
+install -m 644 %{SOURCE12} $RPM_BUILD_ROOT%{_libdir}/%{name}
+install -m 644 %{SOURCE13} $RPM_BUILD_ROOT%{_libdir}/%{name}
+install -m 644 %{SOURCE14} $RPM_BUILD_ROOT%{_libdir}/%{name}
+install -m 644 %{SOURCE15} $RPM_BUILD_ROOT%{_libdir}/%{name}
# 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
-rm ecj-bootstrap.jar
+%clean
+rm -rf $RPM_BUILD_ROOT
%post ecj
-gcj-dbtool4 -a %{_libdir}/%{name}/eclipse.db \
+gcj-dbtool4 -n /tmp/eclipse-ecj.db 80000
+gcj-dbtool4 -a /tmp/eclipse-ecj.db \
%{_datadir}/%{name}/plugins/org.eclipse.jdt.core_%{eclipse_majmin}.%{eclipse_micro}/jdtcore.jar \
- %{_libdir}/%{name}/jdtcore.jar.so
-gcj-dbtool4 -a %{_libdir}/%{name}/eclipse.db \
+ %{_libdir}/%{name}/plugins/org.eclipse.jdt.core_%{eclipse_majmin}.%{eclipse_micro}/jdtcore.jar.so
+gcj-dbtool4 -a /tmp/eclipse-ecj.db \
%{_datadir}/%{name}/plugins/org.eclipse.jdt.core_%{eclipse_majmin}.%{eclipse_micro}/jdtCompilerAdapter.jar \
- %{_libdir}/%{name}/jdtCompilerAdapter.jar.so
+ %{_libdir}/%{name}/plugins/org.eclipse.jdt.core_%{eclipse_majmin}.%{eclipse_micro}/jdtCompilerAdapter.jar.so
+gcj-dbtool4 -m %{_libdir}/%{name}/eclipse.db /tmp/eclipse-ecj.db %{_libdir}/%{name}/eclipse.db
+rm -f /tmp/eclipse-ecj.db
%post jdt
+gcj-dbtool4 -n /tmp/eclipse-jdt.db 80000
for j in `cat %{_libdir}/%{name}/%{name}-jdt.jarswithnativelibs`; do
- gcj-dbtool4 -a %{_libdir}/%{name}/eclipse.db \
- $j %{_libdir}/%{name}/`basename $j`.so;
+ gcj-dbtool4 -a /tmp/eclipse-jdt.db \
+ $j `echo $j | sed "s:%{_datadir}:%{_libdir}:"`.so;
done
+gcj-dbtool4 -m %{_libdir}/%{name}/eclipse.db /tmp/eclipse-jdt.db %{_libdir}/%{name}/eclipse.db
+rm -f /tmp/eclipse-jdt.db
%post pde
+gcj-dbtool4 -n /tmp/eclipse-pde.db 80000
for j in `cat %{_libdir}/%{name}/%{name}-pde.jarswithnativelibs`; do
- gcj-dbtool4 -a %{_libdir}/%{name}/eclipse.db \
- $j %{_libdir}/%{name}/`basename $j`.so;
+ gcj-dbtool4 -a /tmp/eclipse-pde.db \
+ $j `echo $j | sed "s:%{_datadir}:%{_libdir}:"`.so;
done
+gcj-dbtool4 -m %{_libdir}/%{name}/eclipse.db /tmp/eclipse-pde.db %{_libdir}/%{name}/eclipse.db
+rm -f /tmp/eclipse-pde.db
%post platform
+gcj-dbtool4 -n /tmp/eclipse-platform.db 80000
for j in `cat %{_libdir}/%{name}/%{name}-platform.jarswithnativelibs`; do
- gcj-dbtool4 -a %{_libdir}/%{name}/eclipse.db \
- $j %{_libdir}/%{name}/`basename $j`.so;
+ gcj-dbtool4 -a /tmp/eclipse-platform.db \
+ $j `echo $j | sed "s:%{_datadir}:%{_libdir}:"`.so;
done
+gcj-dbtool4 -m %{_libdir}/%{name}/eclipse.db /tmp/eclipse-platform.db %{_libdir}/%{name}/eclipse.db
+rm -f /tmp/eclipse-platform.db
%post -n %{libname}-gtk2
+gcj-dbtool4 -n /tmp/%{libname}-gtk2.db 80000
for j in `cat %{_libdir}/%{name}/%{libname}-gtk2.jarswithnativelibs`; do
- gcj-dbtool4 -a %{_libdir}/%{name}/eclipse.db \
- $j %{_libdir}/%{name}/`basename $j`.so;
+ gcj-dbtool4 -a /tmp/%{libname}-gtk2.db \
+ $j `echo $j | sed "s:%{_datadir}:%{_libdir}:"`.so;
done
+gcj-dbtool4 -m %{_libdir}/%{name}/eclipse.db /tmp/%{libname}-gtk2.db %{_libdir}/%{name}/eclipse.db
+rm -f /tmp/%{libname}-gtk2.db
-%clean
-rm -rf $RPM_BUILD_ROOT
-
+# FIXME: add the native directories to these lists
%files ecj
%defattr(0644,root,root,0755)
%dir %{_datadir}/%{name}
+#%{_bindir}/ecj
%{_datadir}/%{name}/plugins/org.eclipse.jdt.core_3.*
%{_datadir}/java/jdtcore*.jar
# Native bits
%{_libdir}/%{name}/eclipse.db
-%attr(0644,root,root) %{_libdir}/%{name}/jdtcore.jar.so
-%attr(0644,root,root) %{_libdir}/%{name}/jdtCompilerAdapter.jar.so
-
-%files gtk2 -f %{name}-gtk.install
-%defattr(0644,root,root,0755)
-%attr(0755,root,root) %{_libdir}/%{name}/eclipse
+%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
%files -n %{libname}-gtk2
%defattr(0644,root,root,0755)
%{_datadir}/%{name}/plugins/org.eclipse.swt.gtk*_3.*
+%{_datadir}/%{name}/plugins/org.eclipse.jface_3.*
+%{_datadir}/%{name}/plugins/org.eclipse.jface.text_3.*
%attr(0755,root,root) %{_libdir}/%{name}/libswt-gnome-gtk-*.so
%attr(0755,root,root) %{_libdir}/%{name}/libswt-gtk-*.so
%attr(0755,root,root) %{_libdir}/%{name}/libswt-pi-gtk-*.so
%attr(0755,root,root) %{_libdir}/%{name}/libswt-atk-gtk-*.so
+# FIXME: should we be building this?
+#%attr(0755,root,root) %{_libdir}/%{name}/libswt-mozilla-gtk-*.so
%{_libdir}/libswt-*.so
-%{_jnidir}/swt-gtk*.jar
-%{_jnidir}/swt-pi-gtk*.jar
-# Native bits
+%{_javadir}/swt-gtk*.jar
+%{_javadir}/swt-pi-gtk*.jar
+## Native bits
%{_libdir}/%{name}/eclipse.db
-%attr(0664,root,root) %{_libdir}/%{name}/swt-mozilla.jar.so
-%attr(0664,root,root) %{_libdir}/%{name}/swt-pi.jar.so
-%attr(0664,root,root) %{_libdir}/%{name}/swt.jar.so
+%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
+%attr(0755,root,root) %{_libdir}/%{name}/plugins/org.eclipse.swt.gtk64_3.1.0/ws/gtk/swt.jar.so
+%else
+%attr(0755,root,root) %{_libdir}/%{name}/plugins/org.eclipse.swt.gtk_3.1.0/ws/gtk/swt-pi.jar.so
+%attr(0755,root,root) %{_libdir}/%{name}/plugins/org.eclipse.swt.gtk_3.1.0/ws/gtk/swt-mozilla.jar.so
+%attr(0755,root,root) %{_libdir}/%{name}/plugins/org.eclipse.swt.gtk_3.1.0/ws/gtk/swt-cairo.jar.so
+%attr(0755,root,root) %{_libdir}/%{name}/plugins/org.eclipse.swt.gtk_3.1.0/ws/gtk/swt.jar.so
+%endif
+%attr(0755,root,root) %{_libdir}/%{name}/plugins/org.eclipse.jface_3.1.0/jface.jar.so
+%attr(0755,root,root) %{_libdir}/%{name}/plugins/org.eclipse.jface.text_3.1.0/jfacetext.jar.so
%attr(0644,root,root) %{_libdir}/%{name}/%{libname}-gtk2.jarswithnativelibs
%files jdt -f %{name}-jdt.install
%defattr(0644,root,root,0755)
# Native bits
%{_libdir}/%{name}/eclipse.db
-%attr(0664,root,root) %{_libdir}/%{name}/jdiui.jar.so
-%attr(0664,root,root) %{_libdir}/%{name}/snippetsupport.jar.so
-%attr(0664,root,root) %{_libdir}/%{name}/jdimodel.jar.so
-%attr(0664,root,root) %{_libdir}/%{name}/jdi.jar.so
-%attr(0664,root,root) %{_libdir}/%{name}/junitsupport.jar.so
-%attr(0664,root,root) %{_libdir}/%{name}/junitruntime.jar.so
-%attr(0664,root,root) %{_libdir}/%{name}/launching.jar.so
-%attr(0664,root,root) %{_libdir}/%{name}/launchingsupport.jar.so
-%attr(0664,root,root) %{_libdir}/%{name}/jdt.jar.so
-%attr(0664,root,root) %{_libdir}/%{name}/junit.jar.so
+%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
+%attr(0755,root,root) %{_libdir}/%{name}/plugins/org.eclipse.jdt.debug_3.1.0/jdi.jar.so
+%attr(0755,root,root) %{_libdir}/%{name}/plugins/org.eclipse.jdt.junit_3.1.0/junitsupport.jar.so
+%attr(0755,root,root) %{_libdir}/%{name}/plugins/org.eclipse.jdt.junit.runtime_3.1.0/junitruntime.jar.so
+%attr(0755,root,root) %{_libdir}/%{name}/plugins/org.eclipse.jdt.launching_3.1.0/launching.jar.so
+%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
%attr(0644,root,root) %{_libdir}/%{name}/%{name}-jdt.jarswithnativelibs
-%files source -f %{name}-source.install
-%defattr(0644,root,root,0755)
+%files jdt-devel
+%{_datadir}/%{name}/plugins/org.eclipse.jdt.source_3.*
+%{_datadir}/%{name}/features/org.eclipse.jdt.source_3.*
%files pde -f %{name}-pde.install
%defattr(0644,root,root,0755)
# Native bits
-%{_libdir}/%{name}/eclipse.db
-%attr(0664,root,root) %{_libdir}/%{name}/pdebuild-ant.jar.so
-%attr(0664,root,root) %{_libdir}/%{name}/pdebuild.jar.so
-%attr(0664,root,root) %{_libdir}/%{name}/pdecore.jar.so
-%attr(0664,root,root) %{_libdir}/%{name}/pdejunit.jar.so
-%attr(0664,root,root) %{_libdir}/%{name}/pdert.jar.so
-%attr(0664,root,root) %{_libdir}/%{name}/pdeuiant.jar.so
-%attr(0664,root,root) %{_libdir}/%{name}/pdeui.jar.so
-%attr(0664,root,root) %{_libdir}/%{name}/pde.jar.so
-%attr(0664,root,root) %{_libdir}/%{name}/pde-ant.jar.so
+%attr(0755,root,root) %{_libdir}/%{name}/eclipse.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
+%attr(0755,root,root) %{_libdir}/%{name}/plugins/org.eclipse.pde.junit.runtime_3.1.0/pdejunit.jar.so
+%attr(0755,root,root) %{_libdir}/%{name}/plugins/org.eclipse.pde.runtime_3.1.0/pdert.jar.so
+%attr(0755,root,root) %{_libdir}/%{name}/plugins/org.eclipse.pde.ui_3.1.0/pdeuiant.jar.so
+%attr(0755,root,root) %{_libdir}/%{name}/plugins/org.eclipse.pde.ui_3.1.0/pdeui.jar.so
+%attr(0755,root,root) %{_libdir}/%{name}/plugins/org.eclipse.pde_3.1.0/pde.jar.so
+%attr(0755,root,root) %{_libdir}/%{name}/plugins/org.eclipse.pde_3.1.0/ant_tasks/pde-ant.jar.so
%attr(0644,root,root) %{_libdir}/%{name}/%{name}-pde.jarswithnativelibs
+%files pde-devel
+%{_datadir}/%{name}/plugins/org.eclipse.pde.source_3.*
+%{_datadir}/%{name}/features/org.eclipse.pde.source_3.*
+
%files platform -f %{name}-platform.install
%defattr(0644,root,root,0755)
%dir %{_datadir}/%{name}
%dir %{_libdir}/%{name}
%{_datadir}/%{name}/.eclipseproduct
-%{_datadir}/%{name}/eclipsecompiledjars.list
%{_datadir}/%{name}/startup.jar
%{_datadir}/%{name}/icon.xpm
+%attr(0755,root,root) %{_datadir}/%{name}/buildscripts/copy-platform
+%attr(0755,root,root) %{_libdir}/%{name}/eclipse
%attr(0755,root,root) %{_libdir}/%{name}/libcore*
%attr(0755,root,root) %{_libdir}/%{name}/libupdate*
%{_datadir}/%{name}/eclipse
-%attr(0755,root,root) %{_datadir}/%{name}/buildscripts/copy-platform
-%attr(0755,root,root) %{_libdir}/%{name}/libcvs.so
-# formerly in scripts
%attr(0755,root,root) %{_bindir}/eclipse
%{_datadir}/applications/*
%{_datadir}/pixmaps/*
%{_datadir}/icons/*/*/apps/*
+%config(noreplace) %{_sysconfdir}/eclipse.conf
# Native bits
%{_libdir}/%{name}/eclipse.db
-%attr(0644,root,root) %{_libdir}/%{name}/parser.jar.so
-%attr(0644,root,root) %{_libdir}/%{name}/antsupport.jar.so
-%attr(0644,root,root) %{_libdir}/%{name}/compare.jar.so
-%attr(0644,root,root) %{_libdir}/%{name}/boot.jar.so
-%attr(0644,root,root) %{_libdir}/%{name}/expressions.jar.so
-%attr(0644,root,root) %{_libdir}/%{name}/filebuffers.jar.so
+%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
+%attr(0755,root,root) %{_libdir}/%{name}/plugins/org.eclipse.core.expressions_3.1.0/expressions.jar.so
+%attr(0755,root,root) %{_libdir}/%{name}/plugins/org.eclipse.core.filebuffers_3.1.0/filebuffers.jar.so
# FIXME: re-add resources.jar to eclipse-platform.jarswithnativelibs
-#%attr(0644,root,root) %{_libdir}/%{name}/resources.jar.so
-%attr(0644,root,root) %{_libdir}/%{name}/runtime.jar.so
-%attr(0644,root,root) %{_libdir}/%{name}/variables.jar.so
-%attr(0644,root,root) %{_libdir}/%{name}/dtcore.jar.so
-%attr(0644,root,root) %{_libdir}/%{name}/dtui.jar.so
-%attr(0644,root,root) %{_libdir}/%{name}/helpbase.jar.so
-%attr(0644,root,root) %{_libdir}/%{name}/helpide.jar.so
-%attr(0644,root,root) %{_libdir}/%{name}/helpui.jar.so
-%attr(0644,root,root) %{_libdir}/%{name}/appserver.jar.so
-%attr(0644,root,root) %{_libdir}/%{name}/help.jar.so
-%attr(0644,root,root) %{_libdir}/%{name}/jface.jar.so
-%attr(0644,root,root) %{_libdir}/%{name}/jfacetext.jar.so
-%attr(0644,root,root) %{_libdir}/%{name}/refcore.jar.so
-%attr(0644,root,root) %{_libdir}/%{name}/refui.jar.so
-%attr(0644,root,root) %{_libdir}/%{name}/services.jar.so
-%attr(0644,root,root) %{_libdir}/%{name}/util.jar.so
-%attr(0644,root,root) %{_libdir}/%{name}/activeHelpSample.jar.so
-%attr(0644,root,root) %{_libdir}/%{name}/platform.jar.so
-%attr(0644,root,root) %{_libdir}/%{name}/search.jar.so
-%attr(0644,root,root) %{_libdir}/%{name}/team.jar.so
-%attr(0644,root,root) %{_libdir}/%{name}/cvs.jar.so
-%attr(0644,root,root) %{_libdir}/%{name}/teamcvsssh.jar.so
-%attr(0644,root,root) %{_libdir}/%{name}/jsch-0.1.16.jar.so
-%attr(0644,root,root) %{_libdir}/%{name}/teamcvsui.jar.so
-%attr(0644,root,root) %{_libdir}/%{name}/teamui.jar.so
-%attr(0644,root,root) %{_libdir}/%{name}/text.jar.so
-%attr(0644,root,root) %{_libdir}/%{name}/cheatsheets.jar.so
-%attr(0644,root,root) %{_libdir}/%{name}/console.jar.so
-%attr(0644,root,root) %{_libdir}/%{name}/externaltools.jar.so
-%attr(0644,root,root) %{_libdir}/%{name}/forms.jar.so
-%attr(0644,root,root) %{_libdir}/%{name}/ide.jar.so
-%attr(0644,root,root) %{_libdir}/%{name}/intro.jar.so
-%attr(0644,root,root) %{_libdir}/%{name}/ui.jar.so
-%attr(0644,root,root) %{_libdir}/%{name}/workbench.jar.so
-%attr(0644,root,root) %{_libdir}/%{name}/compatibility.jar.so
-%attr(0644,root,root) %{_libdir}/%{name}/texteditor.jar.so
-%attr(0644,root,root) %{_libdir}/%{name}/editors.jar.so
-%attr(0644,root,root) %{_libdir}/%{name}/r21.jar.so
-%attr(0644,root,root) %{_libdir}/%{name}/views.jar.so
-%attr(0644,root,root) %{_libdir}/%{name}/configurator.jar.so
-%attr(0644,root,root) %{_libdir}/%{name}/updatecore.jar.so
-%attr(0644,root,root) %{_libdir}/%{name}/scheduler.jar.so
-%attr(0644,root,root) %{_libdir}/%{name}/updateui.jar.so
+#%attr(0755,root,root) %{_libdir}/%{name}/plugins/org.eclipse.core.resources_3.1.0/resources.jar.so
+%attr(0755,root,root) %{_libdir}/%{name}/plugins/org.eclipse.core.commands_3.1.0/commands.jar.so
+%attr(0755,root,root) %{_libdir}/%{name}/plugins/org.eclipse.core.resources_3.1.0/ant_tasks/resources-ant.jar.so
+%attr(0755,root,root) %{_libdir}/%{name}/plugins/org.eclipse.core.runtime_3.1.0/runtime.jar.so
+%attr(0755,root,root) %{_libdir}/%{name}/plugins/org.eclipse.core.variables_3.1.0/variables.jar.so
+%attr(0755,root,root) %{_libdir}/%{name}/plugins/org.eclipse.debug.core_3.1.0/dtcore.jar.so
+%attr(0755,root,root) %{_libdir}/%{name}/plugins/org.eclipse.debug.ui_3.1.0/dtui.jar.so
+%attr(0755,root,root) %{_libdir}/%{name}/plugins/org.eclipse.help.base_3.0.0/helpbase.jar.so
+%attr(0755,root,root) %{_libdir}/%{name}/plugins/org.eclipse.help.ui_3.0.0/helpui.jar.so
+%attr(0755,root,root) %{_libdir}/%{name}/plugins/org.eclipse.help.appserver_3.0.0/appserver.jar.so
+%attr(0755,root,root) %{_libdir}/%{name}/plugins/org.eclipse.help_3.0.0/help.jar.so
+%attr(0755,root,root) %{_libdir}/%{name}/plugins/org.eclipse.ltk.core.refactoring_3.1.0/refcore.jar.so
+%attr(0755,root,root) %{_libdir}/%{name}/plugins/org.eclipse.ltk.ui.refactoring_3.1.0/refui.jar.so
+%attr(0755,root,root) %{_libdir}/%{name}/plugins/org.eclipse.osgi.services_3.0.0/services.jar.so
+%attr(0755,root,root) %{_libdir}/%{name}/plugins/org.eclipse.osgi.util_3.0.0/util.jar.so
+%attr(0755,root,root) %{_libdir}/%{name}/plugins/org.eclipse.platform.doc.isv_3.1.0/activeHelpSample.jar.so
+%attr(0755,root,root) %{_libdir}/%{name}/plugins/org.eclipse.platform_3.1.0/platform.jar.so
+%attr(0755,root,root) %{_libdir}/%{name}/plugins/org.eclipse.search_3.1.0/search.jar.so
+%attr(0755,root,root) %{_libdir}/%{name}/plugins/org.eclipse.team.core_3.1.0/team.jar.so
+%attr(0755,root,root) %{_libdir}/%{name}/plugins/org.eclipse.team.cvs.core_3.1.0/cvs.jar.so
+%attr(0755,root,root) %{_libdir}/%{name}/plugins/org.eclipse.team.cvs.ui_3.1.0/teamcvsui.jar.so
+%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
+%attr(0755,root,root) %{_libdir}/%{name}/plugins/org.eclipse.osgi_3.1.0/console.jar.so
+%attr(0755,root,root) %{_libdir}/%{name}/plugins/org.eclipse.ui.externaltools_3.1.0/externaltools.jar.so
+%attr(0755,root,root) %{_libdir}/%{name}/plugins/org.eclipse.ui.forms_3.0.0/forms.jar.so
+%attr(0755,root,root) %{_libdir}/%{name}/plugins/org.eclipse.ui.ide_3.1.0/ide.jar.so
+%attr(0755,root,root) %{_libdir}/%{name}/plugins/org.eclipse.ui.intro_3.1.0/intro.jar.so
+%attr(0755,root,root) %{_libdir}/%{name}/plugins/org.eclipse.ui_3.1.0/ui.jar.so
+%attr(0755,root,root) %{_libdir}/%{name}/plugins/org.eclipse.ui.workbench_3.1.0/workbench.jar.so
+%attr(0755,root,root) %{_libdir}/%{name}/plugins/org.eclipse.ui.workbench.compatibility_3.1.0/compatibility.jar.so
+%attr(0755,root,root) %{_libdir}/%{name}/plugins/org.eclipse.core.resources.compatibility_3.1.0/compatibility.jar.so
+%attr(0755,root,root) %{_libdir}/%{name}/plugins/org.eclipse.core.runtime.compatibility_3.0.0/compatibility.jar.so
+%attr(0755,root,root) %{_libdir}/%{name}/plugins/org.eclipse.ui.workbench.texteditor_3.1.0/texteditor.jar.so
+%attr(0755,root,root) %{_libdir}/%{name}/plugins/org.eclipse.ui.editors_3.1.0/editors.jar.so
+%attr(0755,root,root) %{_libdir}/%{name}/plugins/org.eclipse.ui.presentations.r21_3.1.0/r21.jar.so
+%attr(0755,root,root) %{_libdir}/%{name}/plugins/org.eclipse.ui.views_3.1.0/views.jar.so
+%attr(0755,root,root) %{_libdir}/%{name}/plugins/org.eclipse.update.configurator_3.0.0/configurator.jar.so
+%attr(0755,root,root) %{_libdir}/%{name}/plugins/org.eclipse.update.core_3.0.0/updatecore.jar.so
+%attr(0755,root,root) %{_libdir}/%{name}/plugins/org.eclipse.update.scheduler_3.0.0/scheduler.jar.so
+%attr(0755,root,root) %{_libdir}/%{name}/plugins/org.eclipse.update.ui_3.0.0/updateui.jar.so
+%attr(0755,root,root) %{_libdir}/%{name}/startup.jar.so
+# FIXME where should these go?
+%attr(0755,root,root) %{_libdir}/%{name}/plugins/org.apache.lucene_1.4.3/parser.jar.so
+%attr(0755,root,root) %{_libdir}/%{name}/plugins/org.apache.lucene_1.4.3/lucene-1.4.3.jar.so
+%attr(0755,root,root) %{_libdir}/%{name}/plugins/org.eclipse.ant.ui_3.1.0/antui.jar.so
+%attr(0755,root,root) %{_libdir}/%{name}/plugins/org.eclipse.ant.ui_3.1.0/lib/remoteAnt.jar.so
+%attr(0755,root,root) %{_libdir}/%{name}/plugins/org.eclipse.ant.ui_3.1.0/lib/antrunner.jar.so
+%attr(0755,root,root) %{_libdir}/%{name}/plugins/org.eclipse.ant.core_3.1.0/lib/antsupportlib.jar.so
+%attr(0755,root,root) %{_libdir}/%{name}/plugins/org.eclipse.tomcat_4.1.30/commons-digester.jar.so
+%attr(0755,root,root) %{_libdir}/%{name}/plugins/org.eclipse.tomcat_4.1.30/commons-logging.jar.so
+%attr(0755,root,root) %{_libdir}/%{name}/plugins/org.eclipse.tomcat_4.1.30/jakarta-regexp-1.3.jar.so
+%attr(0755,root,root) %{_libdir}/%{name}/plugins/org.eclipse.tomcat_4.1.30/tomcat-util.jar.so
+%attr(0755,root,root) %{_libdir}/%{name}/plugins/org.eclipse.tomcat_4.1.30/servlets-manager.jar.so
+%attr(0755,root,root) %{_libdir}/%{name}/plugins/org.eclipse.tomcat_4.1.30/naming-common.jar.so
+%attr(0755,root,root) %{_libdir}/%{name}/plugins/org.eclipse.tomcat_4.1.30/naming-factory.jar.so
+%attr(0755,root,root) %{_libdir}/%{name}/plugins/org.eclipse.tomcat_4.1.30/commons-beanutils.jar.so
+%attr(0755,root,root) %{_libdir}/%{name}/plugins/org.eclipse.tomcat_4.1.30/servlets-default.jar.so
+%attr(0755,root,root) %{_libdir}/%{name}/plugins/org.eclipse.tomcat_4.1.30/commons-modeler.jar.so
+%attr(0755,root,root) %{_libdir}/%{name}/plugins/org.eclipse.tomcat_4.1.30/tomcat-coyote.jar.so
+%attr(0755,root,root) %{_libdir}/%{name}/plugins/org.eclipse.tomcat_4.1.30/jasper-compiler.jar.so
+%attr(0755,root,root) %{_libdir}/%{name}/plugins/org.eclipse.tomcat_4.1.30/catalina.jar.so
+%attr(0755,root,root) %{_libdir}/%{name}/plugins/org.eclipse.tomcat_4.1.30/jasper-runtime.jar.so
+%attr(0755,root,root) %{_libdir}/%{name}/plugins/org.eclipse.tomcat_4.1.30/commons-logging-api.jar.so
+%attr(0755,root,root) %{_libdir}/%{name}/plugins/org.eclipse.tomcat_4.1.30/servlets-invoker.jar.so
+%attr(0755,root,root) %{_libdir}/%{name}/plugins/org.eclipse.tomcat_4.1.30/tomcatwrapper.jar.so
+%attr(0755,root,root) %{_libdir}/%{name}/plugins/org.eclipse.tomcat_4.1.30/mx4j-jmx.jar.so
+%attr(0755,root,root) %{_libdir}/%{name}/plugins/org.eclipse.tomcat_4.1.30/bootstrap.jar.so
+%attr(0755,root,root) %{_libdir}/%{name}/plugins/org.eclipse.tomcat_4.1.30/servlet.jar.so
+%attr(0755,root,root) %{_libdir}/%{name}/plugins/org.eclipse.tomcat_4.1.30/commons-collections.jar.so
+%attr(0755,root,root) %{_libdir}/%{name}/plugins/org.eclipse.tomcat_4.1.30/servlets-common.jar.so
+%attr(0755,root,root) %{_libdir}/%{name}/plugins/org.eclipse.tomcat_4.1.30/naming-resources.jar.so
+%attr(0755,root,root) %{_libdir}/%{name}/plugins/org.eclipse.tomcat_4.1.30/tomcat-http11.jar.so
+%attr(0755,root,root) %{_libdir}/%{name}/plugins/org.eclipse.osgi_3.1.0/core.jar.so
+%attr(0755,root,root) %{_libdir}/%{name}/plugins/org.eclipse.osgi_3.1.0/eclipseAdaptor.jar.so
+%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
+# FIXME: if we re-add, be sure to add to eclipse-platform.jarswithnativelibs
+#%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
+%attr(0755,root,root) %{_libdir}/%{name}/plugins/org.eclipse.help.webapp_3.0.0/webapp.jar.so
+%attr(0755,root,root) %{_libdir}/%{name}/plugins/org.eclipse.help.webapp_3.0.0/WEB-INF/lib/jsp.jar.so
+%attr(0755,root,root) %{_libdir}/%{name}/plugins/org.eclipse.help.webapp_3.0.0/WEB-INF/lib/servlets.jar.so
+%attr(0755,root,root) %{_libdir}/%{name}/plugins/org.eclipse.ui.console_3.1.0/console.jar.so
# FIXME until libgcj contains gnujaxp (libgcj PR 19301)
-%attr(0644,root,root) %{_libdir}/%{name}/xalan-j2-2.6.0.jar.so
-%attr(0644,root,root) %{_libdir}/%{name}/xerces-j2-2.6.2.jar.so
-%attr(0644,root,root) %{_libdir}/%{name}/xml-commons-apis-1.0.jar.so
-# The rest of the native libraries
-%{_libdir}/%{name}/*.so
-%config(noreplace) %{_sysconfdir}/eclipse.conf
-# FIXME: compile jars in a different way with the same name
%attr(0644,root,root) %{_libdir}/%{name}/%{name}-platform.jarswithnativelibs
-%changelog
-* Fri Jan 28 2005 Andrew Overholt 1:3.0.1_fc-14
-- add necessary gcj4 compilation option for ecj building
-- add gcc4-java as a requirement of libswt3-gtk2 (for gcj-dbtool4)
-- add java-1.4.2-gcj4-compat-devel as a requirement of jdt
-- add new patch for TextEdit binary search (see e.o#84104#)
-- remove ppc for now
-
-* Thu Jan 27 2005 Andrew Overholt 1:3.0.1_fc-12
-- add ppc
-
-* Wed Jan 26 2005 Andrew Overholt 1:3.0.1_fc-9
-- rebuild
-
-* Tue Jan 25 2005 Andrew Overholt 1:3.0.1_fc-8
-- add eclipse.db to libswt3-gtk2 files list
-
-* Tue Jan 25 2005 Andrew Overholt 1:3.0.1_fc-7
-- add missing jar-so combinations to lists
-- add libswt3-gtk2 jar-so combinations
-- use native ecj instead of interpreted
-
-* Mon Jan 24 2005 Andrew Overholt 1:3.0.1_fc-5
-- refine resources.jar.so workaround
-
-* Mon Jan 24 2005 Andrew Overholt 1:3.0.1_fc-4
-- add necessary gcj4 compilation option
-- build on x86_64
-- add jarswithnativelibs lists to appropriate sub-packages
-
-* Fri Jan 21 2005 Andrew Overholt 1:3.0.1_fc-1
-- build for Fedora with native bits
-- downgrade from previous 3.1M4 builds with epoch
-- add Epoch to Requires sub-packages references
-- build ecj and then use that ecj to build the rest
-- add native compilation and files to respective %files
-- add resources.jar.so workaround
-
-* Tue Jan 11 2005 Aaron Luchko 3.0.1-8
-- fixed minor typo in eclipse-redhat-splash.png
-
-* Tue Jan 11 2005 Aaron Luchko 3.0.1-7
-- updated copyright date on eclipse-redhat-splash.png
-
-* Wed Jan 5 2005 Aaron Luchko 3.0.1-6
-- fixed problem in search.patch
-
-* Fri Dec 17 2004 Aaron Luchko 3.0.1-5
-- added search.patch a backported bugfix from 3.1.0
+%files platform-devel
+%{_datadir}/%{name}/plugins/org.eclipse.platform.source_3.*
+%{_datadir}/%{name}/features/org.eclipse.platform.source_3.*
+%{_datadir}/%{name}/plugins/org.eclipse.platform.source.linux.gtk.*_3.1.0
-* Mon Dec 06 2004 Aaron Luchko 3.0.1-4
-- changed eclipse.script to use /usr/bin/java when no jvm is supplied
-
-* Mon Nov 22 2004 Ben Konrath 3.0.1-3
-- split cvs-permission-bits.patch in two
-- bug fix for cvs-permission-bits.patch
-
-* Fri Oct 29 2004 Ben Konrath 3.0.1-2
-- add symlink for releng plugins that rely on o.e.pde.build_3.0.0
-
-* Fri Oct 29 2004 Ben Konrath 3.0.1-1
-- updated to Eclipse 3.0.1
-- updated jnigen patch
-- removed some debugging print statements
-- updated Red Hat documentaion sources
-- added Red Hat documentation pdf
-- remove commented ftp-webdav stuff as it will be in it's own spec file
-
-* Tue Oct 04 2004 Aaron Luchko 3.0.0-26
-- Changed the splash screen from a bmp to a png and fixed
-- copyright date
-
-* Mon Aug 31 2004 Aaron Luchko 3.0.0-25
-- Building docs after the main build using headless eclise
- to build the extension points
-
-* Mon Aug 16 2004 Ben Konrath 3.0.0-24
-- Add cvs permission bits patch
-
-* Wed Aug 04 2004 Elliot Lee 3.0.0-23
-- Unblock hack no longer needed.
-
-* Mon Jul 26 2004 Jeremy Handcock 3.0.0-22
-- Update Red Hat documentation sources
-
-* Thu Jul 22 2004 Tom Tromey 3.0.0-21
-- Set eclipse_arch for ppc
-- Tell build about real platform
-- Make swt.gtk install directory
-
-* Thu Jul 22 2004 Jeremy Handcock 3.0.0-20
-- Don't build on ppc64
-- Change Requires and BuildRequires to java >= 1.4.2
-- eclipse-platform package obsoletes old eclipse package
-
-* Wed Jul 21 2004 Jeremy Handcock 3.0.0-19
-- Update copy-platform with patch from Keith Seitz
-
-* Tue Jul 20 2004 Tom Tromey 3.0.0-18
-- Allow copy-platform to copy non-core parts as well
-
-* Tue Jul 20 2004 Jeremy Handcock 3.0.0-17
-- Update Red Hat documentation sources
-
-* Tue Jul 20 2004 Ben Konrath 3.0.0-16
-- Add patch for welcome screen
-
-* Mon Jul 19 2004 Tom Tromey 3.0.0-15
-- Don't require IBM JDK
-- Don't build AWT/SWT interaction code
-
-* Fri Jul 16 2004 Tom Tromey 3.0.0-14
-- Install copy-platform correctly
-
-* Fri Jul 16 2004 Tom Tromey 3.0.0-13
-- Removed debugging code
-- Added copy-platform script
-
-* Thu Jul 15 2004 Jeremy Handcock 3.0.0-12
-- Add Red Hat-specific documentation
-
-* Thu Jul 15 2004 Tom Tromey 3.0.0-12
-- Fixed provides/requires versioning buglets
-
-* Wed Jul 14 2004 Tom Tromey 3.0.0-11
-- Unblock signals before running ant
-
-* Wed Jul 14 2004 Tom Tromey 3.0.0-10
-- Added some debugging code
-
-* Tue Jul 13 2004 Jeremy Handcock 3.0.0-9
-- Add help server patch to prevent outside access
-
-* Fri Jul 9 2004 Tom Tromey 3.0.0-9
-- Handle libswt*.so correctly
-
-* Wed Jul 8 2004 Tom Tromey 3.0.0-9
-- Reworked 64 bit platform support
-- org.eclipse.swt.tools now included in standard zip file
-- Removed alternatives
-- Added platform launcher patch
-
-* Thu Jul 8 2004 Jeremy Handcock 3.0.0-9
-- Don't BuildRequires: junit
-- Don't symlink against JPackage jars; use eclipse.org ones instead
-
-* Tue Jul 6 2004 Tom Tromey 3.0.0-8
-- Work around "ppc64pseries" arch oddity
-- Add classic-ant hack
-
-* Wed Jun 30 2004 Tom Tromey 3.0.0-7
-- Only install one desktop file; check it; updated contents
-
-* Tue Jun 29 2004 Tom Tromey 3.0.0-6
-- Require IBM JDK
-- Only build on our platforms
-
-* Mon Jun 28 2004 Tom Tromey 3.0.0-5
-- Inlined libswt install source
-- Special case for ia64 Xtst directory
-
-* Fri Jun 25 2004 Tom Tromey 3.0.0-4
-- Added patch for Mozilla build; disabled though
-- Updated to 3.0 final
-
-* Thu Jun 24 2004 Tom Tromey 3.0.0-3
-- Removed more Motif code
-- Updated to use more jpackage macros
-
-* Tue Jun 22 2004 Tom Tromey 3.0.0-2
-- Updated to Eclipse 3.0RC3
-
-* Mon May 24 2004 Tom Tromey 3.0.0-1
-- Updated to Eclipse 3.0M8
-- Removed Motif build
-- Removed some non-Red Hat code
-- Added Red Hat artwork
-- Build on non-x86 architectures
-
-* Sun Apr 25 2004 Ville Skyttä - 0:2.1.3-2jpp
-- Fix "patch -p" levels.
-- More coverage for failonerror and non-verbosity during build.
-
-* Fri Apr 23 2004 David Walluck 0:2.1.3-1jpp
-- remove patches that were fixed upstream since the last release
-- eclipse-pde now requires eclipse-source (thanks Michael Reinsch)
-- add patch to allow compilation on recent GTK+ versions
- (thanks Rudi Chiarito)
-- include %%{_libdir}/libswt-gnome-gtk-%%{swt_version}.so in gtk2
- package
-
-* Sun Nov 16 2003 David Walluck 0:2.1.2-6jpp
-- 2.1.2 public release
-- %{_datadir}/%{name}/plugins is now used for plugins, and you must
- move any plugins that you have manually installed into
- %{_libdir}/%{name}/plugins to the new location. The new location is
- not expected to change
-
-* Sat Nov 15 2003 David Walluck 0:2.1.2-5jpp
-- apply patch from Ville to remove some motif conditional parts
-- apply patch from Ville for .desktop
-- make platform own %%{_libdir}/%{name}
-
-* Fri Nov 14 2003 David Walluck 0:2.1.2-4jpp
-- have platform package provide and obsolete sdk package
-- fold javac package back into jdt package
-
-* Tue Nov 11 2003 David Walluck 0:2.1.2-3jpp
-- /usr/bin/mozilla is now required by eclipse-ui and not eclipse-platform
-- make libswt2 required by motif and gtk subpackages
-- disable motif by default (unsupported)
-- motif and gtk related files are now fully separated from other packages
-
-* Mon Nov 10 2003 Ville Skyttä - 0:2.1.2-2jpp
-- Don't use the Mandrake-specific %%mklibname macro.
-- Update freedesktop.org desktop entry categories.
-- Try to look up the QT dir in portable fashion.
-- Refactor refactor-rename patch into two due to spaces in pathnames.
-- Fix $RPM_OPT_FLAGS handling.
-- Untabify specfile.
-
-* Sat Nov 08 2003 David Walluck 0:2.1.2-1jpp
-- 2.1.2
-
-* Thu Nov 06 2003 David Walluck 0:2.1.1-4jpp
-- use versioned dirs
-- add pde, javac, and motif subpackages and remove sdk subpackage
-- patches from Debian
-- fail build on error
-- add libswt (GTK, Motif) packages
-
-* Sun Sep 21 2003 David Walluck 0:2.1.1-3jpp
-- apply new patch for non-working rename action from Michael Reinsch
-- build for Mandrake 9.2 with Sun JDK 1.4.2
-
-* Thu Aug 21 2003 Ville Skyttä - 0:2.1.1-2jpp
-- Include missed plugins: org.eclipse.ui.versioncheck (platform),
- org.eclipse.pde.source (sdk). Thanks to Markus Härnvi for the heads up.
-
-* Sun Jun 29 2003 Michael Reinsch 0:2.1.1-1jpp
-- patch for non-working rename action
-- eclipse 2.1.1
-- Ville's comments: patch not applied, it didn't fix the problem completely.
- Still built with Sun's 1.3.1.08.
-
-* Sun Jun 8 2003 Ville Skyttä - 0:2.1.0-4jpp
-- Use xmlParserAPIs.jar that comes with Eclipse instead of xml-commons-apis:
-
-
-* Sun Jun 1 2003 Ville Skyttä - 0:2.1.0-3jpp
-- Rebuild with Sun's 1.3.1_08 to work around Eclipse Java 1.4.x build bug:
-
-- Drop %%{release} from subpackage interdependencies in order to make it
- possible to do partial subpackage-only updates in the future.
-- Make legacymenu conflict with redhat-menus.
-- Add icon symlink in %%{_datadir}/pixmaps.
-
-* Mon Apr 21 2003 David Walluck 0:2.1.0-2jpp
-- fix mdkmenu
-- add Distribution and Vendor tags
-
-* Thu Apr 03 2003 David Walluck 0:2.1.0-1jpp
-- 2.1
-- add %{name}-make-ld.patch to work around problems building on Mandrake 9.1
-- add Mandrake 9.1 comments to BuildRequires
-
-* Wed Mar 26 2003 Ville Skyttä - 0:2.1.0-0.rc3b.3jpp
-- Rebuilt for JPackage 1.5.
-
-* Tue Mar 25 2003 Ville Skyttä - 0:2.1.0-0.rc3b.2jpp
-- Add java.library.path and -Xms64M to default config.
-- Don't use "-dev bin" by default.
-- Use X-JPackage instead of X-Red-Hat-Extra in standard menu entry.
-- Fix MDK menu entry title and summary.
-
-* Mon Mar 24 2003 Ville Skyttä - 0:2.1.0-0.rc3b.1jpp
-- Update to 2.1.0 RC3b.
-- Spec file and build cleanups, mostly from David Walluck.
-- No longer requires csh.
-- Made *.so in the gtk and platform packages executable.
-- The %%{_libdir}/%{name} directory is now owned by the platform package.
-
-* Fri Mar 14 2003 Ville Skyttä - 2.1.0-0.rc2.2jpp
-- Include a couple of platform files missing from the previous build.
-- Remove bogus files from platform, ftp-webdav and sdk file lists.
-- Abort with error if the file lists refer to nonexistent files.
-
-* Sun Mar 9 2003 Ville Skyttä - 2.1.0-0.rc2.1jpp
-- Update to 2.1.0 RC2.
-- Merge David Walluck's packaging work.
-- Use JPackage lucene.
-- Don't include Motif stuff.
-
-* Thu Mar 6 2003 Ville Skyttä - 2.1.0-0.rc1.0jpp
-- First try at packaging.
+%changelog
+* Sun Feb 20 2005 Andrew Overholt 1:3.1_fc-0.M5.1
+- New 3.1M5a build using upstream build method.
+- Re-organize sub-packages (ecj, platform, platform-devel, jdt, jdt-devel, pde,
+ pde-devel, fold gtk2 package into platform).
+- Move jface and org.eclipse.text into libswt3-gtk2.
+- Bring in JPackage symlinks for packages we have in Fedora (David Walluck) and
+ put in %%prep.
+- Work around x86_64 filename differences.
+- Remove xerces, xalan, and xml-commons-apis requirement (and LD_PRELOAD from
+ script).
+- Bootstrap build.
diff --git a/sources b/sources
index 7f2025d..e69de29 100644
--- a/sources
+++ b/sources
@@ -1,3 +0,0 @@
-c95561df899a47fc05261531ed0b9221 eclipse-sourceBuild-srcIncluded-3.0.1.zip
-87c0c34661b3e033a9d994ed8015d4c2 eclipse-rhdocs-r20041017.tar.gz
-423393fad6f9c220037d38d1098ffcec eclipse-tutorials.pdf