rpms/eclipse/devel eclipse-add-ppc64-sparc64-s390-s390x-2.patch, NONE, 1.1 eclipse-idreplace.patch, NONE, 1.1 eclipse-add-ppc64-sparc64-s390-s390x.patch, 1.9, 1.10 sources, 1.52, 1.53 eclipse.spec, 1.494, 1.495 .cvsignore, 1.40, 1.41

Andrew Overholt (overholt) fedora-extras-commits at redhat.com
Mon Oct 22 14:33:40 UTC 2007


Author: overholt

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

Modified Files:
	eclipse-add-ppc64-sparc64-s390-s390x.patch sources 
	eclipse.spec .cvsignore 
Added Files:
	eclipse-add-ppc64-sparc64-s390-s390x-2.patch 
	eclipse-idreplace.patch 
Log Message:
* Mon Oct 22 2007 Andrew Overholt <overholt at redhat.com> 3.3.1-1
- 3.3.1
- Update icu4j requirement for new version number.

eclipse-add-ppc64-sparc64-s390-s390x-2.patch:

--- NEW FILE eclipse-add-ppc64-sparc64-s390-s390x-2.patch ---
diff -ur features/org.eclipse.platform.source/feature.xml features/org.eclipse.platform.source/feature.xml
--- features/org.eclipse.platform.source/feature.xml	2007-09-28 11:50:28.000000000 -0400
+++ features/org.eclipse.platform.source/feature.xml	2007-09-28 11:47:21.000000000 -0400
@@ -42,4 +42,7 @@
 	<plugin ws="motif"  os="solaris" fragment="true" arch="sparc" download-size="0" install-size="0" id="org.eclipse.platform.source.solaris.motif.sparc" version="3.3.1.R33x_r20070911-_19UEkpF-B7Uh2hKy75y"/>
 	<plugin ws="gtk"  os="linux" fragment="true" arch="s390" download-size="0" install-size="0" id="org.eclipse.platform.source.linux.gtk.s390" version="3.3.1.R33x_r20070911-_19UEkpF-B7Uh2hKy75y"/>
 	<plugin ws="motif"  os="linux" fragment="true" arch="x86" download-size="0" install-size="0" id="org.eclipse.platform.source.linux.motif.x86" version="3.3.1.R33x_r20070911-_19UEkpF-B7Uh2hKy75y"/>
+	<plugin ws="gtk"  os="linux" fragment="true" arch="sparc" download-size="0" install-size="0" id="org.eclipse.platform.source.linux.gtk.sparc" version="3.3.0.v20070612-_19UEkLEzwsdF9jSqQ-G"/>
+	<plugin ws="gtk"  os="linux" fragment="true" arch="sparc64" download-size="0" install-size="0" id="org.eclipse.platform.source.linux.gtk.sparc64" version="3.3.0.v20070612-_19UEkLEzwsdF9jSqQ-G"/>
+	<plugin ws="gtk"  os="linux" fragment="true" arch="alpha" download-size="0" install-size="0" id="org.eclipse.platform.source.linux.gtk.alpha" version="3.3.0.v20070612-_19UEkLEzwsdF9jSqQ-G"/>
 </feature>
diff -ur features/org.eclipse.rcp/feature.xml features/org.eclipse.rcp/feature.xml
--- features/org.eclipse.rcp/feature.xml	2007-09-28 11:50:28.000000000 -0400
+++ features/org.eclipse.rcp/feature.xml	2007-09-28 11:47:47.000000000 -0400
@@ -499,4 +499,48 @@
          version="0.0.0"
          fragment="true"/>
 
+    <plugin
+          id="org.eclipse.swt.gtk.linux.ppc64"
+          os="linux"
+          ws="gtk"
+          arch="ppc64"
+          download-size="0"
+          install-size="0"
+          version="0.0.0"
+          fragment="true"
+          unpack="false"/>
+ 
+    <plugin
+          id="org.eclipse.swt.gtk.linux.sparc"
+          os="linux"
+          ws="gtk"
+          arch="sparc"
+          download-size="0"
+          install-size="0"
+          version="0.0.0"
+          fragment="true"
+          unpack="false"/>
+ 
+    <plugin
+          id="org.eclipse.swt.gtk.linux.sparc64"
+          os="linux"
+          ws="gtk"
+          arch="sparc64"
+          download-size="0"
+          install-size="0"
+          version="0.0.0"
+          fragment="true"
+          unpack="false"/>
+ 
+    <plugin
+          id="org.eclipse.swt.gtk.linux.alpha"
+          os="linux"
+          ws="gtk"
+          arch="alpha"
+          download-size="0"
+          install-size="0"
+          version="0.0.0"
+          fragment="true"
+          unpack="false"/>
+
 </feature>
diff -ur features/org.eclipse.rcp.source/feature.xml features/org.eclipse.rcp.source/feature.xml
--- features/org.eclipse.rcp.source/feature.xml	2007-09-28 11:50:28.000000000 -0400
+++ features/org.eclipse.rcp.source/feature.xml	2007-09-28 11:48:25.000000000 -0400
@@ -30,4 +30,8 @@
 	<plugin ws="motif"  os="solaris" fragment="true" arch="sparc" download-size="0" install-size="0" id="org.eclipse.rcp.source.solaris.motif.sparc" version="3.3.1.R33x_r20070802-8y8eE8sEV3Fz0z0GlHJrXvTAUS"/>
 	<plugin ws="gtk"  os="linux" fragment="true" arch="s390" download-size="0" install-size="0" id="org.eclipse.rcp.source.linux.gtk.s390" version="3.3.1.R33x_r20070802-8y8eE8sEV3Fz0z0GlHJrXvTAUS"/>
 	<plugin ws="motif"  os="linux" fragment="true" arch="x86" download-size="0" install-size="0" id="org.eclipse.rcp.source.linux.motif.x86" version="3.3.1.R33x_r20070802-8y8eE8sEV3Fz0z0GlHJrXvTAUS"/>
+	<plugin ws="gtk"  os="linux" fragment="true" arch="ppc64" download-size="0" install-size="0" id="org.eclipse.rcp.source.linux.gtk.ppc64" version="3.3.0.v20070607-8y8eE8NEbsN3X_fjWS8HPNG"/>
+	<plugin ws="gtk"  os="linux" fragment="true" arch="sparc" download-size="0" install-size="0" id="org.eclipse.rcp.source.linux.gtk.sparc" version="3.3.0.v20070607-8y8eE8NEbsN3X_fjWS8HPNG"/>
+	<plugin ws="gtk"  os="linux" fragment="true" arch="sparc64" download-size="0" install-size="0" id="org.eclipse.rcp.source.linux.gtk.sparc64" version="3.3.0.v20070607-8y8eE8NEbsN3X_fjWS8HPNG"/>
+	<plugin ws="gtk"  os="linux" fragment="true" arch="alpha" download-size="0" install-size="0" id="org.eclipse.rcp.source.linux.gtk.alpha" version="3.3.0.v20070607-8y8eE8NEbsN3X_fjWS8HPNG"/>
 </feature>

eclipse-idreplace.patch:

--- NEW FILE eclipse-idreplace.patch ---
### Eclipse Workspace Patch 1.0
#P org.eclipse.pde.build
Index: src_ant/org/eclipse/pde/internal/build/tasks/IdReplaceTask.java
===================================================================
RCS file: /cvsroot/eclipse/org.eclipse.pde.build/src_ant/org/eclipse/pde/internal/build/tasks/IdReplaceTask.java,v
retrieving revision 1.31.4.2
diff -u -r1.31.4.2 IdReplaceTask.java
--- src_ant/org/eclipse/pde/internal/build/tasks/IdReplaceTask.java	20 Aug 2007 15:02:51 -0000	1.31.4.2
+++ src_ant/org/eclipse/pde/internal/build/tasks/IdReplaceTask.java	2 Oct 2007 18:06:52 -0000
@@ -243,7 +243,7 @@
 			}
 
 			startVersionId++;
-			String replacementVersion = null;
+			String replacementVersion = "";
 			Version v = new Version(new String(versionId));
 			String lookupKey = new String(elementId) + ':' + v.getMajor() + '.' + v.getMinor() + '.' + v.getMicro();
 			if (isPlugin) {
@@ -251,13 +251,14 @@
 			} else {
 				replacementVersion = (String) featureIds.get(lookupKey);
 			}
+			int change = 0;
 			if (replacementVersion == null) {
 				System.err.println("Could not find " + new String(elementId)); //$NON-NLS-1$
 			} else {
 				buffer.replace(startVersionId, endVersionId, replacementVersion);
 				contentChanged = true;
+				change = endVersionId - startVersionId - replacementVersion.length();
 			}
-			int change = endVersionId - startVersionId - replacementVersion.length();
 			startElement = (endElementId > endVersionId) ? endElementId - change: endVersionId - change;
 		}
 

eclipse-add-ppc64-sparc64-s390-s390x.patch:

Index: eclipse-add-ppc64-sparc64-s390-s390x.patch
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse/devel/eclipse-add-ppc64-sparc64-s390-s390x.patch,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- eclipse-add-ppc64-sparc64-s390-s390x.patch	16 Jul 2007 21:35:28 -0000	1.9
+++ eclipse-add-ppc64-sparc64-s390-s390x.patch	22 Oct 2007 14:33:37 -0000	1.10
@@ -1,79 +1,3 @@
-diff -ru eclipse-3.3-src.orig/features/org.eclipse.platform.source/feature.xml eclipse-3.3-src/features/org.eclipse.platform.source/feature.xml
---- eclipse-3.3-src.orig/features/org.eclipse.platform.source/feature.xml	2007-06-25 15:39:41.000000000 -0400
-+++ eclipse-3.3-src/features/org.eclipse.platform.source/feature.xml	2007-07-16 16:08:02.000000000 -0400
-@@ -42,4 +42,7 @@
- 	<plugin ws="motif"  os="solaris" fragment="true" arch="sparc" download-size="0" install-size="0" id="org.eclipse.platform.source.solaris.motif.sparc" version="3.3.0.v20070612-_19UEkLEzwsdF9jSqQ-G"/>
- 	<plugin ws="gtk"  os="linux" fragment="true" arch="s390" download-size="0" install-size="0" id="org.eclipse.platform.source.linux.gtk.s390" version="3.3.0.v20070612-_19UEkLEzwsdF9jSqQ-G"/>
- 	<plugin ws="motif"  os="linux" fragment="true" arch="x86" download-size="0" install-size="0" id="org.eclipse.platform.source.linux.motif.x86" version="3.3.0.v20070612-_19UEkLEzwsdF9jSqQ-G"/>
-+	<plugin ws="gtk"  os="linux" fragment="true" arch="sparc" download-size="0" install-size="0" id="org.eclipse.platform.source.linux.gtk.sparc" version="3.3.0.v20070612-_19UEkLEzwsdF9jSqQ-G"/>
-+	<plugin ws="gtk"  os="linux" fragment="true" arch="sparc64" download-size="0" install-size="0" id="org.eclipse.platform.source.linux.gtk.sparc64" version="3.3.0.v20070612-_19UEkLEzwsdF9jSqQ-G"/>
-+	<plugin ws="gtk"  os="linux" fragment="true" arch="alpha" download-size="0" install-size="0" id="org.eclipse.platform.source.linux.gtk.alpha" version="3.3.0.v20070612-_19UEkLEzwsdF9jSqQ-G"/>
- </feature>
-diff -ru eclipse-3.3-src.orig/features/org.eclipse.rcp/feature.xml eclipse-3.3-src/features/org.eclipse.rcp/feature.xml
---- eclipse-3.3-src.orig/features/org.eclipse.rcp/feature.xml	2007-06-25 15:57:06.000000000 -0400
-+++ eclipse-3.3-src/features/org.eclipse.rcp/feature.xml	2007-07-16 16:10:09.000000000 -0400
-@@ -506,4 +506,48 @@
-          version="0.0.0"
-          fragment="true"
-          unpack="true"/>
-+
-+    <plugin
-+          id="org.eclipse.swt.gtk.linux.ppc64"
-+          os="linux"
-+          ws="gtk"
-+          arch="ppc64"
-+          download-size="0"
-+          install-size="0"
-+          version="0.0.0"
-+          fragment="true"
-+          unpack="false"/>
-+ 
-+    <plugin
-+          id="org.eclipse.swt.gtk.linux.sparc"
-+          os="linux"
-+          ws="gtk"
-+          arch="sparc"
-+          download-size="0"
-+          install-size="0"
-+          version="0.0.0"
-+          fragment="true"
-+          unpack="false"/>
-+ 
-+    <plugin
-+          id="org.eclipse.swt.gtk.linux.sparc64"
-+          os="linux"
-+          ws="gtk"
-+          arch="sparc64"
-+          download-size="0"
-+          install-size="0"
-+          version="0.0.0"
-+          fragment="true"
-+          unpack="false"/>
-+ 
-+    <plugin
-+          id="org.eclipse.swt.gtk.linux.alpha"
-+          os="linux"
-+          ws="gtk"
-+          arch="alpha"
-+          download-size="0"
-+          install-size="0"
-+          version="0.0.0"
-+          fragment="true"
-+          unpack="false"/>
- </feature>
-Only in eclipse-3.3-src/features/org.eclipse.rcp: feature.xml.orig
-diff -ru eclipse-3.3-src.orig/features/org.eclipse.rcp.source/feature.xml eclipse-3.3-src/features/org.eclipse.rcp.source/feature.xml
---- eclipse-3.3-src.orig/features/org.eclipse.rcp.source/feature.xml	2007-06-25 15:39:41.000000000 -0400
-+++ eclipse-3.3-src/features/org.eclipse.rcp.source/feature.xml	2007-07-16 16:08:02.000000000 -0400
-@@ -30,4 +30,8 @@
- 	<plugin ws="motif"  os="solaris" fragment="true" arch="sparc" download-size="0" install-size="0" id="org.eclipse.rcp.source.solaris.motif.sparc" version="3.3.0.v20070607-8y8eE8NEbsN3X_fjWS8HPNG"/>
- 	<plugin ws="gtk"  os="linux" fragment="true" arch="s390" download-size="0" install-size="0" id="org.eclipse.rcp.source.linux.gtk.s390" version="3.3.0.v20070607-8y8eE8NEbsN3X_fjWS8HPNG"/>
- 	<plugin ws="motif"  os="linux" fragment="true" arch="x86" download-size="0" install-size="0" id="org.eclipse.rcp.source.linux.motif.x86" version="3.3.0.v20070607-8y8eE8NEbsN3X_fjWS8HPNG"/>
-+	<plugin ws="gtk"  os="linux" fragment="true" arch="ppc64" download-size="0" install-size="0" id="org.eclipse.rcp.source.linux.gtk.ppc64" version="3.3.0.v20070607-8y8eE8NEbsN3X_fjWS8HPNG"/>
-+	<plugin ws="gtk"  os="linux" fragment="true" arch="sparc" download-size="0" install-size="0" id="org.eclipse.rcp.source.linux.gtk.sparc" version="3.3.0.v20070607-8y8eE8NEbsN3X_fjWS8HPNG"/>
-+	<plugin ws="gtk"  os="linux" fragment="true" arch="sparc64" download-size="0" install-size="0" id="org.eclipse.rcp.source.linux.gtk.sparc64" version="3.3.0.v20070607-8y8eE8NEbsN3X_fjWS8HPNG"/>
-+	<plugin ws="gtk"  os="linux" fragment="true" arch="alpha" download-size="0" install-size="0" id="org.eclipse.rcp.source.linux.gtk.alpha" version="3.3.0.v20070607-8y8eE8NEbsN3X_fjWS8HPNG"/>
- </feature>
 diff -ru eclipse-3.3-src.orig/plugins/org.eclipse.core.runtime/src/org/eclipse/core/internal/runtime/InternalPlatform.java eclipse-3.3-src/plugins/org.eclipse.core.runtime/src/org/eclipse/core/internal/runtime/InternalPlatform.java
 --- eclipse-3.3-src.orig/plugins/org.eclipse.core.runtime/src/org/eclipse/core/internal/runtime/InternalPlatform.java	2007-06-25 15:57:02.000000000 -0400
 +++ eclipse-3.3-src/plugins/org.eclipse.core.runtime/src/org/eclipse/core/internal/runtime/InternalPlatform.java	2007-07-16 16:08:02.000000000 -0400


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse/devel/sources,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -r1.52 -r1.53
--- sources	5 Oct 2007 15:49:05 -0000	1.52
+++ sources	22 Oct 2007 14:33:37 -0000	1.53
@@ -1,4 +1,4 @@
 e1313563c7e36aa46e33789a1386b815  eclipse-fileinitializerapp.tar.bz2
-91c688221479986dbdd7d1a0771f04cc  eclipse-sourceBuild-srcIncluded-3.3.zip
 28c8d625ea1af348cfc592369d52284c  org.fedoraproject.ide.feature-1.0.0.zip
-abd1258d97962ca34007822467f08778  org.fedoraproject.ide.platform-3.3.0.4.zip
+05c2a82e8ececd221a7cc93b6b719e66  org.fedoraproject.ide.platform-3.3.1.2.zip
+764b585d9a05cd518650e31c32899a29  eclipse-sourceBuild-srcIncluded-3.3.1.zip


Index: eclipse.spec
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse/devel/eclipse.spec,v
retrieving revision 1.494
retrieving revision 1.495
diff -u -r1.494 -r1.495
--- eclipse.spec	11 Oct 2007 14:36:55 -0000	1.494
+++ eclipse.spec	22 Oct 2007 14:33:37 -0000	1.495
@@ -6,7 +6,7 @@
 %define eclipse_major   3
 %define eclipse_minor   3
 %define eclipse_majmin  %{eclipse_major}.%{eclipse_minor}
-%define eclipse_micro   0
+%define eclipse_micro   1
 %define libname         libswt3
 
 # All arches line up between Eclipse and Linux kernel names except i386 -> x86
@@ -19,19 +19,19 @@
 Summary:        An open, extensible IDE
 Name:           eclipse
 Version:        %{eclipse_majmin}.%{eclipse_micro}
-Release:        27%{?dist} 
+Release:        1%{?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/R-3.3-200706251500/eclipse-sourceBuild-srcIncluded-3.3.zip
+Source0:        http://download.eclipse.org/eclipse/downloads/drops/R-3.3.1-200709211145/eclipse-sourceBuild-srcIncluded-3.3.1.zip
 Source2:        %{name}.desktop
 Source3:        eclipse.in
 # cvs -d :pserver:anonymous at sources.redhat.com:/cvs/eclipse export \
-#   -r fedoraeclipse-3_3_0-4 branding/org.fedoraproject.ide.platform
+#   -r fedoraeclipse-3_3_1-2 branding/org.fedoraproject.ide.platform
 # cd branding
-# zip -r org.fedoraproject.ide.platform-3.3.0.4.zip \
+# zip -r org.fedoraproject.ide.platform-3.3.1.2.zip \
 #   org.fedoraproject.ide.platform
-Source4:        org.fedoraproject.ide.platform-%{version}.4.zip
+Source4:        org.fedoraproject.ide.platform-%{version}.2.zip
 # cvs -d :pserver:anonymous at sources.redhat.com:/cvs/eclipse export \
 #   -r fedoraeclipsefeature-1_0_0 branding/org.fedoraproject.ide-feature
 # cd branding
@@ -74,6 +74,7 @@
 # Use ecj for gcj
 Patch17:        %{name}-ecj-gcj.patch
 Patch24:        %{name}-add-ppc64-sparc64-s390-s390x.patch
+Patch28:        %{name}-add-ppc64-sparc64-s390-s390x-2.patch
 #https://bugs.eclipse.org/bugs/show_bug.cgi?id=198840
 Patch25: 	%{name}-launcher-double-free-bug.patch
 #FIXME: file a bug upstream
@@ -81,6 +82,10 @@
 # On a 1.7 VM, generate 1.6-level bytecode
 # https://bugzilla.redhat.com/show_bug.cgi?id=288991
 Patch27:        %{name}-17vmgenerate16bytecode.patch
+# FIXME:  this fix will be in 3.3.1.1 so remove when we update to it
+# Without this, the idReplace ant task fails.
+# Courtesy Andrew Niefer
+Patch29:        %{name}-idreplace.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  ant
@@ -98,7 +103,7 @@
 BuildRequires:  mesa-libGLU-devel
 BuildRequires:  cairo >= 1.0
 BuildRequires:  unzip
-BuildRequires:  icu4j-eclipse >= 3.6.1
+BuildRequires:  icu4j-eclipse >= 3.6.1-1jpp.4
 BuildRequires:  tomcat5-jasper-eclipse >= 5.5.17
 BuildRequires:  desktop-file-utils
 %if %{gcj_support}
@@ -177,10 +182,10 @@
 Group:          Development/Languages
 Requires:       %{libname}-gtk2 = %{epoch}:%{version}-%{release}
 # This file-level requirement is for the bi-arch multilib case
-Requires: %{_libdir}/%{name}/plugins/org.eclipse.swt.gtk.linux.%{eclipse_arch}_3.3.0.v3346.jar
+Requires: %{_libdir}/%{name}/plugins/org.eclipse.swt.gtk.linux.%{eclipse_arch}_3.3.1.v3346i.jar
 Requires(post):     %{libname}-gtk2 = %{epoch}:%{version}-%{release}
 Requires(postun):   %{libname}-gtk2 = %{epoch}:%{version}-%{release}
-Requires:           icu4j-eclipse >= 3.6.1
+Requires:           icu4j-eclipse >= 3.6.1-1jpp.4
 %if %{gcj_support}
 Requires:           libgcj >= 4.0.2
 Requires(post):     java-gcj-compat >= 1.0.64
@@ -211,7 +216,7 @@
 %endif
 Requires:   %{name}-rcp = %{epoch}:%{version}-%{release}
 # This file-level requirement is for the bi-arch multilib case
-Requires: %{_libdir}/%{name}/plugins/org.eclipse.swt.gtk.linux.%{eclipse_arch}_3.3.0.v3346.jar
+Requires: %{_libdir}/%{name}/plugins/org.eclipse.swt.gtk.linux.%{eclipse_arch}_3.3.1.v3346i.jar
 Requires(post):    %{name}-rcp = %{epoch}:%{version}-%{release}
 Requires(postun):  %{name}-rcp = %{epoch}:%{version}-%{release}
 # Need to investigate why we don't build ant-apache-bsf or ant-commons-net in
@@ -379,6 +384,7 @@
 pushd plugins/org.eclipse.pde.build
 %patch15
 sed --in-place "s:/usr/share/eclipse:%{_datadir}/%{name}:" templates/package-build/build.properties
+%patch29
 popd
 
 # FIXME this should be patched upstream with a flag to turn on and off 
@@ -528,6 +534,7 @@
 
 ## Nasty hack to get suppport for ppc64, sparc{,64} and alpha
 %patch24 -p1
+%patch28
 # there is only partial support for ppc64 so we have to remove this 
 # partial support to get the replacemnt hack to work
 find -name \*ppc64\* | xargs rm -r
@@ -553,7 +560,7 @@
 for plugin in jdt.apt.pluggable.core jdt.compiler.tool jdt.compiler.apt; do
   version=$(grep org.eclipse.$plugin plugins/org.eclipse.$plugin/build.xml | grep condition.property | cut -d _ -f 2-3 | cut -d \" -f 1)
   sed --in-place "s/org.eclipse.$plugin:0.0.0,$version,//" features/org.eclipse.jdt/build.xml
-  linenum=$(grep -no $plugin features/org.eclipse.jdt/build.xml | cut -d : -f 1)
+  linenum=$(grep -no "plugins/org.eclipse.$plugin" features/org.eclipse.jdt/build.xml | cut -d : -f 1)
   sed --in-place -e "$linenum,$(expr $linenum + 4)d" features/org.eclipse.jdt/build.xml
 # If we're build with IcedTea then we don't want to remove the plugins from the
 # feature.xml because we will build these plugins after the main build. This
@@ -574,8 +581,8 @@
 ln -s %{_javadir}/jsch.jar plugins/com.jcraft.jsch_0.1.31.jar
 
 # 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
+rm plugins/com.ibm.icu_3.6.1.v20070906.jar
+ln -s %{_datadir}/eclipse/plugins/com.ibm.icu_3.6.1.v20070906.jar plugins/com.ibm.icu_3.6.1.v20070906.jar
 
 # link to lucene
 rm plugins/org.apache.lucene_1.9.1.v200706111724.jar
@@ -740,7 +747,7 @@
 
 # Explode the resulting SDK tarball
 tar -C $RPM_BUILD_ROOT%{_datadir} -zxf result/linux-gtk-%{eclipse_arch}-sdk.tar.gz
-cp launchertmp/eclipse $RPM_BUILD_ROOT%{_datadir}/eclipse
+cp eclipse/eclipse $RPM_BUILD_ROOT%{_datadir}/eclipse
 %ifarch ppc64 sparc sparc64 alpha
 cp features/org.eclipse.platform/gtk/eclipse.ini $RPM_BUILD_ROOT%{_datadir}/eclipse
 %endif
@@ -847,11 +854,6 @@
 sed --in-place "s/eclipse.product=org.eclipse.sdk.ide/eclipse.product=org.fedoraproject.ide.platform.product/" \
   $RPM_BUILD_ROOT%{_libdir}/%{name}/configuration/config.ini
 
-# Install the launcher so
-LAUNCHERFRAGVERSION=$(ls $RPM_BUILD_ROOT%{_libdir}/%{name}/plugins | grep equinox.launcher.gtk.linux.%{eclipse_arch}_ | sed "s/.*equinox.launcher.gtk.linux.*_//")
-cp launchertmp/library/gtk/eclipse_*.so \
-$RPM_BUILD_ROOT%{_libdir}/%{name}/plugins/org.eclipse.equinox.launcher.gtk.linux.%{eclipse_arch}_$LAUNCHERFRAGVERSION
-
 # Install the Eclipse binary wrapper
 mv $RPM_BUILD_ROOT%{_datadir}/%{name}/eclipse $RPM_BUILD_ROOT%{_libdir}/%{name}
 install -d -m 755 $RPM_BUILD_ROOT%{_bindir}
@@ -1055,7 +1057,7 @@
 ln -s %{_javadir}/jsch.jar plugins/com.jcraft.jsch_0.1.31.jar
 
 # link to the icu4j stuff
-rm plugins/com.ibm.icu_3.6.1.v20070417.jar
+rm plugins/com.ibm.icu_3.6.1.v20070906.jar
 
 # link to lucene
 rm plugins/org.apache.lucene_1.9.1.v200706111724.jar
@@ -1578,6 +1580,10 @@
 %endif
 
 %changelog
+* Mon Oct 22 2007 Andrew Overholt <overholt at redhat.com> 3.3.1-1
+- 3.3.1
+- Update icu4j requirement for new version number.
+
 * Thu Oct 11 2007 Andrew Overholt <overholt at redhat.com> 3.3.0-27
 - Add patch to have unversioned swt.jar symlink (courtesy Patrice
   Dumas).


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse/devel/.cvsignore,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- .cvsignore	5 Oct 2007 15:49:05 -0000	1.40
+++ .cvsignore	22 Oct 2007 14:33:37 -0000	1.41
@@ -1,4 +1,4 @@
 eclipse-fileinitializerapp.tar.bz2
-eclipse-sourceBuild-srcIncluded-3.3.zip
 org.fedoraproject.ide.feature-1.0.0.zip
-org.fedoraproject.ide.platform-3.3.0.4.zip
+org.fedoraproject.ide.platform-3.3.1.2.zip
+eclipse-sourceBuild-srcIncluded-3.3.1.zip




More information about the fedora-extras-commits mailing list