rpms/eclipse/F-8 .cvsignore, 1.42, 1.43 eclipse-add-ppc64-sparc64-s390-s390x-2.patch, 1.1, 1.2 eclipse-addfragmentsforotherplatforms.patch, 1.1, 1.2 eclipse.spec, 1.499, 1.500 sources, 1.54, 1.55

Andrew Overholt (overholt) fedora-extras-commits at redhat.com
Wed Dec 19 14:58:55 UTC 2007


Author: overholt

Update of /cvs/pkgs/rpms/eclipse/F-8
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13036

Modified Files:
	.cvsignore eclipse-add-ppc64-sparc64-s390-s390x-2.patch 
	eclipse-addfragmentsforotherplatforms.patch eclipse.spec 
	sources 
Log Message:
* Tue Dec 18 2007 Andrew Overholt <overholt at redhat.com> 3.3.0-31
- Apply 3.3.1.1 changes to 3.3.30 so we can do an F-8 update:
- Remove Fedora log from splash screen.
- Fix PermSize option (thanks to Mary Ellen Foster for testing).
- Require jpackage-utils (courtesy Patrice Dumas).
- Fix ppc64 (and hopefully other unsupported-by-upstream arches).
- Move eclipse.ini to %{_libdir}/eclipse where it gets read.
- Resolves:  rhbz#394161.
- Update tomcat patches.
- Resolves:  rhbz#380121.
- Update branding.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse/F-8/.cvsignore,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- .cvsignore	4 Dec 2007 16:16:15 -0000	1.42
+++ .cvsignore	19 Dec 2007 14:58:17 -0000	1.43
@@ -1,4 +1,4 @@
 eclipse-fileinitializerapp.tar.bz2
+eclipse-sourceBuild-srcIncluded-3.3.zip
 org.fedoraproject.ide.feature-1.0.0.zip
-eclipse-sourceBuild-srcIncluded-3.3.1.1.zip
-org.fedoraproject.ide.platform-3.3.1.1-3.zip
+org.fedoraproject.ide.platform-3.3.0-5.zip

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

Index: eclipse-add-ppc64-sparc64-s390-s390x-2.patch
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse/F-8/eclipse-add-ppc64-sparc64-s390-s390x-2.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- eclipse-add-ppc64-sparc64-s390-s390x-2.patch	3 Dec 2007 19:14:12 -0000	1.1
+++ eclipse-add-ppc64-sparc64-s390-s390x-2.patch	19 Dec 2007 14:58:17 -0000	1.2
@@ -1,75 +1,76 @@
-diff -uNr features/org.eclipse.platform.source/feature.xml features/org.eclipse.platform.source/feature.xml
---- features/org.eclipse.platform.source/feature.xml	2007-10-31 11:14:44.000000000 -0400
-+++ features/org.eclipse.platform.source/feature.xml	2007-10-31 11:16:06.000000000 -0400
+diff -ur features/org.eclipse.platform.source/feature.xml features/org.eclipse.platform.source/feature.xml
+--- features/org.eclipse.platform.source/feature.xml	2007-12-18 15:15:44.000000000 -0500
++++ features/org.eclipse.platform.source/feature.xml	2007-12-18 15:21:39.000000000 -0500
 @@ -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.2.R33x_v20071022-_19UEksF-G8Yc6bUv3Dz"/>
- 	<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.2.R33x_v20071022-_19UEksF-G8Yc6bUv3Dz"/>
- 	<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.2.R33x_v20071022-_19UEksF-G8Yc6bUv3Dz"/>
-+	<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.2.R33x_v20071022-_19UEksF-G8Yc6bUv3Dz"/>
-+	<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.2.R33x_v20071022-_19UEksF-G8Yc6bUv3Dz"/>
-+	<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.2.R33x_v20071022-_19UEksF-G8Yc6bUv3Dz"/>
+ 	<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 -uNr features/org.eclipse.rcp/feature.xml features/org.eclipse.rcp/feature.xml
---- features/org.eclipse.rcp/feature.xml	2007-10-31 11:18:13.000000000 -0400
-+++ features/org.eclipse.rcp/feature.xml	2007-10-31 11:14:44.000000000 -0400
-@@ -499,4 +499,48 @@
+diff -ur features/org.eclipse.rcp/feature.xml features/org.eclipse.rcp/feature.xml
+--- features/org.eclipse.rcp/feature.xml	2007-12-18 15:15:44.000000000 -0500
++++ features/org.eclipse.rcp/feature.xml	2007-12-18 15:19:27.000000000 -0500
+@@ -506,4 +506,49 @@
           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"/>
+          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>
-diff -uNr features/org.eclipse.rcp.source/feature.xml features/org.eclipse.rcp.source/feature.xml
---- features/org.eclipse.rcp.source/feature.xml	2007-10-31 11:14:44.000000000 -0400
-+++ features/org.eclipse.rcp.source/feature.xml	2007-10-31 11:17:45.000000000 -0400
+diff -ur features/org.eclipse.rcp.source/feature.xml features/org.eclipse.rcp.source/feature.xml
+--- features/org.eclipse.rcp.source/feature.xml	2007-12-18 15:15:44.000000000 -0500
++++ features/org.eclipse.rcp.source/feature.xml	2007-12-18 15:23:21.000000000 -0500
 @@ -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.2.R33x_r20071022-8y8eE9CEV3FspP8HJrY1M2dS"/>
- 	<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.2.R33x_r20071022-8y8eE9CEV3FspP8HJrY1M2dS"/>
- 	<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.2.R33x_r20071022-8y8eE9CEV3FspP8HJrY1M2dS"/>
-+	<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.2.R33x_r20071022-8y8eE9CEV3FspP8HJrY1M2dS"/>
-+	<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.2.R33x_r20071022-8y8eE9CEV3FspP8HJrY1M2dS"/>
-+	<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.2.R33x_r20071022-8y8eE9CEV3FspP8HJrY1M2dS"/>
-+	<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.2.R33x_r20071022-8y8eE9CEV3FspP8HJrY1M2dS"/>
+ 	<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>

eclipse-addfragmentsforotherplatforms.patch:

Index: eclipse-addfragmentsforotherplatforms.patch
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse/F-8/eclipse-addfragmentsforotherplatforms.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- eclipse-addfragmentsforotherplatforms.patch	3 Dec 2007 19:14:12 -0000	1.1
+++ eclipse-addfragmentsforotherplatforms.patch	19 Dec 2007 14:58:17 -0000	1.2
@@ -1,17 +1,17 @@
---- assemble.org.eclipse.sdk.linux.gtk.ia64.xml	2007-11-21 13:50:10.000000000 -0500
-+++ assemble.org.eclipse.sdk.linux.gtk.ia64.xml	2007-11-21 13:51:56.000000000 -0500
-@@ -122,6 +122,9 @@
+--- assemble.org.eclipse.sdk.linux.gtk.ia64.xml.orig	2007-12-19 09:53:43.000000000 -0500
++++ assemble.org.eclipse.sdk.linux.gtk.ia64.xml	2007-12-19 09:55:13.000000000 -0500
+@@ -65,6 +65,9 @@
  		<ant antfile="build.xml" dir="plugins/org.eclipse.pde.core" target="gather.bin.parts">
  			<property name="destination.temp.folder" value="${eclipse.plugins}"/>
  		</ant>
 +		<ant antfile="build.xml" dir="plugins/org.eclipse.equinox.launcher.gtk.linux.ia64" target="gather.bin.parts">
 +			<property name="destination.temp.folder" value="${eclipse.plugins}"/>
 +		</ant>
- 		<ant antfile="build.xml" dir="plugins/org.eclipse.update.core" target="gather.bin.parts">
+ 		<ant antfile="build.xml" dir="plugins/org.eclipse.jdt" target="gather.bin.parts">
  			<property name="destination.temp.folder" value="${eclipse.plugins}"/>
  		</ant>
-@@ -281,6 +284,9 @@
- 		<ant antfile="build.xml" dir="plugins/org.eclipse.jdt.doc.user" target="gather.bin.parts">
+@@ -278,6 +281,9 @@
+ 		<ant antfile="build.xml" dir="plugins/org.eclipse.pde.runtime" target="gather.bin.parts">
  			<property name="destination.temp.folder" value="${eclipse.plugins}"/>
  		</ant>
 +		<ant antfile="build.xml" dir="plugins/org.eclipse.core.filesystem.linux.ia64" target="gather.bin.parts">
@@ -20,7 +20,7 @@
  		<ant antfile="build.xml" dir="plugins/org.eclipse.ui.console" target="gather.bin.parts">
  			<property name="destination.temp.folder" value="${eclipse.plugins}"/>
  		</ant>
-@@ -732,6 +738,10 @@
+@@ -740,6 +746,10 @@
  		</antcall>
  		<antcall target="jarUp">
  			<param name="source" value="${eclipse.plugins}"/>
@@ -28,6 +28,6 @@
 +		</antcall>
 +		<antcall target="jarUp">
 +			<param name="source" value="${eclipse.plugins}"/>
- 			<param name="elementName" value="org.eclipse.ui.console_3.2.1.v20070824_r331"/>
+ 			<param name="elementName" value="org.eclipse.ui.console_3.2.0.v20070530"/>
  		</antcall>
  		<antcall target="jarUp">


Index: eclipse.spec
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse/F-8/eclipse.spec,v
retrieving revision 1.499
retrieving revision 1.500
diff -u -r1.499 -r1.500
--- eclipse.spec	4 Dec 2007 16:16:15 -0000	1.499
+++ eclipse.spec	19 Dec 2007 14:58:17 -0000	1.500
@@ -6,7 +6,7 @@
 %define eclipse_major   3
 %define eclipse_minor   3
 %define eclipse_majmin  %{eclipse_major}.%{eclipse_minor}
-%define eclipse_micro   1.1
+%define eclipse_micro   0
 %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:        13%{?dist} 
+Release:        31%{?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.1.1-200710231652/eclipse-sourceBuild-srcIncluded-3.3.1.1.zip
+Source0:        http://download.eclipse.org/eclipse/downloads/drops/R-3.3-200706251500/eclipse-sourceBuild-srcIncluded-3.3.zip
 Source2:        %{name}.desktop
 Source3:        eclipse.in
 # cvs -d :pserver:anonymous at sources.redhat.com:/cvs/eclipse export \
-#   -r fedoraeclipse-3_3_1_1-3 branding/org.fedoraproject.ide.platform
+#   -r fedoraeclipse-3_3_0-5 branding/org.fedoraproject.ide.platform
 # cd branding
-# zip -r org.fedoraproject.ide.platform-3.3.1.1-3.zip \
+# zip -r org.fedoraproject.ide.platform-3.3.0-5.zip \
 #   org.fedoraproject.ide.platform
-Source4:        org.fedoraproject.ide.platform-%{version}-3.zip
+Source4:        org.fedoraproject.ide.platform-%{version}-5.zip
 # cvs -d :pserver:anonymous at sources.redhat.com:/cvs/eclipse export \
 #   -r fedoraeclipsefeature-1_0_0 branding/org.fedoraproject.ide-feature
 # cd branding
@@ -102,7 +102,7 @@
 BuildRequires:  mesa-libGLU-devel
 BuildRequires:  cairo >= 1.0
 BuildRequires:  unzip
-BuildRequires:  icu4j-eclipse >= 3.6.1-1jpp.4
+BuildRequires:  icu4j-eclipse >= 3.6.1
 BuildRequires:  tomcat5-jasper-eclipse >= 5.5.17
 BuildRequires:  desktop-file-utils
 %if %{gcj_support}
@@ -184,10 +184,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.2.v3347.jar
+Requires: %{_libdir}/%{name}/plugins/org.eclipse.swt.gtk.linux.%{eclipse_arch}_3.3.0.v3346.jar
 Requires(post):     %{libname}-gtk2 = %{epoch}:%{version}-%{release}
 Requires(postun):   %{libname}-gtk2 = %{epoch}:%{version}-%{release}
-Requires:           icu4j-eclipse >= 3.6.1-1jpp.4
+Requires:           icu4j-eclipse >= 3.6.1
 %if %{gcj_support}
 Requires:           libgcj >= 4.0.2
 Requires(post):     java-gcj-compat >= 1.0.64
@@ -218,7 +218,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.2.v3347.jar
+Requires: %{_libdir}/%{name}/plugins/org.eclipse.swt.gtk.linux.%{eclipse_arch}_3.3.0.v3346.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
@@ -604,8 +604,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.v20070906.jar
-ln -s %{_datadir}/eclipse/plugins/com.ibm.icu_3.6.1.v20070906.jar plugins/com.ibm.icu_3.6.1.v20070906.jar
+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
 
 # link to lucene
 rm plugins/org.apache.lucene_1.9.1.v200706111724.jar
@@ -770,7 +770,7 @@
 
 # Explode the resulting SDK tarball
 tar -C $RPM_BUILD_ROOT%{_datadir} -zxf result/linux-gtk-%{eclipse_arch}-sdk.tar.gz
-cp eclipse/eclipse $RPM_BUILD_ROOT%{_datadir}/eclipse
+cp launchertmp/eclipse $RPM_BUILD_ROOT%{_datadir}/eclipse
 %ifarch ppc64 sparc sparc64 alpha
 cp features/org.eclipse.platform/gtk/eclipse.ini $RPM_BUILD_ROOT%{_libdir}/eclipse
 %else
@@ -880,6 +880,11 @@
 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}
@@ -1091,7 +1096,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.v20070906.jar
+rm plugins/com.ibm.icu_3.6.1.v20070417.jar
 
 # link to lucene
 rm plugins/org.apache.lucene_1.9.1.v200706111724.jar
@@ -1612,50 +1617,17 @@
 %endif
 
 %changelog
-* Tue Dec 04 2007 Andrew Overholt <overholt at redhat.com> 3.3.1.1-13
+* Tue Dec 18 2007 Andrew Overholt <overholt at redhat.com> 3.3.0-31
+- Apply 3.3.1.1 changes to 3.3.30 so we can do an F-8 update:
 - Remove Fedora log from splash screen.
-
-* Mon Dec 03 2007 Andrew Overholt <overholt at redhat.com> 3.3.1.1-12
-- Update splash screen.
-- Merge with rawhide.
-
-* Fri Nov 30 2007 Andrew Overholt <overholt at redhat.com> 3.3.1.1-11
 - Fix PermSize option (thanks to Mary Ellen Foster for testing).
-
-* Fri Nov 23 2007 Andrew Overholt <overholt at redhat.com> 3.3.1.1-10
-- Move eclipse.ini for real.
-
-* Fri Nov 23 2007 Andrew Overholt <overholt at redhat.com> 3.3.1.1-9
-- Move eclipse.ini in %%files section.
-
-* Thu Nov 22 2007 Andrew Overholt <overholt at redhat.com> 3.3.1.1-8
-- Re-enable gcj_support.
-
-* Thu Nov 22 2007 Andrew Overholt <overholt at redhat.com> 3.3.1.1-7
-- Un-break non-ppc64 platforms.
-
-* Mon Nov 19 2007 Andrew Overholt <overholt at redhat.com> 3.3.1.1-6
 - Require jpackage-utils (courtesy Patrice Dumas).
 - Fix ppc64 (and hopefully other unsupported-by-upstream arches).
 - Move eclipse.ini to %%{_libdir}/eclipse where it gets read.
 - Resolves:  rhbz#394161.
-
-* Fri Nov 16 2007 Andrew Overholt <overholt at redhat.com> 3.3.1.1-5
-- Remove extraneous build.index comment (from test build again).
-
-* Fri Nov 16 2007 Andrew Overholt <overholt at redhat.com> 3.3.1.1-4
-- Enable gcj support (disabled for test build).
-
-* Fri Nov 16 2007 Andrew Overholt <overholt at redhat.com> 3.3.1.1-3
 - Update tomcat patches.
 - Resolves:  rhbz#380121.
-
-* Wed Nov 14 2007 Andrew Overholt <overholt at redhat.com> 3.3.1.1-2
-- Bump release to tag non-corrupted source zip.
-
-* Thu Nov 01 2007 Andrew Overholt <overholt at redhat.com> 3.3.1.1-1
 - Update branding.
-- Work around e.o#195897 by setting the VM arg explicitly.
 
 * Tue Oct 30 2007 Andrew Overholt <overholt at redhat.com> 3.3.0-30
 - Actually apply permgen patch.  Ugh.
@@ -1667,14 +1639,6 @@
 * Mon Oct 29 2007 Andrew Overholt <overholt at redhat.com> 3.3.0-28
 - Add patch for memory issues with IcedTea.
 
-* Fri Oct 26 2007 Andrew Overholt <overholt at redhat.com> 3.3.1.1-1
-- 3.3.1.1
-- Add patch for memory issues with IcedTea.
-
-* 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: sources
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse/F-8/sources,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -r1.54 -r1.55
--- sources	4 Dec 2007 16:16:15 -0000	1.54
+++ sources	19 Dec 2007 14:58:17 -0000	1.55
@@ -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
-593b56fce7d1f1f799e87365cafefbef  eclipse-sourceBuild-srcIncluded-3.3.1.1.zip
-fbb918b95640b17d7225eddbd75564f0  org.fedoraproject.ide.platform-3.3.1.1-3.zip
+a80c061f010ef8b816fcfd8802068f62  org.fedoraproject.ide.platform-3.3.0-5.zip




More information about the fedora-extras-commits mailing list