changelog

- Bump required version of java-gcj-compat to the latest (-40jpp_37rh).
- Remove lots of jiggery-pokery with native compilation and use gbenson's
    new aot-compile.
- Re-work files sections appropriately.
- Change mozilla-nspr-devel -> nspr-devel due to change in mozilla
    packaging.
- Update patch for mozilla build as per above.
This commit is contained in:
Andrew Overholt 2005-07-14 18:24:52 +00:00
parent dd0fb50236
commit 1d8b5047d3

View File

@ -24,7 +24,7 @@ Epoch: 1
Summary: %{pkg_summary}
Name: eclipse
Version: %{eclipse_majmin}.%{eclipse_micro}_fc
Release: 6
Release: 5
License: EPL
Group: Text Editors/Integrated Development Environments (IDE)
URL: http://www.eclipse.org/
@ -113,12 +113,12 @@ BuildRequires: gcc-c++
%ifnarch ppc64
BuildRequires: mozilla >= 37:1.7.8
BuildRequires: mozilla-devel >= 37:1.7.8
BuildRequires: mozilla-nspr-devel >= 37:1.7.8
BuildRequires: nspr-devel
BuildRequires: xorg-x11-devel
%endif
%if %{gcj_support}
BuildRequires: gcc-java >= 4.0.1
BuildRequires: java-1.4.2-gcj-compat-devel >= 1.4.2.0-40jpp_24rh
BuildRequires: java-1.4.2-gcj-compat-devel >= 1.4.2.0-40jpp_37rh
BuildRequires: dos2unix
%else
BuildRequires: java-devel >= 1.4.2
@ -135,7 +135,7 @@ BuildRequires: lucene lucene-demo
BuildRequires: regexp
BuildRequires: junit >= 3.8.1-3jpp
%if %{gcj_support}
Requires(post,postun): java-1.4.2-gcj-compat
Requires(post,postun): java-1.4.2-gcj-compat >= 1.4.2.0-40jpp_37rh
%endif
%description
@ -151,7 +151,7 @@ Obsoletes: ecj
Provides: ecj
%if %{gcj_support}
Requires: libgcj >= 4.0.1
Requires(post,postun): java-1.4.2-gcj-compat >= 1.4.2.0-40jpp_24rh
Requires(post,postun): java-1.4.2-gcj-compat >= 1.4.2.0-40jpp_37rh
%else
Requires: java >= 1.4.2
%endif
@ -169,9 +169,9 @@ Provides: %{name}-ui = %{epoch}:%{version}-%{release}
Provides: %{name}-scripts = %{epoch}:%{version}-%{release}
Provides: %{name}-gtk2 = %{epoch}:%{version}-%{release}
%if %{gcj_support}
Requires: java-1.4.2-gcj-compat >= 1.4.2.0-40jpp_24rh
Requires: java-1.4.2-gcj-compat >= 1.4.2.0-40jpp_37rh
Requires: libgcj >= 4.0.1
Requires(post,postun): java-1.4.2-gcj-compat >= 1.4.2.0-40jpp_24rh
Requires(post,postun): java-1.4.2-gcj-compat >= 1.4.2.0-40jpp_37rh
%else
Requires: java >= 1.4.2
%endif
@ -212,7 +212,7 @@ Requires: %{name}-ecj = %{epoch}:%{version}-%{release}
Requires: junit >= 3.8.1-3jpp
%if %{gcj_support}
Requires: libgcj >= 4.0.1
Requires(post,postun): java-1.4.2-gcj-compat >= 1.4.2.0-40jpp_24rh
Requires(post,postun): java-1.4.2-gcj-compat >= 1.4.2.0-40jpp_37rh
%endif
%description jdt
@ -232,7 +232,7 @@ Group: Text Editors/Integrated Development Environments (IDE)
Requires: %{name}-jdt = %{epoch}:%{version}-%{release}
Requires: %{name}-platform-devel = %{epoch}:%{version}-%{release}
%if %{gcj_support}
Requires(post,postun): java-1.4.2-gcj-compat >= 1.4.2.0-40jpp_24rh
Requires(post,postun): java-1.4.2-gcj-compat >= 1.4.2.0-40jpp_37rh
Requires: libgcj >= 4.0.1
%endif
@ -254,7 +254,7 @@ Eclipse PDE.
Summary: SWT Library for GTK2
Group: Text Editors/Integrated Development Environments (IDE)
%if %{gcj_support}
Requires(post,postun): java-1.4.2-gcj-compat >= 1.4.2.0-40jpp_24rh
Requires(post,postun): java-1.4.2-gcj-compat >= 1.4.2.0-40jpp_37rh
Requires: libgcj >= 4.0.1
%endif
@ -266,7 +266,7 @@ Summary: Eclipse Rich Client Platform
Group: Development/Languages
%if %{gcj_support}
Requires: libgcj >= 4.0.1
Requires(post,postun): java-1.4.2-gcj-compat >= 1.4.2.0-40jpp_24rh
Requires(post,postun): java-1.4.2-gcj-compat >= 1.4.2.0-40jpp_37rh
%else
Requires: java >= 1.4.2
%endif
@ -543,83 +543,6 @@ ant \
-DinstallOs=linux -DinstallWs=gtk -DinstallArch=%{eclipse_arch} \
-Dlibsconfig=true
%if %{gcj_support}
pushd result
# De-compress resulting tarball
tar zxf linux-gtk-%{eclipse_arch}-sdk.tar.gz
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_*/lib/ant*.jar
rm -f plugins/org.eclipse.tomcat_*/*.jar
rm -f plugins/org.eclipse.team.cvs.ssh2_3.1.0/jsch-0.1.18.jar
rm -f plugins/org.junit_3.8.1/junit.jar
rm -f plugins/org.apache.lucene*/*.jar
# extract jdtCompilerAdapter.jar from org.eclipse.jdt.core_3.1.0.jar
unzip -d plugins plugins/org.eclipse.jdt.core_3.1.0.jar jdtCompilerAdapter.jar
# https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=158308
%ifarch ppc
mv plugins/org.eclipse.jdt.ui_3.1.0.jar{,.bak}
%endif
# 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
d=".%{_libdir}/%{name}/`dirname $j | sed 's:\./::'`";
mkdir -p $d;
gcj -g -fPIC -fjni -findirect-dispatch -shared -Wl,-Bsymbolic -O2 \
-o $d/`basename $j`.so $j;
done
%else
mkdir -p $RPM_BUILD_ROOT%{_libdir}/%{name}
for j in `find -name \*.jar`; do
d=".%{_libdir}/%{name}/`dirname $j | sed 's:\./::'`";
mkdir -p $d;
gcj -g -fPIC -fjni -findirect-dispatch -shared -Wl,-Bsymbolic -O1 \
-o $d/`basename $j`.so $j;
done
%endif
# https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=158308
%ifarch ppc
mv plugins/org.eclipse.jdt.ui_3.1.0.jar{.bak,}
%endif
# FIXME: temporarily disable org.eclipse.ui.workbench_3.1.0.jar.so
# see: https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=151919
mv \
.%{_libdir}/%{name}/plugins/org.eclipse.ui.workbench_%{eclipse_majmin}.%{eclipse_micro}.jar.so{,.bak}
# FIXME: temporarily disable org.eclipse.ui.forms_3.1.0.jar.so
# see: https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=146463
mv \
.%{_libdir}/%{name}/plugins/org.eclipse.ui.forms_%{eclipse_majmin}.%{eclipse_micro}.jar.so{,.bak}
# FIXME: temporarily disable org.eclipse.osgi_3.1.0.jar.so
# see: https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=158137
mv \
.%{_libdir}/%{name}/plugins/org.eclipse.osgi_%{eclipse_majmin}.%{eclipse_micro}.jar.so{,.bak}
pushd .%{_libdir}/%{name}/plugins
gcj -g -O2 --main=org.eclipse.jdt.internal.compiler.batch.Main \
-Wl,-R,%{_libdir}/%{name}/plugins \
org.eclipse.jdt.core_3.1.0.jar.so jdtCompilerAdapter.jar.so -o ecj
popd
# Tar up the native libs
tar czf ../%{name}-nativelycompiledjars.tar.gz .%{_libdir}/%{name}
popd
# Remove expanded eclipse build
rm -rf eclipse
popd
%endif
# Hack to get the -debuginfo source code references
# to be pointing to the right place:
# Hardlink all the org.* source we can find
@ -649,8 +572,8 @@ install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/%{name}
tar -C $RPM_BUILD_ROOT%{_datadir} -zxf \
result/linux-gtk-%{eclipse_arch}-sdk.tar.gz
# extract jdtCompilerAdapter.jar from org.eclipse.jdt.core_3.1.0.jar (again)
pushd $RPM_BUILD_ROOT%{_datadir}/%{name}
# extract jdtCompilerAdapter.jar from org.eclipse.jdt.core_3.1.0.jar
unzip -d plugins plugins/org.eclipse.jdt.core_3.1.0.jar jdtCompilerAdapter.jar
# Extract .so files
@ -661,24 +584,8 @@ popd
# Binaries, libraries, and natively-built shared libraries
install -d -m 755 $RPM_BUILD_ROOT%{_libdir}/%{name}
%if %{gcj_support}
# Natively-compiled jars (shared libraries)
tar -C $RPM_BUILD_ROOT -zxf result/%{name}-nativelycompiledjars.tar.gz
%endif
install -d -m 755 $RPM_BUILD_ROOT%{_bindir}
%if %{gcj_support}
# Install ecj binary
mv $RPM_BUILD_ROOT%{_libdir}/%{name}/plugins/ecj \
$RPM_BUILD_ROOT%{_bindir}
chmod a+x $RPM_BUILD_ROOT%{_bindir}/ecj
# Directory to hold all the .jar->.so mapping dbs
install -d -m 755 $RPM_BUILD_ROOT`gcj-dbtool -p %{_libdir}`
install -d -m 755 $RPM_BUILD_ROOT`gcj-dbtool -p %{_libdir}`.d
%endif
# Eclipse binary
mv $RPM_BUILD_ROOT%{_datadir}/%{name}/eclipse \
$RPM_BUILD_ROOT%{_libdir}/%{name}/eclipse
@ -914,77 +821,29 @@ ln -s %{_datadir}/%{name}/plugins/org.eclipse.jdt.core_%{eclipse_majmin}.%{eclip
$RPM_BUILD_ROOT%{_datadir}/java/eclipse-ecj.jar
%if %{gcj_support}
# Create the gcj dbs for libswt, ecj, platform, jdt, and pde
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
gcj-dbtool -n $gcjdbdir/%{name}-rcp.db 80000
aot-compile-rpm
# ecj db
gcj-dbtool -f $gcjdbdir/%{name}-ecj.db \
$RPM_BUILD_ROOT%{_datadir}/%{name}/plugins/org.eclipse.jdt.core_%{eclipse_majmin}.%{eclipse_micro}.jar \
%{_libdir}/%{name}/plugins/org.eclipse.jdt.core_%{eclipse_majmin}.%{eclipse_micro}.jar.so
gcj-dbtool -f $gcjdbdir/%{name}-ecj.db \
$RPM_BUILD_ROOT%{_datadir}/%{name}/plugins/jdtCompilerAdapter.jar \
%{_libdir}/%{name}/plugins/jdtCompilerAdapter.jar.so
# FIXME: temporarily disable org.eclipse.ui.forms_3.1.0.jar.so
# see: https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=146463
rm -f $RPM_BUILD_ROOT%{_libdir}/gcj/%{name}/org.eclipse.ui.forms_3.1.0.jar.db
rm -f $RPM_BUILD_ROOT%{_libdir}/gcj/%{name}/org.eclipse.ui.forms_3.1.0.jar.so
# FIXME: temporarily disable org.eclipse.ui.workbench_3.1.0.jar.so
# see: https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=151919
rm -f $RPM_BUILD_ROOT%{_libdir}/gcj/%{name}/org.eclipse.ui.workbench_3.1.0.jar.so
rm -f $RPM_BUILD_ROOT%{_libdir}/gcj/%{name}/org.eclipse.ui.workbench_3.1.0.jar.db
# FIXME: temporarily disable org.eclipse.osgi_3.1.0.jar.so
# see: https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=158137
rm -f $RPM_BUILD_ROOT%{_libdir}/gcj/%{name}/org.eclipse.osgi_3.1.0.jar.so
rm -f $RPM_BUILD_ROOT%{_libdir}/gcj/%{name}/org.eclipse.osgi_3.1.0.jar.db
# jdt db
for dir in `cat %{SOURCE7}`; do
for j in `find $RPM_BUILD_ROOT/$dir -name \*.jar`; do
lib=`echo $j | sed "s:%{_datadir}:%{_libdir}:"`.so;
if [ -f $lib ]; then
gcj-dbtool -f $gcjdbdir/%{name}-jdt.db \
$j `echo $lib | 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
lib=`echo $j | sed "s:%{_datadir}:%{_libdir}:"`.so;
if [ -f $lib ]; then
gcj-dbtool -f $gcjdbdir/%{name}-pde.db \
$j `echo $lib | sed "s:$RPM_BUILD_ROOT/::"`;
fi;
done;
done
# rcp db
for j in `find $RPM_BUILD_ROOT/%{_datadir}/%{name}/plugins/org.eclipse.rcp_3.* \
-name \*.jar`; do
lib=`echo $j | sed "s:%{_datadir}:%{_libdir}:"`.so;
if [ -f $lib ]; then
gcj-dbtool -f $gcjdbdir/%{name}-rcp.db \
$j `echo $lib | sed "s:$RPM_BUILD_ROOT/::"`;
fi;
done
# platform db
for dir in `cat %{SOURCE9}`; do
for j in `find $RPM_BUILD_ROOT/$dir -name \*.jar`; do
lib=`echo $j | sed "s:%{_datadir}:%{_libdir}:"`.so;
if [ -f $lib ]; then
gcj-dbtool -f $gcjdbdir/%{name}-platform.db \
$j `echo $lib | 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
lib=`echo $j | sed "s:%{_datadir}:%{_libdir}:"`.so;
if [ -f $lib ]; then
gcj-dbtool -f $gcjdbdir/libswt3-gtk2.db \
$j `echo $lib | sed "s:$RPM_BUILD_ROOT/::"`;
fi;
done;
done
# Build and install ecj binary
pushd $RPM_BUILD_ROOT%{_libdir}/gcj/%{name}
gcj -g -O2 --main=org.eclipse.jdt.internal.compiler.batch.Main \
-Wl,-R,%{_libdir}/gcj/%{name} \
org.eclipse.jdt.core_3.1.0.jar.so jdtCompilerAdapter.jar.so -o \
$RPM_BUILD_ROOT%{_bindir}/ecj
popd
chmod a+x $RPM_BUILD_ROOT%{_bindir}/ecj
%endif
%clean
@ -992,24 +851,24 @@ rm -rf $RPM_BUILD_ROOT
%if %{gcj_support}
%post ecj
%{_bindir}/rebuild-gcj-db %{_libdir}
%{_bindir}/rebuild-gcj-db
%post jdt
%{_bindir}/rebuild-gcj-db %{_libdir}
%{_bindir}/rebuild-gcj-db
%post pde
%{_bindir}/rebuild-gcj-db %{_libdir}
%{_bindir}/rebuild-gcj-db
%post rcp
%{_bindir}/rebuild-gcj-db %{_libdir}
%{_bindir}/rebuild-gcj-db
%post -n %{libname}-gtk2
%{_bindir}/rebuild-gcj-db %{_libdir}
%{_bindir}/rebuild-gcj-db
%endif
%post platform
%if %{gcj_support}
%{_bindir}/rebuild-gcj-db %{_libdir}
%{_bindir}/rebuild-gcj-db
%endif
touch --no-create %{_datadir}/icons/hicolor
if [ -x /usr/bin/gtk-update-icon-cache ]; then
@ -1018,24 +877,24 @@ fi
%if %{gcj_support}
%postun ecj
%{_bindir}/rebuild-gcj-db %{_libdir}
%{_bindir}/rebuild-gcj-db
%postun jdt
%{_bindir}/rebuild-gcj-db %{_libdir}
%{_bindir}/rebuild-gcj-db
%postun pde
%{_bindir}/rebuild-gcj-db %{_libdir}
%{_bindir}/rebuild-gcj-db
%postun rcp
%{_bindir}/rebuild-gcj-db %{_libdir}
%{_bindir}/rebuild-gcj-db
%postun -n %{libname}-gtk2
%{_bindir}/rebuild-gcj-db %{_libdir}
%{_bindir}/rebuild-gcj-db
%endif
%postun platform
%if %{gcj_support}
%{_bindir}/rebuild-gcj-db %{_libdir}
%{_bindir}/rebuild-gcj-db
%endif
touch --no-create %{_datadir}/icons/hicolor
if [ -x /usr/bin/gtk-update-icon-cache ]; then
@ -1052,11 +911,11 @@ fi
%{_datadir}/java/eclipse-ecj.jar
%if %{gcj_support}
# Native bits
%{_libdir}/gcj-4.0.0/classmap.db.d/%{name}-ecj.db
%dir %{_libdir}/%{name}
%dir %{_libdir}/%{name}/plugins
%{_libdir}/%{name}/plugins/org.eclipse.jdt.core_3.1.0.jar.so
%{_libdir}/%{name}/plugins/jdtCompilerAdapter.jar.so
%dir %{_libdir}/gcj/%{name}
%{_libdir}/gcj/%{name}/org.eclipse.jdt.core_3.1.0.jar.so
%{_libdir}/gcj/%{name}/org.eclipse.jdt.core_3.1.0.jar.db
%{_libdir}/gcj/%{name}/jdtCompilerAdapter.jar.so
%{_libdir}/gcj/%{name}/jdtCompilerAdapter.jar.db
%{_bindir}/ecj
%endif
@ -1074,30 +933,33 @@ fi
%{_javadir}/swt-gtk*.jar
%if %{gcj_support}
# Native bits
%{_libdir}/gcj-4.0.0/classmap.db.d/libswt3-gtk2.db
%dir %{_libdir}/%{name}
%dir %{_libdir}/%{name}/plugins
%{_libdir}/%{name}/plugins/org.eclipse.swt_3.1.0.jar.so
%{_libdir}/%{name}/plugins/org.eclipse.swt.gtk.linux.%{eclipse_arch}_3.1.0.jar.so
%{_libdir}/%{name}/plugins/org.eclipse.jface_3.1.0.jar.so
%{_libdir}/%{name}/plugins/org.eclipse.jface.text_3.1.0.jar.so
%dir %{_libdir}/gcj/%{name}
%{_libdir}/gcj/%{name}/org.eclipse.jface_3.1.0.jar.db
%{_libdir}/gcj/%{name}/org.eclipse.jface_3.1.0.jar.so
%{_libdir}/gcj/%{name}/org.eclipse.jface.text_3.1.0.jar.db
%{_libdir}/gcj/%{name}/org.eclipse.jface.text_3.1.0.jar.so
%{_libdir}/gcj/%{name}/org.eclipse.swt.gtk.linux.%{eclipse_arch}_3.1.0.jar.db
%{_libdir}/gcj/%{name}/org.eclipse.swt.gtk.linux.%{eclipse_arch}_3.1.0.jar.so
%endif
%files jdt -f %{name}-jdt.install
%{_bindir}/efj
%if %{gcj_support}
# Native bits
%{_libdir}/gcj-4.0.0/classmap.db.d/%{name}-jdt.db
%{_libdir}/%{name}/plugins/org.eclipse.jdt.debug.ui_3.1.0.jar.so
%{_libdir}/%{name}/plugins/org.eclipse.jdt.debug_3.1.0
%{_libdir}/%{name}/plugins/org.eclipse.jdt.junit_3.1.0
%{_libdir}/%{name}/plugins/org.eclipse.jdt.junit.runtime_3.1.0
%{_libdir}/%{name}/plugins/org.eclipse.jdt.launching_3.1.0.jar.so
%ifnarch ppc
%{_libdir}/%{name}/plugins/org.eclipse.jdt.ui_3.1.0.jar.so
%endif
%{_libdir}/%{name}/plugins/org.eclipse.jdt_3.1.0.jar.so
#%{_libdir}/%{name}/plugins/org.junit_3.8.1/junit.jar.so
%{_libdir}/gcj/%{name}/org.eclipse.jdt.debug.ui_3.1.0.jar.db
%{_libdir}/gcj/%{name}/org.eclipse.jdt.debug.ui_3.1.0.jar.so
%{_libdir}/gcj/%{name}/org.eclipse.jdt.launching_3.1.0.jar.db
%{_libdir}/gcj/%{name}/org.eclipse.jdt.launching_3.1.0.jar.so
%{_libdir}/gcj/%{name}/org.eclipse.jdt.ui_3.1.0.jar.db
%{_libdir}/gcj/%{name}/org.eclipse.jdt.ui_3.1.0.jar.so
%{_libdir}/gcj/%{name}/junitruntime.jar.db
%{_libdir}/gcj/%{name}/junitruntime.jar.so
%{_libdir}/gcj/%{name}/junitsupport.jar.db
%{_libdir}/gcj/%{name}/junitsupport.jar.so
%{_libdir}/gcj/%{name}/jdimodel.jar.db
%{_libdir}/gcj/%{name}/jdimodel.jar.so
%{_libdir}/gcj/%{name}/jdi.jar.db
%{_libdir}/gcj/%{name}/jdi.jar.so
%endif
%files jdt-devel
@ -1107,13 +969,18 @@ fi
%files pde -f %{name}-pde.install
%if %{gcj_support}
# Native bits
%{_libdir}/gcj-4.0.0/classmap.db.d/%{name}-pde.db
%{_libdir}/%{name}/plugins/org.eclipse.pde.build_3.1.0
%{_libdir}/%{name}/plugins/org.eclipse.pde.core_3.1.0.jar.so
%{_libdir}/%{name}/plugins/org.eclipse.pde.junit.runtime_3.1.0
%{_libdir}/%{name}/plugins/org.eclipse.pde.runtime_3.1.0.jar.so
%{_libdir}/%{name}/plugins/org.eclipse.pde.ui_3.1.0.jar.so
%{_libdir}/%{name}/plugins/org.eclipse.pde_3.1.0.jar.so
%{_libdir}/gcj/%{name}/pdebuild.jar.so
%{_libdir}/gcj/%{name}/pdebuild.jar.db
%{_libdir}/gcj/%{name}/pdebuild-ant.jar.so
%{_libdir}/gcj/%{name}/pdebuild-ant.jar.db
%{_libdir}/gcj/%{name}/org.eclipse.pde.core_3.1.0.jar.so
%{_libdir}/gcj/%{name}/org.eclipse.pde.core_3.1.0.jar.db
%{_libdir}/gcj/%{name}/org.eclipse.pde.runtime_3.1.0.jar.so
%{_libdir}/gcj/%{name}/org.eclipse.pde.runtime_3.1.0.jar.db
%{_libdir}/gcj/%{name}/org.eclipse.pde.ui_3.1.0.jar.so
%{_libdir}/gcj/%{name}/org.eclipse.pde.ui_3.1.0.jar.db
%{_libdir}/gcj/%{name}/org.eclipse.pde_3.1.0.jar.so
%{_libdir}/gcj/%{name}/org.eclipse.pde_3.1.0.jar.db
%endif
%files pde-devel
@ -1123,11 +990,6 @@ fi
%files rcp
%{_datadir}/%{name}/features/org.eclipse.rcp_3.*
%{_datadir}/%{name}/plugins/org.eclipse.rcp_3.*
%if %{gcj_support}
# Native bits
%{_libdir}/gcj-4.0.0/classmap.db.d/%{name}-rcp.db
%{_libdir}/%{name}/plugins/org.eclipse.rcp_3.1.0.jar.so
%endif
%files rcp-devel
%{_datadir}/%{name}/plugins/org.eclipse.rcp.source_3.*
@ -1165,62 +1027,125 @@ fi
%config(noreplace) %{_sysconfdir}/eclipse.conf
%if %{gcj_support}
# Native bits
%{_libdir}/gcj-4.0.0/classmap.db.d/%{name}-platform.db
%{_libdir}/%{name}/startup.jar.so
%{_libdir}/%{name}/plugins/org.eclipse.core.commands_3.1.0.jar.so
%{_libdir}/%{name}/plugins/org.eclipse.core.expressions_3.1.0.jar.so
%{_libdir}/%{name}/plugins/org.eclipse.core.runtime_3.1.0.jar.so
%{_libdir}/%{name}/plugins/org.eclipse.help.base_3.1.0.jar.so
%{_libdir}/%{name}/plugins/org.eclipse.help.ui_3.1.0.jar.so
%{_libdir}/%{name}/plugins/org.eclipse.help.appserver_3.1.0.jar.so
%{_libdir}/%{name}/plugins/org.eclipse.help_3.1.0.jar.so
%{_libdir}/%{name}/plugins/org.eclipse.ui.forms_3.1.0.jar.so.bak
%{_libdir}/%{name}/plugins/org.eclipse.ui.ide_3.1.0.jar.so
%{_libdir}/%{name}/plugins/org.eclipse.ui.intro_3.1.0.jar.so
%{_libdir}/%{name}/plugins/org.eclipse.ui_3.1.0.jar.so
%{_libdir}/%{name}/plugins/org.eclipse.ui.workbench_3.1.0.jar.so.bak
%{_libdir}/%{name}/plugins/org.eclipse.ui.presentations.r21_3.1.0.jar.so
%{_libdir}/%{name}/plugins/org.eclipse.ui.views_3.1.0.jar.so
%{_libdir}/%{name}/plugins/org.eclipse.update.configurator_3.1.0.jar.so
%{_libdir}/%{name}/plugins/org.eclipse.update.core_3.1.0.jar.so
%{_libdir}/%{name}/plugins/org.eclipse.update.core.linux_3.1.0.jar.so
%{_libdir}/%{name}/plugins/org.eclipse.update.scheduler_3.1.0.jar.so
%{_libdir}/%{name}/plugins/org.eclipse.update.ui_3.1.0.jar.so
%{_libdir}/%{name}/plugins/org.eclipse.osgi_3.1.0.jar.so.bak
%{_libdir}/%{name}/plugins/org.eclipse.ant.core_3.1.0.jar.so
%{_libdir}/%{name}/plugins/org.eclipse.compare_3.1.0.jar.so
%{_libdir}/%{name}/plugins/org.eclipse.core.boot_3.1.0.jar.so
%{_libdir}/%{name}/plugins/org.eclipse.core.filebuffers_3.1.0.jar.so
%{_libdir}/%{name}/plugins/org.eclipse.core.resources_3.1.0.jar.so
%{_libdir}/%{name}/plugins/org.eclipse.core.resources.linux_3.1.0.jar.so
%{_libdir}/%{name}/plugins/org.eclipse.core.variables_3.1.0.jar.so
%{_libdir}/%{name}/plugins/org.eclipse.debug.core_3.1.0.jar.so
%{_libdir}/%{name}/plugins/org.eclipse.debug.ui_3.1.0.jar.so
%{_libdir}/%{name}/plugins/org.eclipse.ltk.ui.refactoring_3.1.0.jar.so
%{_libdir}/%{name}/plugins/org.eclipse.ltk.core.refactoring_3.1.0.jar.so
%{_libdir}/%{name}/plugins/org.eclipse.osgi.services_3.1.0.jar.so
%{_libdir}/%{name}/plugins/org.eclipse.osgi.util_3.1.0.jar.so
%{_libdir}/%{name}/plugins/org.eclipse.platform.doc.isv_3.1.0
%{_libdir}/%{name}/plugins/org.eclipse.platform_3.1.0
%{_libdir}/%{name}/plugins/org.eclipse.search_3.1.0.jar.so
%{_libdir}/%{name}/plugins/org.eclipse.team.core_3.1.0.jar.so
%{_libdir}/%{name}/plugins/org.eclipse.team.cvs.core_3.1.0.jar.so
%{_libdir}/%{name}/plugins/org.eclipse.team.cvs.ui_3.1.0.jar.so
%{_libdir}/%{name}/plugins/org.eclipse.team.cvs.ssh_3.1.0.jar.so
%{_libdir}/%{name}/plugins/org.eclipse.team.cvs.ssh2_3.1.0
%{_libdir}/%{name}/plugins/org.eclipse.team.ui_3.1.0.jar.so
%{_libdir}/%{name}/plugins/org.eclipse.text_3.1.0.jar.so
%{_libdir}/%{name}/plugins/org.eclipse.ui.browser_3.1.0.jar.so
%{_libdir}/%{name}/plugins/org.eclipse.ui.cheatsheets_3.1.0.jar.so
%{_libdir}/%{name}/plugins/org.eclipse.ui.externaltools_3.1.0.jar.so
%{_libdir}/%{name}/plugins/org.eclipse.ui.workbench.compatibility_3.1.0
%{_libdir}/%{name}/plugins/org.eclipse.core.resources.compatibility_3.1.0.jar.so
%{_libdir}/%{name}/plugins/org.eclipse.core.runtime.compatibility_3.1.0.jar.so
%{_libdir}/%{name}/plugins/org.eclipse.ui.workbench.texteditor_3.1.0.jar.so
%{_libdir}/%{name}/plugins/org.eclipse.ui.editors_3.1.0.jar.so
%{_libdir}/%{name}/plugins/org.eclipse.ant.ui_3.1.0.jar.so
%{_libdir}/%{name}/plugins/org.eclipse.help.webapp_3.1.0
%{_libdir}/%{name}/plugins/org.eclipse.ui.console_3.1.0.jar.so
%{_libdir}/gcj/%{name}/startup.jar.so
%{_libdir}/gcj/%{name}/startup.jar.db
%{_libdir}/gcj/%{name}/org.eclipse.core.commands_3.1.0.jar.db
%{_libdir}/gcj/%{name}/org.eclipse.core.commands_3.1.0.jar.so
%{_libdir}/gcj/%{name}/org.eclipse.core.expressions_3.1.0.jar.db
%{_libdir}/gcj/%{name}/org.eclipse.core.expressions_3.1.0.jar.so
%{_libdir}/gcj/%{name}/org.eclipse.core.filebuffers_3.1.0.jar.db
%{_libdir}/gcj/%{name}/org.eclipse.core.filebuffers_3.1.0.jar.so
%{_libdir}/gcj/%{name}/org.eclipse.core.resources_3.1.0.jar.db
%{_libdir}/gcj/%{name}/org.eclipse.core.resources_3.1.0.jar.so
%{_libdir}/gcj/%{name}/org.eclipse.core.resources.compatibility_3.1.0.jar.db
%{_libdir}/gcj/%{name}/org.eclipse.core.resources.compatibility_3.1.0.jar.so
%{_libdir}/gcj/%{name}/org.eclipse.core.runtime_3.1.0.jar.db
%{_libdir}/gcj/%{name}/org.eclipse.core.runtime_3.1.0.jar.so
%{_libdir}/gcj/%{name}/org.eclipse.core.runtime.compatibility_3.1.0.jar.db
%{_libdir}/gcj/%{name}/org.eclipse.core.runtime.compatibility_3.1.0.jar.so
%{_libdir}/gcj/%{name}/org.eclipse.core.variables_3.1.0.jar.db
%{_libdir}/gcj/%{name}/org.eclipse.core.variables_3.1.0.jar.so
%{_libdir}/gcj/%{name}/org.eclipse.help_3.1.0.jar.db
%{_libdir}/gcj/%{name}/org.eclipse.help_3.1.0.jar.so
%{_libdir}/gcj/%{name}/org.eclipse.help.appserver_3.1.0.jar.db
%{_libdir}/gcj/%{name}/org.eclipse.help.appserver_3.1.0.jar.so
%{_libdir}/gcj/%{name}/org.eclipse.help.base_3.1.0.jar.db
%{_libdir}/gcj/%{name}/org.eclipse.help.base_3.1.0.jar.so
%{_libdir}/gcj/%{name}/org.eclipse.help.ui_3.1.0.jar.db
%{_libdir}/gcj/%{name}/org.eclipse.help.ui_3.1.0.jar.so
%{_libdir}/gcj/%{name}/jsp.jar.db
%{_libdir}/gcj/%{name}/jsp.jar.so
%{_libdir}/gcj/%{name}/servlets.jar.db
%{_libdir}/gcj/%{name}/servlets.jar.so
%{_libdir}/gcj/%{name}/webapp.jar.db
%{_libdir}/gcj/%{name}/webapp.jar.so
%{_libdir}/gcj/%{name}/tomcatwrapper.jar.db
%{_libdir}/gcj/%{name}/tomcatwrapper.jar.so
%{_libdir}/gcj/%{name}/org.eclipse.ui_3.1.0.jar.db
%{_libdir}/gcj/%{name}/org.eclipse.ui_3.1.0.jar.so
%{_libdir}/gcj/%{name}/org.eclipse.ui.browser_3.1.0.jar.db
%{_libdir}/gcj/%{name}/org.eclipse.ui.browser_3.1.0.jar.so
%{_libdir}/gcj/%{name}/org.eclipse.ui.cheatsheets_3.1.0.jar.db
%{_libdir}/gcj/%{name}/org.eclipse.ui.cheatsheets_3.1.0.jar.so
%{_libdir}/gcj/%{name}/org.eclipse.ui.console_3.1.0.jar.db
%{_libdir}/gcj/%{name}/org.eclipse.ui.console_3.1.0.jar.so
%{_libdir}/gcj/%{name}/org.eclipse.ui.editors_3.1.0.jar.db
%{_libdir}/gcj/%{name}/org.eclipse.ui.editors_3.1.0.jar.so
%{_libdir}/gcj/%{name}/org.eclipse.ui.externaltools_3.1.0.jar.db
%{_libdir}/gcj/%{name}/org.eclipse.ui.externaltools_3.1.0.jar.so
# FIXME: temporarily disable org.eclipse.ui.forms_3.1.0.jar.so
# see: https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=146463
#%{_libdir}/gcj/%{name}/org.eclipse.ui.forms_3.1.0.jar.db
#%{_libdir}/gcj/%{name}/org.eclipse.ui.forms_3.1.0.jar.so
%{_libdir}/gcj/%{name}/org.eclipse.ui.ide_3.1.0.jar.db
%{_libdir}/gcj/%{name}/org.eclipse.ui.ide_3.1.0.jar.so
%{_libdir}/gcj/%{name}/org.eclipse.ui.intro_3.1.0.jar.db
%{_libdir}/gcj/%{name}/org.eclipse.ui.intro_3.1.0.jar.so
%{_libdir}/gcj/%{name}/org.eclipse.ui.presentations.r21_3.1.0.jar.db
%{_libdir}/gcj/%{name}/org.eclipse.ui.presentations.r21_3.1.0.jar.so
%{_libdir}/gcj/%{name}/org.eclipse.ui.views_3.1.0.jar.db
%{_libdir}/gcj/%{name}/org.eclipse.ui.views_3.1.0.jar.so
# FIXME: temporarily disable org.eclipse.ui.workbench_3.1.0.jar.so
# see: https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=151919
#%{_libdir}/gcj/%{name}/org.eclipse.ui.workbench_3.1.0.jar.so
#%{_libdir}/gcj/%{name}/org.eclipse.ui.workbench_3.1.0.jar.db
%{_libdir}/gcj/%{name}/org.eclipse.ui.workbench.texteditor_3.1.0.jar.db
%{_libdir}/gcj/%{name}/org.eclipse.ui.workbench.texteditor_3.1.0.jar.so
%{_libdir}/gcj/%{name}/compatibility.jar.db
%{_libdir}/gcj/%{name}/compatibility.jar.so
%{_libdir}/gcj/%{name}/org.eclipse.update.configurator_3.1.0.jar.db
%{_libdir}/gcj/%{name}/org.eclipse.update.configurator_3.1.0.jar.so
%{_libdir}/gcj/%{name}/org.eclipse.update.core_3.1.0.jar.db
%{_libdir}/gcj/%{name}/org.eclipse.update.core_3.1.0.jar.so
%{_libdir}/gcj/%{name}/org.eclipse.update.scheduler_3.1.0.jar.db
%{_libdir}/gcj/%{name}/org.eclipse.update.scheduler_3.1.0.jar.so
%{_libdir}/gcj/%{name}/org.eclipse.update.ui_3.1.0.jar.db
%{_libdir}/gcj/%{name}/org.eclipse.update.ui_3.1.0.jar.so
# FIXME: temporarily disable org.eclipse.osgi_3.1.0.jar.so
# see: https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=158137
#%{_libdir}/gcj/%{name}/org.eclipse.osgi_3.1.0.jar.so
#%{_libdir}/gcj/%{name}/org.eclipse.osgi_3.1.0.jar.db
%{_libdir}/gcj/%{name}/org.eclipse.osgi.services_3.1.0.jar.db
%{_libdir}/gcj/%{name}/org.eclipse.osgi.services_3.1.0.jar.so
%{_libdir}/gcj/%{name}/org.eclipse.osgi.util_3.1.0.jar.db
%{_libdir}/gcj/%{name}/org.eclipse.osgi.util_3.1.0.jar.so
%{_libdir}/gcj/%{name}/org.eclipse.ant.core_3.1.0.jar.db
%{_libdir}/gcj/%{name}/org.eclipse.ant.core_3.1.0.jar.so
%{_libdir}/gcj/%{name}/org.eclipse.ant.ui_3.1.0.jar.db
%{_libdir}/gcj/%{name}/org.eclipse.ant.ui_3.1.0.jar.so
%{_libdir}/gcj/%{name}/org.eclipse.compare_3.1.0.jar.so
%{_libdir}/gcj/%{name}/org.eclipse.compare_3.1.0.jar.db
%{_libdir}/gcj/%{name}/org.eclipse.debug.core_3.1.0.jar.so
%{_libdir}/gcj/%{name}/org.eclipse.debug.core_3.1.0.jar.db
%{_libdir}/gcj/%{name}/org.eclipse.debug.ui_3.1.0.jar.so
%{_libdir}/gcj/%{name}/org.eclipse.debug.ui_3.1.0.jar.db
%{_libdir}/gcj/%{name}/org.eclipse.ltk.ui.refactoring_3.1.0.jar.so
%{_libdir}/gcj/%{name}/org.eclipse.ltk.ui.refactoring_3.1.0.jar.db
%{_libdir}/gcj/%{name}/org.eclipse.ltk.core.refactoring_3.1.0.jar.so
%{_libdir}/gcj/%{name}/org.eclipse.ltk.core.refactoring_3.1.0.jar.db
%{_libdir}/gcj/%{name}/activeHelpSample.jar.db
%{_libdir}/gcj/%{name}/activeHelpSample.jar.so
%{_libdir}/gcj/%{name}/platform.jar.db
%{_libdir}/gcj/%{name}/platform.jar.so
%{_libdir}/gcj/%{name}/org.eclipse.team.core_3.1.0.jar.db
%{_libdir}/gcj/%{name}/org.eclipse.team.core_3.1.0.jar.so
%{_libdir}/gcj/%{name}/org.eclipse.team.cvs.core_3.1.0.jar.db
%{_libdir}/gcj/%{name}/org.eclipse.team.cvs.core_3.1.0.jar.so
%{_libdir}/gcj/%{name}/org.eclipse.team.cvs.ssh_3.1.0.jar.db
%{_libdir}/gcj/%{name}/org.eclipse.team.cvs.ssh_3.1.0.jar.so
%{_libdir}/gcj/%{name}/cvsssh2.jar.so
%{_libdir}/gcj/%{name}/cvsssh2.jar.db
%{_libdir}/gcj/%{name}/org.eclipse.team.cvs.ui_3.1.0.jar.db
%{_libdir}/gcj/%{name}/org.eclipse.team.cvs.ui_3.1.0.jar.so
%{_libdir}/gcj/%{name}/org.eclipse.team.ui_3.1.0.jar.db
%{_libdir}/gcj/%{name}/org.eclipse.team.ui_3.1.0.jar.so
%{_libdir}/gcj/%{name}/org.eclipse.search_3.1.0.jar.so
%{_libdir}/gcj/%{name}/org.eclipse.search_3.1.0.jar.db
%{_libdir}/gcj/%{name}/org.eclipse.text_3.1.0.jar.so
%{_libdir}/gcj/%{name}/org.eclipse.text_3.1.0.jar.db
# These will go away when we get a newer system ant
%{_libdir}/gcj/%{name}/ant.jar.db
%{_libdir}/gcj/%{name}/ant.jar.so
%endif
%files platform-devel
@ -1233,6 +1158,12 @@ fi
- Bump release to build against new gcc.
- Bump gcc requirement to gcc 4.0.1.
- Add back BuildArch until we get bootstrapping sorted out.
- Bump required version of java-gcj-compat to the latest (-40jpp_37rh).
- Remove lots of jiggery-pokery with native compilation and use gbenson's new
aot-compile.
- Re-work files sections appropriately.
- Change mozilla-nspr-devel -> nspr-devel due to change in mozilla packaging.
- Update patch for mozilla build as per above.
* Tue Jul 05 2005 Andrew Overholt <overholt@redhat.com> 3.1.0_fc-5
- Revert ecj_bootstrap patch since it won't work.