diff --git a/eclipse.spec b/eclipse.spec index 786ebb9..f0f4283 100644 --- a/eclipse.spec +++ b/eclipse.spec @@ -16,6 +16,7 @@ Epoch: 1 %define eclipse_majmin %{eclipse_major}.%{eclipse_minor} %define eclipse_micro 0 %define libname libswt3 +# FIXME do we need this? %define build_id I20051206-0800 # All arches line up except i386 -> x86 @@ -37,7 +38,7 @@ Epoch: 1 Summary: %{pkg_summary} Name: eclipse Version: %{eclipse_majmin}.%{eclipse_micro} -Release: 0jpp_0fc.3.2RC7 +Release: 0jpp_0fc.3.2RC7.1 License: EPL Group: Text Editors/Integrated Development Environments (IDE) URL: http://www.eclipse.org/ @@ -45,16 +46,21 @@ Source0: http://download.eclipse.org/eclipse/downloads/drops/S-3.2RC7-2006060213 Source2: %{name}.desktop Source5: %{name}-48.png Source6: %{name}.conf +%if %{fedora} Source11: %{name}-fedora-splash-3.2rc7.png -Source16: %{name}-copy-platform.sh -Source17: %{name}-efj-wrapper.sh +%endif %if %{redhat} -Source18: %{name}-redhat-splash.png +Source11: %{name}-redhat-splash.png %endif +Source16: %{name}-copy-platform.sh +Source17: %{name}-efj-wrapper.sh Source19: %{name}-filenamepatterns.txt Source20: ecj.sh.in Source21: rebuild-sdk-features + + + # Build libswt-mozilla and libswt-cairo and use O2 # https://bugs.eclipse.org/bugs/show_bug.cgi?id=71637 Patch0: %{name}-libswt-enableallandO2.patch @@ -80,19 +86,6 @@ Patch18: %{name}-swttools.patch # https://bugs.eclipse.org/bugs/show_bug.cgi?id=91770 #Patch20: %{name}-gnuformatterjdt.patch #Patch21: %{name}-gnuformatterjdtui.patch -# https://bugs.eclipse.org/bugs/show_bug.cgi?id=90630 -Patch22: %{name}-updatehomedir.patch -# https://bugs.eclipse.org/bugs/show_bug.cgi?id=90535 -Patch24: %{name}-fileinitializer.patch -# https://bugs.eclipse.org/bugs/show_bug.cgi?id=98371 -#Patch28: %{name}-tomcat5.patch -#Patch29: %{name}-tomcat5-build.patch -#Patch30: %{name}-tomcat5-build.2.patch -#Patch50: %{name}-tomcat5-build.3.patch -#Patch31: %{name}-webapp-tomcat5.patch -# https://bugs.eclipse.org/bugs/show_bug.cgi?id=98707 -# https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=178726 -Patch33: %{name}-compare-create-api.patch # JPackage []s in names of symlinks ... # https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=162177 Patch34: %{name}-bz162177.patch @@ -121,15 +114,30 @@ Patch51: %{name}-ppc64.patch # see this thread for deails: # https://www.redhat.com/archives/fedora-devel-java-list/2006-April/msg00048.html Patch53: %{name}-pde.build-add-package-build.patch +# We need to disable junit4 and apt until GCJ can handle Java5 code +Patch55: %{name}-disable-junit4-apt.patch + +# these patches need to go upstream +# https://bugs.eclipse.org/bugs/show_bug.cgi?id=98371 +#Patch28: %{name}-tomcat5.patch +#Patch29: %{name}-tomcat5-build.patch +#Patch30: %{name}-tomcat5-build.2.patch +#Patch50: %{name}-tomcat5-build.3.patch +#Patch31: %{name}-webapp-tomcat5.patch +# https://bugs.eclipse.org/bugs/show_bug.cgi?id=98707 +# https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=178726 +Patch33: %{name}-compare-create-api.patch +# https://bugs.eclipse.org/bugs/show_bug.cgi?id=90535 +Patch24: %{name}-fileinitializer.patch # https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=191536 # https://bugs.eclipse.org/bugs/show_bug.cgi?id=142861 Patch54: %{name}-swt-rm-ON_TOP.patch -# We need to disable junit4 and apt until GCJ can handle Java5 code -Patch55: %{name}-disable-junit4-apt.patch +# https://bugs.eclipse.org/bugs/show_bug.cgi?id=90630 +Patch22: %{name}-updatehomedir.patch # these patches should be in 3.2 final -Patch60: customBuildCallbacks.xml-add-pre.gather.bin.parts.patch -Patch61: org.eclipse.platform.doc.isv-rm-org.eclipse.ui.workbench-Eclipse-UI-Components.patch +Patch100: customBuildCallbacks.xml-add-pre.gather.bin.parts.patch +Patch101: org.eclipse.platform.doc.isv-rm-org.eclipse.ui.workbench-Eclipse-UI-Components.patch @@ -169,8 +177,7 @@ BuildRequires: ant-antlr ant-apache-bcel ant-apache-bsf ant-apache-log4j ant-apa # https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=180642 #BuildRequires: ant-commons-net BuildRequires: ant-javamail ant-jdepend ant-junit ant-nodeps ant-swing ant-trax ant-jsch -# FIXME update jsch to 1.28 -BuildRequires: jsch >= 0:0.1.18-1jpp +BuildRequires: jsch >= 0:0.1.28-1jpp BuildRequires: jakarta-commons-beanutils jakarta-commons-collections jakarta-commons-digester jakarta-commons-dbcp jakarta-commons-el jakarta-commons-fileupload jakarta-commons-launcher jakarta-commons-logging jakarta-commons-modeler jakarta-commons-pool BuildRequires: mx4j >= 2.1 BuildRequires: tomcat5 >= 5.5.15 @@ -235,8 +242,6 @@ Requires: ant-antlr ant-apache-bcel ant-apache-bsf ant-apache-log4j ant-apache-o # https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=180642 #Requires: ant-commons-net Requires: ant-javamail ant-jdepend ant-junit ant-nodeps ant-swing ant-trax ant-jsch -# FIXME update jsch to 0.1.28 -Requires: jsch >= 0:0.1.18-1jpp Requires: jakarta-commons-beanutils jakarta-commons-collections jakarta-commons-digester jakarta-commons-dbcp jakarta-commons-el jakarta-commons-fileupload jakarta-commons-launcher jakarta-commons-logging jakarta-commons-modeler jakarta-commons-pool Requires: mx4j >= 2.1 Requires: tomcat5 >= 5.5.15 @@ -374,11 +379,11 @@ Source for RCP for use within Eclipse. %setup -q -c pushd plugins/org.eclipse.platform.doc.isv -%patch60 -p0 -%patch61 -p0 +%patch100 -p0 +%patch101 -p0 popd pushd plugins/org.eclipse.platform.doc.user -%patch60 -p0 +%patch100 -p0 popd # I hate spaces in paths with patch! @@ -470,18 +475,9 @@ popd %patch55 -p1 rm plugins/org.junit4/junit-4.1.jar -%if %{fedora} - # Fedora splash screen. - pushd plugins/org.eclipse.platform - cp %{SOURCE11} splash.bmp - popd -%endif -%if %{redhat} - # Red Hat splash screen. - pushd plugins/org.eclipse.platform - cp %{SOURCE18} splash.bmp - popd -%endif +pushd plugins/org.eclipse.platform +cp %{SOURCE11} splash.bmp +popd # Remove existing .sos find -name \*.so | xargs rm @@ -584,12 +580,17 @@ rm plugins/org.apache.lucene/lucene-1.4.3.jar rm plugins/org.apache.lucene/lucene-1.4.3-src.zip ln -s %{_javadir}/lucene.jar plugins/org.apache.lucene/lucene-1.4.3.jar # END LUCENE ## -# FIXME -#rm baseLocation/plugins/com.jcraft.jsch_0.1.28.jar -#ln -s %{_javadir}/jsch.jar baseLocation/plugins/com.jcraft.jsch_0.1.28.jar -#rm plugins/org.eclipse.team.cvs.ssh2/com.jcraft.jsch_0.1.26.jar -#rm plugins/org.eclipse.team.cvs.ssh2/com.jcraft.jsch_0.1.27.jar -#rm plugins/org.eclipse.team.cvs.ssh2/com.jcraft.jsch_0.1.28.jar +rm plugins/org.eclipse.team.cvs.ssh2/com.jcraft.jsch_*.jar +pushd baseLocation/plugins +unzip -qq -d tmp %{_javadir}/jsch.jar +unzip -qq -o -d tmp com.jcraft.jsch_*.jar -x com\* +rm com.jcraft.jsch_*.jar +pushd tmp +sed --in-place "s/$(grep Created-By: META-INF/MANIFEST.MF)/Created-By: $(jar -V | head -1)/" META-INF/MANIFEST.MF +jar -cf ../com.jcraft.jsch_0.1.28.jar * +popd +rm -r tmp +popd #ln -s %{_javadir}/jsch.jar plugins/org.eclipse.team.cvs.ssh2/com.jcraft.jsch_0.1.28.jar ## BEGIN TOMCAT ## #rm plugins/org.eclipse.tomcat/commons-beanutils.jar @@ -1076,8 +1077,13 @@ ln -s %{_datadir}/java/eclipse-ecj.jar \ $RPM_BUILD_ROOT%{_datadir}/java/jdtcore.jar %if %{gcj_support} +%ifarch ia64 +# FIXME: auto get version number; tweak aot-compile-rpm to fix this +aot-compile-rpm --exclude %{_datadir}/%{name}/plugins/org.eclipse.team.core_3.2.0.I200606011710.jar +%else aot-compile-rpm %endif +%endif # FIXME: due to aot-compile-rpm smarts, the required resource bundles aren't # being compiled so this truly native ecj binary isn't possible @@ -1101,8 +1107,13 @@ rm *.log popd %if %{gcj_support} +%ifarch ia64 +# FIXME: auto get version number; tweak aot-compile-rpm to fix this +aot-compile-rpm --exclude %{_datadir}/%{name}/plugins/org.eclipse.team.core_3.2.0.I200606011710.jar +%else aot-compile-rpm %endif +%endif %clean rm -rf $RPM_BUILD_ROOT @@ -1551,6 +1562,12 @@ fi %{_datadir}/%{name}/plugins/org.eclipse.platform.source.linux.gtk.* %changelog +* Tue Jun 06 2006 Ben Konrath 3.2.0-0jpp_0fc.3.2RC7.1 +- 3.2RC7. +- Remove com.jcraft.jsch_0.1.28.jar and repackage with classes from the system + jsch.jar. +- Work around ia64 compile problem in aot-compile-rpm. + * Wed May 31 2006 Ben Konrath 3.2.0-0jpp_0fc.3.2RC6 - 3.2RC6.