Tue Oct 13 12:27:55 UTC 2009

Author: akurtakov

Update of /cvs/pkgs/rpms/eclipse/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18949/F-12

Modified Files:
	sources .cvsignore eclipse.spec 
	eclipse-addusrsharedropins.patch 
Removed Files:
	eclipse-fix-javahome64.patch ecf-filetransfer-build.properties 
	eclipse-help-toolbar.patch eclipse-pdebuild.sh 
	eclipse-addrootfiles.patch 
	eclipse-addfragmentsforotherplatforms.patch 
	eclipse-launcher-fix-java-home.patch fetch-ecf.sh 
	eclipse-jdt_launch-customBuild.patch 
	eclipse-swt-xulrunner191.patch 
	eclipse-dontpackicu4jsource.patch 
	eclipse-pde.build-add-package-build.patch 
	eclipse-copy-platform.sh eclipse-compilelibs.patch 
	eclipse-config.ini.director eclipse-ia64-packaging.patch 
	eclipse-osgi-classpath.patch eclipse-platform_build.patch 
	ecf-filetransfer-feature.xml 
	eclipse-swt-buildagainstxulrunner.patch 
	eclipse-ecf-qualifier.patch eclipse-nojarsignatures.patch 
	eclipse.desktop eclipse-buildswtnatives.patch 
	eclipse-memorypermsizeandjvmcrash.patch 
Log Message:
- Update to 3.5.1.
- Fixes crash issue with gtk 2.18.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse/F-12/sources,v
retrieving revision 1.81
retrieving revision 1.82
diff -u -p -r1.81 -r1.82

--- sources	21 Sep 2009 08:42:18 -0000	1.81
+++ sources	13 Oct 2009 12:27:54 -0000	1.82
@@ -1,3 +1,2 @@
-72a590190a4fea7a4f8885bfe26a3e18  eclipse-I20090611-1540-fetched-src.tar.bz2
-a3504fedff088a6e58a39d43fff4d47e  eclipse-build-R0_3_0.tar.gz
-d9b5bdc848ded1c2f1f62da94b9c70a0  ecf-filetransfer-v20090604-1131.tar.bz2
+3ed7a1c9c13a73f6d7abc0b0305631e3  eclipse-R3_5_1-fetched-src.tar.bz2
+4b283c975b7c7b2894ef4de040f6b9c4  eclipse-build-0.4.0RC0.tar.gz


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse/F-12/.cvsignore,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -p -r1.62 -r1.63
--- .cvsignore	18 Sep 2009 13:41:44 -0000	1.62
+++ .cvsignore	13 Oct 2009 12:27:54 -0000	1.63
@@ -3,3 +3,5 @@ eclipse-ecj-gcj.tar.bz2
 eclipse-I20090611-1540-fetched-src.tar.bz2
 eclipse-build-R0_3_0.tar.gz
 ecf-filetransfer-v20090604-1131.tar.bz2
+eclipse-R3_5_1-fetched-src.tar.bz2
+eclipse-build-0.4.0RC0.tar.gz


Index: eclipse.spec
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse/F-12/eclipse.spec,v
retrieving revision 1.668
retrieving revision 1.669
diff -u -p -r1.668 -r1.669
--- eclipse.spec	23 Sep 2009 19:53:01 -0000	1.668
+++ eclipse.spec	13 Oct 2009 12:27:54 -0000	1.669
@@ -9,8 +9,7 @@ Epoch:  1
 %define eclipse_major   3
 %define eclipse_minor   5
 %define eclipse_majmin  %{eclipse_major}.%{eclipse_minor}
-%define eclipse_micro   0
-%define swtver          3.5.0.v3550
+%define eclipse_micro   1
 %define initialize      1
 %global download_url    http://download.eclipse.org/technology/linuxtools/eclipse-build/
 
@@ -30,116 +29,28 @@ Epoch:  1
 Summary:        An open, extensible IDE
 Name:           eclipse
 Version:        %{eclipse_majmin}.%{eclipse_micro}
-Release:        2%{?dist}
+Release:        1%{?dist}
 License:        EPL
 Group:          Text Editors/Integrated Development Environments (IDE)
 URL:            http://www.eclipse.org/
-Source0:        %{download_url}eclipse-build-R0_3_0.tar.gz
-Source1:        %{download_url}eclipse-I20090611-1540-fetched-src.tar.bz2
-Source2:        %{name}.desktop
-Source16:       %{name}-copy-platform.sh
+Source0:        %{download_url}eclipse-build-0.4.0RC0.tar.gz
+Source1:        %{download_url}eclipse-R3_5_1-fetched-src.tar.bz2
 Source17:       efj.sh.in
 # This file contains the types of files we'd like to extract from the jars
 # when using the FileInitializer
 Source19:       %{name}-filenamepatterns.txt
-# Script to wrap PDE Build calls for bundle builds
-Source21:       %{name}-pdebuild.sh
-# config.ini to run the director for provisioning the installation
-Source22:       %{name}-config.ini.director
-Source24:       fetch-ecf.sh
-# This was fetched using the above script.
-# We will eventually have an eclipse-ecf package but since the ECF
-# filetransfer bits that are part of the SDK actually require the SDK >=
-# 3.4 to build, I'm going to build them here and have them be owned by
-# the SDK packages for now. -- overholt, 2008-07-07
-Source25:       ecf-filetransfer-v20090604-1131.tar.bz2
-# Create a simple feature for building ECF's filetransfer plugins
-Source26:       ecf-filetransfer-feature.xml
-Source27:       ecf-filetransfer-build.properties
 # This script copies the platform sub-set of the SDK for generating metadata
 Source28:       %{name}-mv-Platform.sh
 
-# Build swttools.jar before generation on 64-bit platforms.
-# Build SWT native libraries
-# https://bugs.eclipse.org/bugs/show_bug.cgi?id=90364
-# https://bugs.eclipse.org/bugs/show_bug.cgi?id=221908
-# https://bugs.eclipse.org/bugs/attachment.cgi?id=105593
-Patch4:         %{name}-buildswtnatives.patch
-Patch32:        %{name}-compilelibs.patch
-
-# This does two things:
-# 1. allows the launcher to be in /usr/bin and
-# 2. ensures that the OSGi configuration directory
-#    (which contains the JNI .sos) is in %{_libdir}
-# We should investigate whether or not this can go upstream
-#Patch12:        %{name}-launcher-set-install-dir-and-shared-config.patch
-# generic releng plugins that can be used to build plugins
-# see this thread for details:
-# https://www.redhat.com/archives/fedora-devel-java-list/2006-April/msg00048.html
-Patch15:        %{name}-pde.build-add-package-build.patch
-Patch24:        %{name}-add-ppc64-sparc64-s390-s390x.patch
-Patch28:        %{name}-add-ppc64-sparc64-s390-s390x-2.patch
-Patch30:        %{name}-addfragmentsforotherplatforms.patch
-Patch38:        %{name}-addrootfiles.patch
-#FIXME: file a bug upstream
-Patch26:        %{name}-launcher-fix-java-home.patch
-# Default max heap size too low for lots of people.  Bump to 512 MB.
-# Max perm size:
-# https://bugzilla.redhat.com/show_bug.cgi?id=352361
-# JVM crash:
-# http://bugs.sun.com/bugdatabase/view_bug.do?bug_id=6614100
-# https://bugs.eclipse.org/bugs/show_bug.cgi?id=214092
-# https://bugzilla.redhat.com/show_bug.cgi?id=461860 (mnowak)
-Patch29:        %{name}-memorypermsizeandjvmcrash.patch
-
-Patch31:	%{name}-ia64-packaging.patch
-
-# Make ECF bundles have the same qualifier as they do upstream
-Patch35:	%{name}-ecf-qualifier.patch
-
-# Don't pack the icu4j source bundle.  Can go away when we re-build
-# icu4j against a 3.4 SDK.
-Patch36:	%{name}-dontpackicu4jsource.patch
-
-# Our dependent JARs have different signatures than the ones included
-# upstream so remove the signatures in the manifests
-Patch37:	%{name}-nojarsignatures.patch
-
-## Back-port patches from 3.4.x stream.  These will be in 3.4.1.
-## https://bugs.eclipse.org/bugs/show_bug.cgi?id=242632
-#Patch39:        %{name}-profilesync-e.o242632.patch
-#Patch40:        %{name}-profilesync-e.o242632-2.patch
-
-Patch43:		%{name}-osgi-classpath.patch
-Patch44:		%{name}-fix-javahome64.patch
-
-# TODO fix customBuildCallback
-Patch47:        %{name}-jdt_launch-customBuild.patch
-
-# Since we're building against XULRunner, build using XR flags
-# https://bugs.eclipse.org/226356
-# https://bugs.eclipse.org/bugs/attachment.cgi?id=131059
-# At present, libxul.pc contains -lxpcomglue_s.  Chris Aillon and myself think
-# it should perhaps be -lxpcomglue.  This patch uses that instead but will
-# be replaced with the former when libxul.pc is fixed.
-# https://bugs.eclipse.org/bugs/attachment.cgi?id=131060
-Patch48:        %{name}-swt-buildagainstxulrunner.patch
+Patch0:        %{name}-add-ppc64-sparc64-s390-s390x.patch
+Patch1:        %{name}-add-ppc64-sparc64-s390-s390x-2.patch
 
-Patch49:        %{name}-add-ppc64-filesystem.patch
+Patch2:        %{name}-add-ppc64-filesystem.patch
 
 # Make sure the shipped target platform templates are looking in the
 # correct location for source bundles (see RHBZ # 521969). This does not
 # need to go upstream.
-Patch50:        %{name}-target-platform-template.patch
-
-# Add /usr/share/eclipse/dropins to list of dropins locations
-# Already applied in eclipse-build upstream rev. #23023
-Patch51:        %{name}-addusrsharedropins.patch
-
-#Fix for help toolbar jsp compile error.
-#See https://bugs.eclipse.org/bugs/show_bug.cgi?id=290064
-#Already added to eclipse-build.
-Patch52:        %{name}-help-toolbar.patch
+Patch3:        %{name}-target-platform-template.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  ant
@@ -210,9 +121,6 @@ SWT Library for GTK+-2.0.
 Summary:        Eclipse Rich Client Platform
 Group:          Development/Languages
 Requires:       %{name}-swt = %{epoch}:%{version}-%{release}
-# FIXME:  investigate.  Can we just add a %{arch} to the above?
-## This file-level requirement is for the bi-arch multilib case
-#Requires: %{_libdir}/%{name}/plugins/org.eclipse.swt.gtk.linux.%{eclipse_arch}_%{swtver}.jar
 Requires:       icu4j-eclipse >= 1:4.0.1-3
 Requires:       java >= 1.6.0
 
@@ -223,9 +131,6 @@ Eclipse Rich Client Platform
 Summary:        Eclipse platform common files
 Group:          Text Editors/Integrated Development Environments (IDE)
 Requires:   %{name}-rcp = %{epoch}:%{version}-%{release}
-# FIXME:  investigate.  Can we just add a %{arch} to the above?
-## This file-level requirement is for the bi-arch multilib case
-#Requires: %{_libdir}/%{name}/plugins/org.eclipse.swt.gtk.linux.%{eclipse_arch}_%{swtver}.jar
 Requires: ant-antlr ant-apache-bcel ant-apache-log4j ant-apache-oro ant-apache-regexp ant-apache-resolver ant-commons-logging ant-apache-bsf ant-commons-net
 Requires: ant-javamail ant-jdepend ant-junit ant-nodeps ant-swing ant-trax ant-jsch
 Requires: jakarta-commons-beanutils jakarta-commons-collections jakarta-commons-digester jakarta-commons-dbcp jakarta-commons-fileupload jakarta-commons-launcher jakarta-commons-modeler jakarta-commons-pool
@@ -266,8 +171,8 @@ developing software written in the Java 
 %package        pde
 Summary:        Eclipse Plugin Development Environment
 Group:          Text Editors/Integrated Development Environments (IDE)
-Provides:	eclipse
-Provides:	eclipse-sdk
+Provides:   eclipse
+Provides:   eclipse-sdk
 Requires:       %{name}-platform = %{epoch}:%{version}-%{release}
 Requires:       %{name}-jdt = %{epoch}:%{version}-%{release}
 Requires:       objectweb-asm
@@ -284,38 +189,10 @@ Eclipse Plugin Development Environment. 
 developing Eclipse plugins.
 
 %prep
-%setup -q -n eclipse-build-R0_3_0
+%setup -q -n eclipse-build-0.4.0RC0
 cp %{SOURCE1} .
-sed --in-place "s/<target name=\"build\" depends=\"applyPatches,bootstrap,compilelibs\">/<target name=\"build\" depends=\"bootstrap,compilelibs\">/" build.xml
-ant -DbuildId=I20090611-1540 applyPatches
-pushd build/eclipse-I20090611-1540-fetched-src
-
-# Add /usr/share/eclipse/dropins
-%patch51 -p3
-
-#sed --in-place "s/java5.home/java.home/" build.xml
-#sed --in-place "s|JavaSE-1.6=|JavaSE-1.6=%{java_home}|" build.xml
-# Build swttools.jar and native libraries
-#%patch4 -p0
-#%patch32 -p0
-
-# liblocalfile fixes
-sed --in-place "s/JAVA_HOME =/#JAVA_HOME =/" plugins/org.eclipse.core.filesystem/natives/unix/linux/Makefile
-sed --in-place "s/OPT_FLAGS=-O/OPT_FLAGS=-O2 -g/" plugins/org.eclipse.core.filesystem/natives/unix/linux/Makefile
-
-# launcher patches
-rm plugins/org.eclipse.platform/launchersrc.zip
-pushd features/org.eclipse.equinox.executable
-#%patch12 -p0
-%patch26 -p0
-# FIXME:  deal with this
-## put the configuration directory in an arch-specific location
-#sed --in-place "s:/usr/lib/eclipse/configuration:%{_libdir}/%{name}/configuration:" library/eclipse.c
-## make the eclipse binary relocatable
-#sed --in-place "s:/usr/share/eclipse:%{_datadir}/%{name}:" library/eclipse.c
-zip -q -9 -r ../../plugins/org.eclipse.platform/launchersrc.zip library
-popd
-#-e "s|-breakiterator|;../org.eclipse.equinox.util/@dot\n;../org.eclipse.ecf_3.0.0.v20090302-0803.jar\n-breakiterator|" \
+ant applyPatches
+pushd build/eclipse-R3_5_1-fetched-src
 
 # Use our system-installed javadocs, reference only what we built, and
 # don't like to osgi.org docs (FIXME:  maybe we should package them?)
@@ -332,36 +209,10 @@ sed -i -e "s|http://java.sun.com/j2se/1.
    plugins/org.eclipse.pde.doc.user/pdeOptions.txt \
    plugins/org.eclipse.pde.doc.user/pdeOptions.txt
 
-pushd plugins/org.eclipse.pde.build
-%patch15
-sed --in-place "s:/usr/share/eclipse:%{_libdir}/%{name}:" templates/package-build/build.properties
-popd
-
-# TODO check whether it is needed
-#%patch36
-# TODO rebase
-#%patch37
-
-#pushd plugins/org.eclipse.equinox.p2.reconciler.dropins
-#%patch39
-#popd
-#
-#pushd plugins/org.eclipse.equinox.p2.touchpoint.eclipse
-#%patch40
-#popd
-
-#pushd "plugins/org.eclipse.swt/Eclipse SWT PI/gtk/library"
-#%patch45 -p3
-#popd
-
 # Remove signatures for JARs
 find -iname \*.sf | xargs rm
 find -iname \*.rsa | xargs rm
 
-# all output should be directed to stdout
-# https://bugs.eclipse.org/bugs/show_bug.cgi?id=144942
-find -type f -name \*.xml -exec sed --in-place -r "s/output=\".*(txt|log).*\"//g" "{}" \;
-
 # Remove existing .sos and binary launcher
 find -name \*.so | xargs rm
 find features/org.eclipse.equinox.executable -type f -name eclipse | xargs rm
@@ -380,13 +231,10 @@ sed --in-place "s|$swt_frag_ver_s390x|$s
 
 # Nasty hack to get suppport for ppc64, sparc{,64} and alpha
 %ifarch ppc64
-%patch24 -p1
-%patch28
-%patch49
+%patch0 -p1
+%patch1
+%patch2
 %endif
-#%patch30
-%patch31 -p1
-%patch38
 
 # Copy all of the s390x directories and files to ppc64 or sparc{,64} or alpha dirs and replace
 # the s390x strings with ppc64, etc.
@@ -398,7 +246,7 @@ sed --in-place "s|$swt_frag_ver_s390x|$s
     tofile=$(echo $f | sed "s/s390x/%{_arch}/")
     cp -rp $f $tofile
     for g in $(find $tofile -type f); do
-	sed -i "s/s390x/%{_arch}/g" $g
+    sed -i "s/s390x/%{_arch}/g" $g
     done
   done
   mv buildConfigs/eclipse-build-config/build.properties buildConfigs/eclipse-build-config/build.properties.java
@@ -460,22 +308,6 @@ IFS='
 
 %endif
 
-arches=$(grep "antfile=\"build.xml\" dir=\".*gtk\.linux\.*" \
-  features/org.eclipse.rcp/build.xml | awk '{ print $3 }' | awk -F . \
-  '{ print $NF }' | sort -u | tr -d '"' | tr "\n" " ")
-
-arches=$(echo $arches | sed s/%{eclipse_arch}//)
-
-# Don't build for arches other than the one on which we're building
-pushd features
-for f in */build.xml; do
-    for arch in $arches; do
-      sed -i "/<ant antfile=\"build.xml\" dir=.*$arch\" target=\"/,/<\/ant>/ d" $f
-      sed -i "/idReplacer/ s/org.eclipse\.\([a-z0-9A-Z_]\+\.\)\+$arch:0.0.0,[0-9I\.vf\-]\+,//g" $f
-    done
-done
-popd
-
 # Symlinks
 rm plugins/org.sat4j*
 ln -s %{_javadir}/org.sat4j.core* plugins/org.sat4j.core_2.1.0.v20090520.jar
@@ -519,11 +351,11 @@ ln -s %{_javadir}/ant/ant-trax.jar $ANTD
 
 JETTYPLUGINVERSION=$(ls plugins | grep org.mortbay.jetty.server_6 | sed 's/org.mortbay.jetty.server_//')
 rm plugins/org.mortbay.jetty.server_$JETTYPLUGINVERSION
-ln -s %{_javadir}/jetty/jetty-6.1.20.jar plugins/org.mortbay.jetty.server_$JETTYPLUGINVERSION
+ln -s %{_javadir}/jetty/jetty.jar plugins/org.mortbay.jetty.server_$JETTYPLUGINVERSION
 
 JETTYUTILVERSION=$(ls plugins | grep org.mortbay.jetty.util_6 | sed 's/org.mortbay.jetty.util_//')
 rm plugins/org.mortbay.jetty.util_$JETTYUTILVERSION
-ln -s %{_javadir}/jetty/jetty-util-6.1.20.jar plugins/org.mortbay.jetty.util_$JETTYUTILVERSION
+ln -s %{_javadir}/jetty/jetty-util.jar plugins/org.mortbay.jetty.util_$JETTYUTILVERSION
 
 JUNITVERSION=$(ls plugins | grep org.junit_3 | sed 's/org.junit_//')
 build-jar-repository -s -p plugins/org.junit_$JUNITVERSION junit
@@ -620,11 +452,6 @@ rm plugins/org.eclipse.swt/extra_jars/ex
    plugins/org.eclipse.osgi/osgi/osgi.cmpn.jar \
    plugins/org.eclipse.osgi/osgi/osgi.core.jar
 
-# FIXME:  figure out a way to symlink to something.  Alternatively,
-# patch out of package.org.eclipse.sdk*.xml.
-# Delete unnecessary-for-build source JARs
-#rm plugins/*.source_*.jar
-
 # make sure there are no jars left
 JARS=""
 for j in $(find -name \*.jar); do
@@ -637,84 +464,30 @@ if [ ! -z "$JARS" ]; then
    #FIXME: enable  exit 1
 fi
 
-# ECF filetransfer plugins
-tar jxf %{SOURCE25}
-pushd org.eclipse.ecf
-mkdir -p features/org.eclipse.ecf.filetransfer-feature
-pushd features/org.eclipse.ecf.filetransfer-feature
-cp -p %{SOURCE26} feature.xml
-cp -p %{SOURCE27} build.properties
-popd
-popd
-
-%patch43
-%patch44
-%patch47
-
-#pushd "plugins/org.eclipse.swt/Eclipse SWT PI/gtk/library"
-#%patch48 -p3
-#popd
-
 # target platform template patch
-%patch50 -p0
-%patch52 -p0
-
+%patch3 -p0
 popd
 
 %build
-ORIGCLASSPATH=$CLASSPATH
 export JAVA_HOME=%{java_home}
 ./build.sh
 
-SDK=$(cd build/eclipse-I20090611-1540-fetched-src/installation && pwd)
-LAUNCHERVERSION=$(ls $SDK/plugins | grep equinox.launcher_ | sed 's/org.eclipse.equinox.launcher_//')
-PDEPLUGINVERSION=$(ls $SDK/plugins | grep pde.build_ | sed 's/org.eclipse.pde.build_//')
-pushd build/eclipse-I20090611-1540-fetched-src/plugins/org.eclipse.equinox.initializer
-java -cp $SDK/plugins/org.eclipse.equinox.launcher_$LAUNCHERVERSION \
-      org.eclipse.core.launcher.Main \
-     -application org.eclipse.ant.core.antRunner       \
-     -f build.xml build.update.jar
-cp org.eclipse.equinox.initializer*.jar $SDK/plugins
-popd
-
-#
-# Build the ECF filetransfer plugins
-pushd build/eclipse-I20090611-1540-fetched-src/org.eclipse.ecf
-mkdir -p build
-homedir=$(mkdir home| cd home|pwd)
-java -cp $SDK/plugins/org.eclipse.equinox.launcher_$LAUNCHERVERSION \
-     -Duser.home=$homedir                              \
-      org.eclipse.core.launcher.Main \
-     -application org.eclipse.ant.core.antRunner       \
-     -Dtype=feature                                    \
-     -Did=org.eclipse.ecf.filetransfer_feature                   \
-     -DsourceDirectory=$(pwd)                          \
-     -DbaseLocation=$SDK \
-     -DforceContextQualifier=v20090604-1131 \
-     -Dbuilder=$SDK/plugins/org.eclipse.pde.build_$PDEPLUGINVERSION/templates/package-build  \
-     -debug -consolelog \
-     -f $SDK/plugins/org.eclipse.pde.build_$PDEPLUGINVERSION/scripts/build.xml
-
-popd
-
 %install
 rm -rf $RPM_BUILD_ROOT
 # Get swt version
-SWT_MAJ_VER=$(grep maj_ver build/eclipse-I20090611-1540-fetched-src/plugins/org.eclipse.swt/Eclipse\ SWT/common/library/make_common.mak | cut -f 2 -d =)
-SWT_MIN_VER=$(grep min_ver build/eclipse-I20090611-1540-fetched-src/plugins/org.eclipse.swt/Eclipse\ SWT/common/library/make_common.mak | cut -f 2 -d =)
+SWT_MAJ_VER=$(grep maj_ver build/eclipse-R3_5_1-fetched-src/plugins/org.eclipse.swt/Eclipse\ SWT/common/library/make_common.mak | cut -f 2 -d =)
+SWT_MIN_VER=$(grep min_ver build/eclipse-R3_5_1-fetched-src/plugins/org.eclipse.swt/Eclipse\ SWT/common/library/make_common.mak | cut -f 2 -d =)
 SWT_VERSION=$SWT_MAJ_VER$SWT_MIN_VER
 
+ant -DdestDir=$RPM_BUILD_ROOT -Dprefix=/usr -DbuildArch=%{eclipse_arch} -Dmultilib=true install
+
+cp $RPM_BUILD_ROOT%{_libdir}/eclipse/eclipse.ini eclipse.ini-real
 # Some directories we need
 sdkDir=$RPM_BUILD_ROOT%{_libdir}/%{name}
-install -d -m 755 $sdkDir
-install -d -m 755 $sdkDir/plugins
-install -d -m 755 $sdkDir/features
 # FIXME:  We can probably get rid of the links directory (for the
 # datadir.link file) when we ensure all plugins are installing into
 # dropins (either in libdir or datadir).
 install -d -m 755 $RPM_BUILD_ROOT%{_libdir}/java
-install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/%{name}
-install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/%{name}/dropins
 
 # FIXME:  Please don't install stuff to these directories.  They're only
 # still here for legacy plugins (which probably won't function in 3.4).
@@ -722,16 +495,7 @@ install -d -m 755 $RPM_BUILD_ROOT%{_data
 install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/%{name}/features
 install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/%{name}/plugins
 
-# Explode the resulting SDK tarball
-cp -R build/eclipse-I20090611-1540-fetched-src/installation/* $RPM_BUILD_ROOT%{_libdir}/eclipse
 rm -fr $RPM_BUILD_ROOT%{_libdir}/eclipse/p2
-# ECF filetransfer plugins we built
-rm $sdkDir/plugins/org.eclipse.ecf*.jar
-unzip -d $RPM_BUILD_ROOT%{_libdir} \
-  build/eclipse-I20090611-1540-fetched-src/org.eclipse.ecf/build/rpmBuild/org.eclipse.ecf.filetransfer_feature.zip
-# Remove the feature we used for building
-rm -rf \
-  $sdkDir/features/org.eclipse.ecf.filetransfer_feature_*
 
 LAUNCHERVERSION=$(ls $sdkDir/plugins | grep equinox.launcher_ | sed 's/org.eclipse.equinox.launcher_//')
 
@@ -762,7 +526,8 @@ org.eclipse.equinox.p2.metadata.generato
 -publishArtifacts \
 -append \
 -artifactRepositoryName "Eclipse Platform" \
--metadataRepositoryName "Eclipse Platform"
+-metadataRepositoryName "Eclipse Platform" \
+-debug -consolelog
 
 # JDT
 jdtDir=$sdkDir-JDT
@@ -820,7 +585,7 @@ org.eclipse.equinox.p2.director \
 
 # Stuff in JDT, PDE, SDK
 for f in about.html about_files \.eclipseproduct epl-v10.html notice.html readme; do
-    if 	[ -e $installDir/$f ]; then
+    if  [ -e $installDir/$f ]; then
       mv $installDir/$f $provisionDir
     fi
 done
@@ -940,24 +705,10 @@ done
 popd
 %endif
 
-cp -p build/eclipse-I20090611-1540-fetched-src/installation/eclipse.ini \
+cp -p eclipse.ini-real \
   $sdkDir/eclipse.ini
-# We have /usr/share/eclipse/dropins in eclipse.ini
-sed -i "s|/usr/share|%{_datadir}|" $sdkDir/eclipse.ini
 
-sed --in-place "s/osgi.ws=gtk/osgi.ws=gtk\norg.eclipse.update.reconcile=false/" \
-  $RPM_BUILD_ROOT%{_libdir}/%{name}/configuration/config.ini
-sed --in-place "s|org.eclipse.core.runtime,3.5.0.v20090316,file:plugins/org.eclipse.core.runtime_3.5.0.v20090316.jar,4,false|org.eclipse.core.runtime,3.5.0.v20090316,file:plugins/org.eclipse.core.runtime_3.5.0.v20090316.jar,4,true|" \
-  $RPM_BUILD_ROOT%{_libdir}/%{name}/configuration/org.eclipse.equinox.simpleconfigurator/bundles.info
-
-# Install the Eclipse binary wrapper
-install -d -m 755 $RPM_BUILD_ROOT%{_bindir}
-ln -s %{_libdir}/%{name}/%{name} $RPM_BUILD_ROOT%{_bindir}/%{name}
-install -d -m 755 $RPM_BUILD_ROOT%{_bindir}
-#cp -p %{SOURCE3} $RPM_BUILD_ROOT%{_bindir}/eclipse
-#sed --in-place "s|@LIBDIR@|%{_libdir}|g" $RPM_BUILD_ROOT%{_bindir}/eclipse
-#ECLIPSELIBSUFFIX=$(ls $RPM_BUILD_ROOT%{_libdir}/%{name}/plugins/org.eclipse.equinox.launcher.gtk.linux*/*.so | sed "s/.*.launcher.gtk.linux.//")
-#sed --in-place "s|@ECLIPSELIBSUFFIX@|$ECLIPSELIBSUFFIX|" $RPM_BUILD_ROOT%{_bindir}/eclipse
+sed -i "s|$RPM_BUILD_ROOT||g" $sdkDir/eclipse.ini
 
 mkdir -p $RPM_BUILD_ROOT%{_libdir}/%{name}/links
 # FIXME:  We can probably get rid of the links file when we ensure all
@@ -970,7 +721,7 @@ echo "path:%{_datadir}" > \
 chmod 755 $RPM_BUILD_ROOT/%{_libdir}/%{name}/%{name}
 
 # Install the SWT jar symlinks in libdir
-SWTJARVERSION=$(grep v$SWT_VERSION build/eclipse-I20090611-1540-fetched-src/plugins/org.eclipse.swt.gtk.linux.%{eclipse_arch}/build.xml | sed "s:.*<.*\"\(.*\)\" />:\1:")
+SWTJARVERSION=$(grep v$SWT_VERSION build/eclipse-R3_5_1-fetched-src/plugins/org.eclipse.swt.gtk.linux.%{eclipse_arch}/build.xml | sed "s:.*<.*\"\(.*\)\" />:\1:")
 pushd $RPM_BUILD_ROOT%{_libdir}/%{name}
 ln -s plugins/org.eclipse.swt.gtk.linux.%{eclipse_arch}_$SWTJARVERSION.jar swt-gtk-%{eclipse_majmin}.%{eclipse_micro}.jar
 ln -s swt-gtk-%{eclipse_majmin}.%{eclipse_micro}.jar swt-gtk-%{eclipse_majmin}.jar
@@ -978,20 +729,6 @@ ln -s swt-gtk-%{eclipse_majmin}.%{eclips
 ln -s ../%{name}/swt-gtk-%{eclipse_majmin}.%{eclipse_micro}.jar ../java/swt.jar
 popd
 
-# Icons
-PLATFORMVERSION=$(ls $sdkDir/plugins | grep org.eclipse.platform_ | sed 's/org.eclipse.platform_//')
-install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/apps
-ln -s %{_libdir}/%{name}/plugins/org.eclipse.platform_$PLATFORMVERSION/eclipse48.png \
-  $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/apps/%{name}.png
-install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/32x32/apps
-ln -s %{_libdir}/%{name}/plugins/org.eclipse.platform_$PLATFORMVERSION/eclipse32.png \
-  $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/32x32/apps/%{name}.png
-install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/16x16/apps
-ln -s %{_libdir}/%{name}/plugins/org.eclipse.platform_$PLATFORMVERSION/eclipse.png \
-  $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/16x16/apps/%{name}.png
-install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/pixmaps
-ln -s %{_datadir}/icons/hicolor/48x48/apps/%{name}.png $RPM_BUILD_ROOT%{_datadir}/pixmaps
-
 # Install the efj wrapper script
 install -p -D -m0755 %{SOURCE17} $RPM_BUILD_ROOT%{_bindir}/efj
 sed --in-place "s:startup.jar:%{_libdir}/%{name}/startup.jar:" \
@@ -1000,15 +737,15 @@ sed --in-place "s:startup.jar:%{_libdir}
 rm -rf $installDir
 
 # A sanity check.
-desktop-file-validate %{SOURCE2}
+desktop-file-validate %{name}.desktop
 
 # freedesktop.org menu entry
 desktop-file-install --vendor="fedora" \
---dir=$RPM_BUILD_ROOT%{_datadir}/applications %{SOURCE2}
+--dir=$RPM_BUILD_ROOT%{_datadir}/applications %{name}.desktop
 
 # Create a script that can be used to make a symlink tree of the
 # eclipse platform.
-cp -p %{SOURCE16} copy-platform
+cp -p pdebuild/eclipse-copy-platform.sh copy-platform
 (
   cd $RPM_BUILD_ROOT%{_libdir}/%{name}
   ls -d * | egrep -v '^(plugins|features|about_files|dropins)$'
@@ -1035,7 +772,7 @@ sed --in-place "s|file\\\:%{_libdir}/ecl
   $RPM_BUILD_ROOT%{_libdir}/%{name}/configuration/config.ini
 
 # Install the PDE Build wrapper script.
-install -p -D -m0755 %{SOURCE21} \
+install -p -D -m0755 pdebuild/eclipse-pdebuild.sh \
   $RPM_BUILD_ROOT%{_libdir}/%{name}/buildscripts/pdebuild
 PDEBUILDVERSION=$(ls $RPM_BUILD_ROOT%{_libdir}/%{name}/dropins/sdk/plugins \
   | grep org.eclipse.pde.build_ | \
@@ -1093,11 +830,11 @@ ln -s %{_javadir}/ant/ant-trax.jar $ANTD
 
 JETTYPLUGINVERSION=$(ls plugins | grep org.mortbay.jetty.server_6 | sed 's/org.mortbay.jetty.server_//')
 rm plugins/org.mortbay.jetty.server_$JETTYPLUGINVERSION
-ln -s %{_javadir}/jetty/jetty-6.1.20.jar plugins/org.mortbay.jetty.server_$JETTYPLUGINVERSION
+ln -s %{_javadir}/jetty/jetty.jar plugins/org.mortbay.jetty.server_$JETTYPLUGINVERSION
 
 JETTYUTILVERSION=$(ls plugins | grep org.mortbay.jetty.util_6 | sed 's/org.mortbay.jetty.util_//')
 rm plugins/org.mortbay.jetty.util_$JETTYUTILVERSION
-ln -s %{_javadir}/jetty/jetty-util-6.1.20.jar plugins/org.mortbay.jetty.util_$JETTYUTILVERSION
+ln -s %{_javadir}/jetty/jetty-util.jar plugins/org.mortbay.jetty.util_$JETTYUTILVERSION
 
 pushd dropins/jdt
 build-jar-repository -s -p plugins/org.junit_* junit
@@ -1274,8 +1011,6 @@ fi
 %defattr(-,root,root)
 %attr(0755,root,root) %{_bindir}/%{name}
 %config %{_libdir}/%{name}/eclipse.ini
-#%{_libdir}/%{name}/.eclipseproduct
-%{_libdir}/%{name}/configuration/config.ini
 %ifnarch ppc
 %{_libdir}/%{name}/about_files
 %endif
@@ -1429,6 +1164,10 @@ fi
 #%{_libdir}/%{name}/configuration/org.eclipse.equinox.source
 
 %changelog
+* Tue Oct 13 2009 Alexander Kurtakov <akurtako at redhat.com> 1:3.5.1-1
+- Update to 3.5.1.
+- Fixes crash issue with gtk 2.18.
+
 * Wed Sep 23 2009 Andrew Overholt <overholt at redhat.com> 1:3.5.0-2
 - Move jakarta-commons-codec requirement from jdt to platform.
 

eclipse-addusrsharedropins.patch:
 sdk.product |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Index: eclipse-addusrsharedropins.patch
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse/F-12/eclipse-addusrsharedropins.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- eclipse-addusrsharedropins.patch	14 Sep 2009 16:12:50 -0000	1.1
+++ eclipse-addusrsharedropins.patch	13 Oct 2009 12:27:54 -0000	1.2
@@ -1,12 +1,11 @@
-diff -up ./build/eclipse-I20090611-1540-fetched-src/buildConfigs/eclipse-build-config/productFiles/sdk/sdk.product.dropinslocation ./build/eclipse-I20090611-1540-fetched-src/buildConfigs/eclipse-build-config/productFiles/sdk/sdk.product
---- ./build/eclipse-I20090611-1540-fetched-src/buildConfigs/eclipse-build-config/productFiles/sdk/sdk.product.dropinslocation	2009-09-14 11:04:38.000000000 -0400
-+++ ./build/eclipse-I20090611-1540-fetched-src/buildConfigs/eclipse-build-config/productFiles/sdk/sdk.product	2009-09-14 10:56:56.000000000 -0400
-@@ -9,7 +9,7 @@
-    
+--- buildConfigs/eclipse-build-config/productFiles/sdk/sdk.product.orig	2009-10-05 10:29:14.349001858 +0300
++++ buildConfigs/eclipse-build-config/productFiles/sdk/sdk.product	2009-10-05 10:46:26.812754089 +0300
+@@ -8,7 +8,7 @@
+ 
     <launcherArgs>
        <programArgs>-showsplash org.eclipse.platform --launcher.XXMaxPermSize 256m</programArgs>
 -      <vmArgs>-Xms40m -Xmx256m</vmArgs>
-+      <vmArgs>-Xms40m -Xmx256m -Dorg.eclipse.equinox.p2.reconciler.dropins.directory=/usr/share/eclipse/dropins</vmArgs>
++      <vmArgs>-Xms40m -Xmx512m -Dorg.eclipse.equinox.p2.reconciler.dropins.directory=/usr/share/eclipse/dropins</vmArgs>
        <vmArgsMac>-Xdock:icon=../Resources/Eclipse.icns -XstartOnFirstThread -Dorg.eclipse.swt.internal.carbon.smallFonts</vmArgsMac>
     </launcherArgs>
  


--- eclipse-fix-javahome64.patch DELETED ---


--- ecf-filetransfer-build.properties DELETED ---


--- eclipse-help-toolbar.patch DELETED ---


--- eclipse-pdebuild.sh DELETED ---


--- eclipse-addrootfiles.patch DELETED ---


--- eclipse-addfragmentsforotherplatforms.patch DELETED ---


--- eclipse-launcher-fix-java-home.patch DELETED ---


--- fetch-ecf.sh DELETED ---


--- eclipse-jdt_launch-customBuild.patch DELETED ---


--- eclipse-swt-xulrunner191.patch DELETED ---


--- eclipse-dontpackicu4jsource.patch DELETED ---


--- eclipse-pde.build-add-package-build.patch DELETED ---


--- eclipse-copy-platform.sh DELETED ---


--- eclipse-compilelibs.patch DELETED ---


--- eclipse-config.ini.director DELETED ---


--- eclipse-ia64-packaging.patch DELETED ---


--- eclipse-osgi-classpath.patch DELETED ---


--- eclipse-platform_build.patch DELETED ---


--- ecf-filetransfer-feature.xml DELETED ---


--- eclipse-swt-buildagainstxulrunner.patch DELETED ---


--- eclipse-ecf-qualifier.patch DELETED ---


--- eclipse-nojarsignatures.patch DELETED ---


--- eclipse.desktop DELETED ---


--- eclipse-buildswtnatives.patch DELETED ---


--- eclipse-memorypermsizeandjvmcrash.patch DELETED ---


