diff --git a/.cvsignore b/.cvsignore index 522dead..cd40a66 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1,3 +1,2 @@ -eclipse-sourceBuild-srcIncluded-3.1M5a.zip -eclipse-native-splash-3.1-M-build.png -eclipse-native-splash-3.1.png +eclipse-sourceBuild-srcIncluded-3.1M6.zip +eclipse-native-splash-3.1-M6.png diff --git a/eclipse.spec b/eclipse.spec index ac4c385..22e2604 100644 --- a/eclipse.spec +++ b/eclipse.spec @@ -3,14 +3,14 @@ ExclusiveArch: i386 x86_64 ppc %define pkg_summary An open, extensible IDE %define section free -%define swt_version 3123 +%define swt_version 3128 %define eclipse_major 3 %define eclipse_minor 1 %define eclipse_majmin %{eclipse_major}.%{eclipse_minor} %define eclipse_micro 0 %define eclipse_oldmajminmic 3.0.0 %define libname libswt3 -%define build_id I20050219-1500 +%define build_id I20050401-1645 # All arches line up except i386 -> x86 %ifarch %{ix86} @@ -22,11 +22,11 @@ ExclusiveArch: i386 x86_64 ppc Summary: %{pkg_summary} Name: eclipse Version: %{eclipse_majmin}.%{eclipse_micro}_fc -Release: 0.M5.20 -License: CPL +Release: 0.M6.4 +License: EPL Group: Text Editors/Integrated Development Environments (IDE) URL: http://www.eclipse.org/ -Source0: http://download.eclipse.org/eclipse/downloads/drops/S-3.1M5a-200502191500/eclipse-sourceBuild-srcIncluded-3.1M5a.zip +Source0: http://download.eclipse.org/eclipse/downloads/drops/S-3.1M6-200504011645/eclipse-sourceBuild-srcIncluded-3.1M6.zip Source1: %{name}.script Source2: %{name}.desktop Source3: %{name}-16.gif @@ -38,10 +38,11 @@ Source8: %{name}-pde.install Source9: %{name}-platform.install Source10: %{libname}-gtk2.install # this should be replaced with: -# Source11: %{name}-native-splash-3.1-M.png +# Source11: %{name}-native-splash-3.1.png # when Eclipse 3.1 comes out. -Source11: %{name}-native-splash-3.1-M-build.png +Source11: %{name}-native-splash-3.1-M6.png Source16: %{name}-copy-platform.sh +Source17: %{name}-efj-wrapper.sh # Build libswt-mozilla # https://bugs.eclipse.org/bugs/show_bug.cgi?id=71637 @@ -56,10 +57,6 @@ Patch1: %{name}-textsearch.patch Patch2: %{name}-build.patch Patch4: %{name}-libupdatebuild.patch Patch5: %{name}-libupdatebuild2.patch -# https://bugs.eclipse.org/bugs/show_bug.cgi?id=85915 -Patch8: %{name}-antsecuritymanager.patch -# https://bugs.eclipse.org/bugs/show_bug.cgi?id=86571 -Patch9: %{name}-pdebuildtarargs.patch # https://bugs.eclipse.org/bugs/show_bug.cgi?id=86848 Patch10: %{name}-icon.patch # Use installed mozilla libs and headers @@ -77,9 +74,6 @@ Patch15: %{name}-build-activeHelpSample.jar.patch # Make find work. See # https://bugzilla.redhat.com/bugzilla/attachment.cgi?id=111736 Patch16: %{name}-find.patch -# Bootstrap the build a la https://bugs.eclipse.org/bugs/show_bug.cgi?id=84914 -# ... the patch is a bit hacky at the moment -Patch17: %{name}-bootstrap.patch # Build swttools.jar # https://bugs.eclipse.org/bugs/show_bug.cgi?id=90364 Patch18: %{name}-swttools.patch @@ -220,8 +214,6 @@ popd %patch2 -p0 %patch4 -p0 %patch5 -p0 -%patch8 -p0 -%patch9 -p0 %patch10 -p0 %patch12 -p0 %patch13 -p1 @@ -230,7 +222,6 @@ rm -f activeHelpSample.jar %patch15 -p0 popd %patch16 -p0 -%patch17 -p1 pushd plugins/org.eclipse.swt.gtk64 %patch18 -p0 popd @@ -246,9 +237,6 @@ popd # Remove existing .sos find -name \*.so -exec rm "-f" "{}" ";" -## Remove these as well -#rm jdtcore.jar jdtCompilerAdapter.jar - # Symlinks ## BEGIN ANT ## @@ -360,27 +348,23 @@ ORIGCLASSPATH=$CLASSPATH # 2. Build ecj with gcj-built ecj ("javac") # 3. Re-build ecj with output of 2. -# Keep a backup -cp -r plugins/org.eclipse.jdt.core plugins/org.eclipse.jdt.core.orig +# Unzip the "stable compiler" source into a temp dir and build it. +# Note: we don't want to build the CompilerAdapter. +mkdir ecj-bootstrap-tmp +unzip -qq -d ecj-bootstrap-tmp jdtcoresrc/src/jdtcore.zip +rm -f ecj-bootstrap-tmp/org/eclipse/jdt/core/JDTCompilerAdapter.java # 1a. Build ecj with gcj -C -pushd plugins/org.eclipse.jdt.core -for f in `find batch -name '*.java' -or -name '*.properties'`; do - g=`echo $f | sed 's:^batch/:compiler/:' | xargs dirname` - [ -d $g ] || mkdir -p $g - cp -a $f $g -done -cd compiler +pushd ecj-bootstrap-tmp for f in `find -name '*.java' | cut -c 3-`; do gcj -Wno-deprecated -C $f done find -name '*.class' -or -name '*.properties' -or -name '*.rsc' |\ - xargs jar cf ../../../ecj-bootstrap.jar + xargs jar cf ../ecj-bootstrap.jar popd # Delete our modified jdtcore and restore the backup -rm -rf plugins/org.eclipse.jdt.core -mv plugins/org.eclipse.jdt.core.orig plugins/org.eclipse.jdt.core +rm -rf ecj-bootstrap-tmp ## 1b. Natively-compile it #gcj -fPIC -fjni -findirect-dispatch -shared -Wl,-Bsymbolic \ @@ -408,7 +392,7 @@ ant -buildfile jdtcoresrc/compilejdtcorewithjavac.xml rm ecj-bootstrap.jar # 3. Use this ecj to rebuild itself -export CLASSPATH=`pwd`/jdtcoresrc/ecj.jar:$ORIGCLASSPATH +export CLASSPATH=`pwd`/jdtcoresrc/jdtcore.jar:$ORIGCLASSPATH ant -buildfile jdtcoresrc/compilejdtcore.xml ## Natively-compile it @@ -421,7 +405,7 @@ ant -buildfile jdtcoresrc/compilejdtcore.xml #rm jdtcoresrc/ecj.db jdtcoresrc/ecj.jar.so # Build the rest of Eclipse -export CLASSPATH=`pwd`/ecj.jar:$ORIGCLASSPATH +export CLASSPATH=`pwd`/jdtcore.jar:$ORIGCLASSPATH #export GCJ_PROPERTIES="gnu.gcj.precompiled.db.path=`pwd`/ecj.db" ant \ -Dnobootstrap=true \ @@ -429,9 +413,8 @@ ant \ -Dlibsconfig=true 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 +# De-compress resulting tarball +tar zxf org.eclipse.sdk-%{build_id}-linux.gtk.%{eclipse_arch}.tar.gz pushd eclipse @@ -478,9 +461,9 @@ rm -f plugins/org.junit_3.8.1/junit.jar done %endif -# FIXME: temporarily remove eclipseAdaptor.jar +# FIXME: temporarily remove org.eclipse.osgi_3.1.0.jar rm \ - .%{_libdir}/%{name}/plugins/org.eclipse.osgi_%{eclipse_majmin}.%{eclipse_micro}/eclipseAdaptor.jar.so + .%{_libdir}/%{name}/plugins/org.eclipse.osgi_%{eclipse_majmin}.%{eclipse_micro}.jar.so pushd .%{_libdir}/%{name}/plugins/org.eclipse.jdt.core_3.1.0 gcj -O2 --main=org.eclipse.jdt.internal.compiler.batch.Main \ @@ -502,9 +485,8 @@ rm -rf $RPM_BUILD_ROOT install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/%{name} -# 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 + result/org.eclipse.sdk-%{build_id}-linux.gtk.%{eclipse_arch}.tar.gz # Binaries, libraries, and natively-built shared libraries install -d -m 755 $RPM_BUILD_ROOT%{_libdir}/%{name} @@ -530,38 +512,38 @@ mv $RPM_BUILD_ROOT%{_datadir}/%{name}/eclipse \ pushd $RPM_BUILD_ROOT%{_datadir}/%{name} ln -sf %{_libdir}/%{name}/eclipse eclipse -# 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=64 -%endif -cp -p plugins/org.eclipse.swt.gtk${suff}_%{eclipse_majmin}.%{eclipse_micro}/os/linux/%{eclipse_arch}/libswt*.so \ - $RPM_BUILD_ROOT%{_libdir}/%{name}/ +## 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=64 +#%endif +#cp -p plugins/org.eclipse.swt.gtk${suff}_%{eclipse_majmin}.%{eclipse_micro}/os/linux/%{eclipse_arch}/libswt*.so \ +# $RPM_BUILD_ROOT%{_libdir}/%{name}/ popd pushd $RPM_BUILD_ROOT%{_libdir}/%{name} chmod -R 755 eclipse *.so popd -### begin libswt-gtk2 symlinks -pushd $RPM_BUILD_ROOT%{_libdir} -for base in awt-gtk mozilla-gtk atk-gtk gnome-gtk gtk pi-gtk; do - ln -sf %{_libdir}/%{name}/libswt-${base}-%{swt_version}.so \ - libswt-${base}-%{swt_version}.so -done -popd +#### begin libswt-gtk2 symlinks +#pushd $RPM_BUILD_ROOT%{_libdir} +#for base in awt-gtk mozilla-gtk atk-gtk gnome-gtk gtk pi-gtk; do +# ln -sf %{_libdir}/%{name}/libswt-${base}-%{swt_version}.so \ +# libswt-${base}-%{swt_version}.so +#done +#popd install -d -m 755 $RPM_BUILD_ROOT%{_javadir} 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 -ln -sf %{_datadir}/%{name}/plugins/org.eclipse.swt.gtk${suff}_%{eclipse_majmin}.%{eclipse_micro}/ws/gtk/swt-cairo.jar swt-cairo-%{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 +#ln -sf %{_datadir}/%{name}/plugins/org.eclipse.swt.gtk${suff}_%{eclipse_majmin}.%{eclipse_micro}/ws/gtk/swt-cairo.jar swt-cairo-%{version}.jar popd ### end libswt-gtk2 symlinks @@ -589,6 +571,11 @@ install -d -m0755 $RPM_BUILD_ROOT%{_datadir}/pixmaps ln -s ../icons/hicolor/48x48/apps/%{name}.png \ $RPM_BUILD_ROOT%{_datadir}/pixmaps +# install the efj wrapper script and change the Eclipse installation dir +install -p -D -m0755 %{SOURCE17} $RPM_BUILD_ROOT%{_bindir}/efj +sed --in-place "s:startup.jar:%{_datadir}/%{name}/startup.jar:" \ + $RPM_BUILD_ROOT%{_bindir}/efj + # A sanity check. desktop-file-validate %{SOURCE2} @@ -813,35 +800,31 @@ rebuild-gcj-db %{_libdir} %files -n %{libname}-gtk2 -f %{libname}-gtk2.install %defattr(0644,root,root,0755) -%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 -%{_libdir}/%{name}/libswt-awt-gtk-*.so -%{_libdir}/%{name}/libswt-mozilla-gtk-*.so -%{_libdir}/libswt-*.so +#%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 +#%{_libdir}/%{name}/libswt-awt-gtk-*.so +#%{_libdir}/%{name}/libswt-mozilla-gtk-*.so +#%{_libdir}/libswt-*.so %{_javadir}/swt-gtk*.jar -%{_javadir}/swt-pi-gtk*.jar -%{_javadir}/swt-mozilla*.jar -%{_javadir}/swt-cairo*.jar +#%{_javadir}/swt-pi-gtk*.jar +#%{_javadir}/swt-mozilla*.jar +#%{_javadir}/swt-cairo*.jar # Native bits %{_libdir}/gcj-4.0.0/classmap.db.d/libswt3-gtk2.db +%attr(0755,root,root) %{_libdir}/%{name}/plugins/org.eclipse.swt_3.1.0.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-cairo.jar.so -%attr(0755,root,root) %{_libdir}/%{name}/plugins/org.eclipse.swt.gtk64_3.1.0/ws/gtk/swt.jar.so +%attr(0755,root,root) %{_libdir}/%{name}/plugins/org.eclipse.swt.gtk64_3.1.0.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 +%attr(0755,root,root) %{_libdir}/%{name}/plugins/org.eclipse.swt.gtk_3.1.0.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_3.1.0.jar.so %attr(0755,root,root) %{_libdir}/%{name}/plugins/org.eclipse.jface.text_3.1.0/jfacetext.jar.so %files jdt -f %{name}-jdt.install %defattr(0644,root,root,0755) +%attr(0755,root,root) %{_bindir}/efj # Native bits %{_libdir}/gcj-4.0.0/classmap.db.d/%{name}-jdt.db %attr(0755,root,root) %{_libdir}/%{name}/plugins/org.eclipse.jdt.debug.ui_3.1.0/jdiui.jar.so @@ -854,6 +837,7 @@ rebuild-gcj-db %{_libdir} %attr(0755,root,root) %{_libdir}/%{name}/plugins/org.eclipse.jdt.launching_3.1.0/lib/launchingsupport.jar.so %attr(0755,root,root) %{_libdir}/%{name}/plugins/org.eclipse.jdt.ui_3.1.0/jdt.jar.so %attr(0755,root,root) %{_libdir}/%{name}/plugins/org.eclipse.jdt.ui_3.1.0/serialsupport.jar.so +#%attr(0755,root,root) %{_libdir}/%{name}/plugins/org.junit_3.8.1/junit.jar.so %files jdt-devel %{_datadir}/%{name}/plugins/org.eclipse.jdt.source_3.* @@ -886,8 +870,8 @@ rebuild-gcj-db %{_libdir} %{_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* +#%attr(0755,root,root) %{_libdir}/%{name}/libcore* +#%attr(0755,root,root) %{_libdir}/%{name}/libupdate* %{_datadir}/%{name}/eclipse %attr(0755,root,root) %{_bindir}/eclipse %{_datadir}/applications/* @@ -899,19 +883,19 @@ rebuild-gcj-db %{_libdir} %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.expressions_3.1.0.jar.so %attr(0755,root,root) %{_libdir}/%{name}/plugins/org.eclipse.core.filebuffers_3.1.0/filebuffers.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.commands_3.1.0.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.runtime_3.1.0.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.help.base_3.1.0.jar.so +%attr(0755,root,root) %{_libdir}/%{name}/plugins/org.eclipse.help.ui_3.1.0.jar.so +%attr(0755,root,root) %{_libdir}/%{name}/plugins/org.eclipse.help.appserver_3.1.0.jar.so +%attr(0755,root,root) %{_libdir}/%{name}/plugins/org.eclipse.help_3.1.0.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 @@ -927,25 +911,25 @@ rebuild-gcj-db %{_libdir} %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.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.browser_3.1.0/browser.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.forms_3.1.0.jar.so +%attr(0755,root,root) %{_libdir}/%{name}/plugins/org.eclipse.ui.ide_3.1.0.jar.so +%attr(0755,root,root) %{_libdir}/%{name}/plugins/org.eclipse.ui.intro_3.1.0.jar.so +%attr(0755,root,root) %{_libdir}/%{name}/plugins/org.eclipse.ui_3.1.0.jar.so +%attr(0755,root,root) %{_libdir}/%{name}/plugins/org.eclipse.ui.workbench_3.1.0.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.core.runtime.compatibility_3.1.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}/plugins/org.eclipse.ui.presentations.r21_3.1.0.jar.so +%attr(0755,root,root) %{_libdir}/%{name}/plugins/org.eclipse.ui.views_3.1.0.jar.so +%attr(0755,root,root) %{_libdir}/%{name}/plugins/org.eclipse.update.configurator_3.1.0.jar.so +%attr(0755,root,root) %{_libdir}/%{name}/plugins/org.eclipse.update.core_3.1.0.jar.so +%attr(0755,root,root) %{_libdir}/%{name}/plugins/org.eclipse.update.scheduler_3.1.0.jar.so +%attr(0755,root,root) %{_libdir}/%{name}/plugins/org.eclipse.update.ui_3.1.0.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 @@ -954,32 +938,31 @@ rebuild-gcj-db %{_libdir} %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.tomcat_4.1.30.1/commons-digester.jar.so +%attr(0755,root,root) %{_libdir}/%{name}/plugins/org.eclipse.tomcat_4.1.30.1/commons-logging.jar.so +%attr(0755,root,root) %{_libdir}/%{name}/plugins/org.eclipse.tomcat_4.1.30.1/jakarta-regexp-1.3.jar.so +%attr(0755,root,root) %{_libdir}/%{name}/plugins/org.eclipse.tomcat_4.1.30.1/tomcat-util.jar.so +%attr(0755,root,root) %{_libdir}/%{name}/plugins/org.eclipse.tomcat_4.1.30.1/servlets-manager.jar.so +%attr(0755,root,root) %{_libdir}/%{name}/plugins/org.eclipse.tomcat_4.1.30.1/naming-common.jar.so +%attr(0755,root,root) %{_libdir}/%{name}/plugins/org.eclipse.tomcat_4.1.30.1/naming-factory.jar.so +%attr(0755,root,root) %{_libdir}/%{name}/plugins/org.eclipse.tomcat_4.1.30.1/commons-beanutils.jar.so +%attr(0755,root,root) %{_libdir}/%{name}/plugins/org.eclipse.tomcat_4.1.30.1/servlets-default.jar.so +%attr(0755,root,root) %{_libdir}/%{name}/plugins/org.eclipse.tomcat_4.1.30.1/commons-modeler.jar.so +%attr(0755,root,root) %{_libdir}/%{name}/plugins/org.eclipse.tomcat_4.1.30.1/tomcat-coyote.jar.so +%attr(0755,root,root) %{_libdir}/%{name}/plugins/org.eclipse.tomcat_4.1.30.1/jasper-compiler.jar.so +%attr(0755,root,root) %{_libdir}/%{name}/plugins/org.eclipse.tomcat_4.1.30.1/catalina.jar.so +%attr(0755,root,root) %{_libdir}/%{name}/plugins/org.eclipse.tomcat_4.1.30.1/jasper-runtime.jar.so +%attr(0755,root,root) %{_libdir}/%{name}/plugins/org.eclipse.tomcat_4.1.30.1/commons-logging-api.jar.so +%attr(0755,root,root) %{_libdir}/%{name}/plugins/org.eclipse.tomcat_4.1.30.1/servlets-invoker.jar.so +%attr(0755,root,root) %{_libdir}/%{name}/plugins/org.eclipse.tomcat_4.1.30.1/tomcatwrapper.jar.so +%attr(0755,root,root) %{_libdir}/%{name}/plugins/org.eclipse.tomcat_4.1.30.1/mx4j-jmx.jar.so +%attr(0755,root,root) %{_libdir}/%{name}/plugins/org.eclipse.tomcat_4.1.30.1/bootstrap.jar.so +%attr(0755,root,root) %{_libdir}/%{name}/plugins/org.eclipse.tomcat_4.1.30.1/servlet.jar.so +%attr(0755,root,root) %{_libdir}/%{name}/plugins/org.eclipse.tomcat_4.1.30.1/commons-collections.jar.so +%attr(0755,root,root) %{_libdir}/%{name}/plugins/org.eclipse.tomcat_4.1.30.1/servlets-common.jar.so +%attr(0755,root,root) %{_libdir}/%{name}/plugins/org.eclipse.tomcat_4.1.30.1/naming-resources.jar.so +%attr(0755,root,root) %{_libdir}/%{name}/plugins/org.eclipse.tomcat_4.1.30.1/tomcat-http11.jar.so +#%attr(0755,root,root) %{_libdir}/%{name}/plugins/org.eclipse.osgi_3.1.0.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 @@ -993,9 +976,9 @@ rebuild-gcj-db %{_libdir} %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-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.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.help.webapp_3.1.0/webapp.jar.so +%attr(0755,root,root) %{_libdir}/%{name}/plugins/org.eclipse.help.webapp_3.1.0/WEB-INF/lib/jsp.jar.so +%attr(0755,root,root) %{_libdir}/%{name}/plugins/org.eclipse.help.webapp_3.1.0/WEB-INF/lib/servlets.jar.so %attr(0755,root,root) %{_libdir}/%{name}/plugins/org.eclipse.ui.console_3.1.0/console.jar.so %files platform-devel @@ -1004,6 +987,12 @@ rebuild-gcj-db %{_libdir} %{_datadir}/%{name}/plugins/org.eclipse.platform.source.linux.gtk.*_3.1.0 %changelog +* Sat Apr 16 2005 Ben Konrath 3.1.0_fc-0.M6.4 +- Update to 3.1M6. +- Change bootstrap procedure to match the upstream method. +- Remove patches that were fixed upstream. +- Add efj wrapper script. + * Wed Apr 13 2005 Ben Konrath 3.1.0_fc-0.M5.20 - Fix the bootstrap patch (the ecj jar was missing some files). diff --git a/sources b/sources index 9d09172..a469d62 100644 --- a/sources +++ b/sources @@ -1,3 +1,2 @@ -6e54a6530cd2ca23f643c79fdc847d05 eclipse-sourceBuild-srcIncluded-3.1M5a.zip -e8a25474a487bfc43bc171988d33bd65 eclipse-native-splash-3.1-M-build.png -e938246ecd12c7c139fec749b8615425 eclipse-native-splash-3.1.png +51d81345d2fa0e8aa0b455f6cf4c447f eclipse-sourceBuild-srcIncluded-3.1M6.zip +87f844d4b82a5abc5baac36025a7619d eclipse-native-splash-3.1-M6.png