rpms/eclipse/devel eclipse.in,1.1,1.2 eclipse.spec,1.437,1.438

[Ben Konrath (bkonrath)]

Author: bkonrath

Update of /cvs/pkgs/rpms/eclipse/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14617

Modified Files:
	eclipse.in eclipse.spec 
Log Message:
* Tue Jun 19 2007 Ben Konrath <bkonrath at redhat.com> 3.3.0-0.2.RC4
- Use icu4j-eclipse sub-package instead of building icu4j here.
- Use exec in binary wrapper.



Index: eclipse.in
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse/devel/eclipse.in,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- eclipse.in	14 Jun 2007 06:23:49 -0000	1.1
+++ eclipse.in	21 Jun 2007 13:25:11 -0000	1.2
@@ -1,6 +1,6 @@
 #!/bin/sh
 
- at LIBDIR@/eclipse/eclipse \
+exec @LIBDIR@/eclipse/eclipse \
   --launcher.library @LIBDIR@/eclipse/plugins/org.eclipse.equinox.launcher.gtk.linux. at ECLIPSELIBSUFFIX@ \
   -startup /usr/share/eclipse/startup.jar \
   ${1+"$@"}


Index: eclipse.spec
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse/devel/eclipse.spec,v
retrieving revision 1.437
retrieving revision 1.438
diff -u -r1.437 -r1.438
--- eclipse.spec	14 Jun 2007 07:29:57 -0000	1.437
+++ eclipse.spec	21 Jun 2007 13:25:11 -0000	1.438
@@ -19,16 +19,13 @@
 Summary:        An open, extensible IDE
 Name:           eclipse
 Version:        %{eclipse_majmin}.%{eclipse_micro}
-Release:        0.1.RC4%{?dist} 
+Release:        0.2.RC4%{?dist} 
 License:        Eclipse Public License
 Group:          Text Editors/Integrated Development Environments (IDE)
 URL:            http://www.eclipse.org/
 Source0: 	http://download.eclipse.org/eclipse/downloads/drops/S-3.3RC4-200706081718/eclipse-sourceBuild-srcIncluded-3.3RC4.zip
 Source2:        %{name}.desktop
 Source3:        eclipse.in
-# The icu4j bits will be moved out into their own package for Fedora 7.  See:
-# https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=199504
-Source7:        ftp://ftp.software.ibm.com/software/globalization/icu/icu4j/3.4.5/icu4jsrc_3_4_5.jar
 Source11:       %{name}-fedora-splash-3.2.1.png
 Source16:       %{name}-copy-platform.sh
 Source17:       efj.sh.in
@@ -41,9 +38,6 @@
 # (generated 2006-11-01 18:48 UTC)
 Source20:       %{name}-fileinitializerapp.tar.bz2
 
-# We need this because icu4j's Eclipse bits are dependent upon Eclipse
-# but we don't want the icu4j RPM needing Eclipse to build
-Patch1:         %{name}-icu4j-build-files.patch
 # These two patches need to go upstream
 Patch3:         %{name}-libupdatebuild2.patch
 # Build swttools.jar
@@ -87,6 +81,7 @@
 BuildRequires:  mesa-libGLU-devel
 BuildRequires:  cairo >= 1.0
 BuildRequires:  unzip
+BuildRequires:  icu4j-eclipse >= 3.6.1
 BuildRequires:  java-javadoc
 BuildRequires:  desktop-file-utils
 %if %{gcj_support}
@@ -161,6 +156,7 @@
 Requires: %{_libdir}/%{name}/plugins/org.eclipse.swt.gtk.linux.%{eclipse_arch}_3.3.0.v3345f.jar
 Requires(post):     %{libname}-gtk2 = %{epoch}:%{version}-%{release}
 Requires(postun):   %{libname}-gtk2 = %{epoch}:%{version}-%{release}
+Requires:           icu4j-eclipse > = 3.6.1
 %if %{gcj_support}
 Requires:           libgcj >= 4.0.2
 Requires(post):     java-gcj-compat >= 1.0.64
@@ -583,27 +579,9 @@
 rm plugins/com.jcraft.jsch_0.1.31.jar
 ln -s %{_javadir}/jsch.jar plugins/com.jcraft.jsch_0.1.31.jar
 
-# set the icu4j plugins for building
-pushd plugins
-rm com.ibm.icu_3.6.1.v20070417.jar
-mkdir -p icu4j-build-temp
-
-pushd icu4j-build-temp
-unzip -qq %{SOURCE7} 
-sed --in-place "s/ .*bootclasspath=.*//g" build.xml
-ant eclipseProjects
-popd
-
-mkdir -p icu4j-build
-mv icu4j-build-temp/eclipseProjects/com.ibm.icu icu4j-build
-rm -r icu4j-build-temp
-
-# add build.xml patches
-pushd icu4j-build
-%patch1 -p1
-popd 
-
-popd
+# link to the icu4j stuff
+rm plugins/com.ibm.icu_3.6.1.v20070417.jar
+ln -s %{_datadir}/eclipse/plugins/com.ibm.icu_3.6.1.v20070417.jar plugins/com.ibm.icu_3.6.1.v20070417.jar
 
 # delete included jars
 # https://bugs.eclipse.org/bugs/show_bug.cgi?id=170662
@@ -631,12 +609,6 @@
 %build
 ORIGCLASSPATH=$CLASSPATH
 
-# Finish the icu4j build
-pushd plugins/icu4j-build/com.ibm.icu
-ant -DcompilerArg="-encoding ISO-8859-1 -nowarn" build.update.jar
-mv com.ibm.icu_3.4.5.jar ../../com.ibm.icu_3.6.1.v20070417.jar
-popd
-
 # Bootstrapping:
 # 1. Build ecj with gcj-built ecj ("javac")
 # 2. Re-build ecj with output of 1.
@@ -769,9 +741,6 @@
 mv $RPM_BUILD_ROOT%{_datadir}/%{name}/plugins/org.eclipse.update.core.linux_$UPDATECORELINUXVERSION \
   $RPM_BUILD_ROOT%{_libdir}/%{name}/plugins
 
-# FIXME: icu4j generates res_index.txt differently on different arches - possible libgcj bug.
-mv $RPM_BUILD_ROOT%{_datadir}/%{name}/plugins/com.ibm.icu_3.6.1.v20070417.jar $RPM_BUILD_ROOT%{_libdir}/%{name}/plugins
-
 # FIXME: there is a problem with gjdoc generating different HTML on different
 # architectures.
 PLATFORMDOCISVVERSION=$(ls $RPM_BUILD_ROOT%{_datadir}/%{name}/plugins | grep platform.doc.isv_ | sed 's/org.eclipse.platform.doc.isv_//')
@@ -1062,8 +1031,7 @@
 # https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=175547
 UIIDEPLUGINVERSION=$(ls plugins | grep ui.ide_ | sed 's/org.eclipse.ui.ide_//')
 %ifnarch ia64
-#aot-compile-rpm --exclude %{_datadir}/%{name}/plugins/org.eclipse.ui.ide_$UIIDEPLUGINVERSION
-aot-compile-rpm
+aot-compile-rpm --exclude %{_datadir}/%{name}/plugins/org.eclipse.ui.ide_$UIIDEPLUGINVERSION
 %else
 OSGIPLUGINVERSION=$(ls plugins | grep osgi_ | sed 's/org.eclipse.osgi_//')
 aot-compile-rpm --exclude %{_datadir}/%{name}/plugins/org.eclipse.ui.ide_$UIIDEPLUGINVERSION \
@@ -1206,7 +1174,6 @@
 %endif
 %{_datadir}/%{name}/readme
 %{_libdir}/%{name}/features/org.eclipse.rcp_*
-%{_libdir}/%{name}/plugins/com.ibm.icu_*
 %{_datadir}/%{name}/plugins/org.eclipse.core.commands_*
 %{_datadir}/%{name}/plugins/org.eclipse.core.contenttype_*
 %{_datadir}/%{name}/plugins/org.eclipse.core.databinding_*
@@ -1238,7 +1205,6 @@
 %{_libdir}/gcj/%{name}/org.eclipse.equinox.registry_*
 %{_libdir}/gcj/%{name}/org.eclipse.equinox.launcher_*
 %{_libdir}/gcj/%{name}/org.eclipse.equinox.app_*
-%{_libdir}/gcj/%{name}/com.ibm.icu_*
 %{_libdir}/gcj/%{name}/org.eclipse.jface_*
 %{_libdir}/gcj/%{name}/org.eclipse.jface.databinding_*
 %{_libdir}/gcj/%{name}/org.eclipse.core.commands_*
@@ -1528,6 +1494,10 @@
 %{_libdir}/%{name}/plugins/org.eclipse.sdk_*
 
 %changelog
+* Tue Jun 19 2007 Ben Konrath <bkonrath at redhat.com> 3.3.0-0.2.RC4
+- Use icu4j-eclipse sub-package instead of building icu4j here.
+- Use exec in binary wrapper.
+
 * Tue Jun 12 2007 Ben Konrath <bkonrath at redhat.com> 3.3.0-0.1.RC4
 - 3.3RC4.