Tue Sep 29 12:18:17 UTC 2009

Author: akurtakov

Update of /cvs/pkgs/rpms/eclipse/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19301/devel

Modified Files:
	sources eclipse.spec .cvsignore 
Removed Files:
	eclipse-dontpackicu4jsource.patch eclipse-addrootfiles.patch 
	eclipse-addusrsharedropins.patch 
	eclipse-swt-buildagainstxulrunner.patch 
	eclipse-help-toolbar.patch eclipse-nojarsignatures.patch 
	eclipse-ecf-qualifier.patch 
	eclipse-launcher-fix-java-home.patch 
	eclipse-buildswtnatives.patch 
	eclipse-addfragmentsforotherplatforms.patch 
	eclipse-config.ini.director eclipse-fix-javahome64.patch 
	eclipse-jdt_launch-customBuild.patch eclipse.desktop 
	eclipse-swt-xulrunner191.patch 
	eclipse-memorypermsizeandjvmcrash.patch 
	eclipse-platform_build.patch eclipse-compilelibs.patch 
	eclipse-ia64-packaging.patch 
Log Message:
- Build with eclipse-build 0.4.0 RC0.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse/devel/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	29 Sep 2009 12:18:16 -0000	1.82
@@ -1,3 +1,3 @@
 72a590190a4fea7a4f8885bfe26a3e18  eclipse-I20090611-1540-fetched-src.tar.bz2
-a3504fedff088a6e58a39d43fff4d47e  eclipse-build-R0_3_0.tar.gz
 d9b5bdc848ded1c2f1f62da94b9c70a0  ecf-filetransfer-v20090604-1131.tar.bz2
+0c08b2d3cbdec806afeddf10ab7d7bb0  eclipse-build-0_4_RC0.tar.gz


Index: eclipse.spec
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse/devel/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	29 Sep 2009 12:18:16 -0000	1.669
@@ -30,13 +30,12 @@ Epoch:  1
 Summary:        An open, extensible IDE
 Name:           eclipse
 Version:        %{eclipse_majmin}.%{eclipse_micro}
-Release:        2%{?dist}
+Release:        3%{?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
+Source0:        %{download_url}eclipse-build-0_4_RC0.tar.gz
 Source1:        %{download_url}eclipse-I20090611-1540-fetched-src.tar.bz2
-Source2:        %{name}.desktop
 Source16:       %{name}-copy-platform.sh
 Source17:       efj.sh.in
 # This file contains the types of files we'd like to extract from the jars
@@ -44,8 +43,6 @@ Source17:       efj.sh.in
 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
@@ -59,14 +56,6 @@ Source27:       ecf-filetransfer-build.p
 # 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
@@ -76,70 +65,16 @@ Patch32:        %{name}-compilelibs.patc
 # 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}-pde.build-add-package-build.patch
+Patch1:        %{name}-add-ppc64-sparc64-s390-s390x.patch
+Patch2:        %{name}-add-ppc64-sparc64-s390-s390x-2.patch
 
-Patch49:        %{name}-add-ppc64-filesystem.patch
+Patch5:        %{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
+Patch6:        %{name}-target-platform-template.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  ant
@@ -284,39 +219,16 @@ Eclipse Plugin Development Environment. 
 developing Eclipse plugins.
 
 %prep
-%setup -q -n eclipse-build-R0_3_0
+%setup -q -n eclipse-build-0_4_RC0
 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|" \
-
 # Use our system-installed javadocs, reference only what we built, and
 # don't like to osgi.org docs (FIXME:  maybe we should package them?)
 sed -i -e "s|http://java.sun.com/j2se/1.4.2/docs/api|%{_datadir}/javadoc/java|" \
@@ -333,27 +245,10 @@ sed -i -e "s|http://java.sun.com/j2se/1.
    plugins/org.eclipse.pde.doc.user/pdeOptions.txt
 
 pushd plugins/org.eclipse.pde.build
-%patch15
+%patch0
 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
@@ -380,13 +275,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
+%patch1 -p1
+%patch2
+%patch5
 %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.
@@ -460,22 +352,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
@@ -647,17 +523,8 @@ 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
+%patch6 -p0
 
 popd
 
@@ -677,7 +544,6 @@ java -cp $SDK/plugins/org.eclipse.equino
 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
@@ -1000,11 +866,11 @@ 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.
@@ -1429,6 +1295,9 @@ fi
 #%{_libdir}/%{name}/configuration/org.eclipse.equinox.source
 
 %changelog
+* Tue Sep 29 2009 Alexander Kurtakov <akurtako at redhat.com> 1:3.5.0-3
+- Build with eclipse-build 0.4.0 RC0.
+
 * Wed Sep 23 2009 Andrew Overholt <overholt at redhat.com> 1:3.5.0-2
 - Move jakarta-commons-codec requirement from jdt to platform.
 


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse/devel/.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	29 Sep 2009 12:18:16 -0000	1.63
@@ -3,3 +3,4 @@ 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-build-0_4_RC0.tar.gz


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


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


--- eclipse-addusrsharedropins.patch DELETED ---


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


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


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


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


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


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


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


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


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


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


--- eclipse.desktop DELETED ---


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


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


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


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


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


