From 4e2999319cac983b31445fcfaba9d076acbb3e30 Mon Sep 17 00:00:00 2001
From: Andrew Overholt <overholt@fedoraproject.org>
Date: Aug 06 2008 22:00:40 +0000
Subject: - Add p2 metadata generation to pdebuild

- Fix symlinking to %{_libdir}/eclipse/dropins/* stuff in copy-platform
- Fix brightness in splash screen
- Fix icon symlinks
- Bump icu4j-eclipse requirement

---

diff --git a/eclipse-pde.build-add-package-build.patch b/eclipse-pde.build-add-package-build.patch
index 4c95926..9aa754e 100644
--- a/eclipse-pde.build-add-package-build.patch
+++ b/eclipse-pde.build-add-package-build.patch
@@ -263,7 +263,7 @@ RCS file: templates/package-build/build.properties
 diff -N templates/package-build/build.properties
 --- /dev/null	1 Jan 1970 00:00:00 -0000
 +++ templates/package-build/build.properties	1 Jan 1970 00:00:00 -0000
-@@ -0,0 +1,17 @@
+@@ -0,0 +1,12 @@
 +buildDirectory=${sourceDirectory}/build
 +buildLabel=rpmBuild
 +archivePrefix=eclipse
@@ -276,11 +276,6 @@ diff -N templates/package-build/build.properties
 +archiveName=${id}.zip
 +runPackager=false
 +baseLocation=/usr/share/eclipse
-+generate.p2.metadata=true
-+p2.metadata.repo = file:${buildDirectory}/repo
-+p2.artifact.repo = file:${buildDirectory}/repo
-+p2.flavor = tooling
-+p2.publish.artifacts=true
 Index: templates/package-build/symlink-deps.sh
 ===================================================================
 RCS file: templates/package-build/symlink-deps.sh
diff --git a/eclipse-pdebuild.sh b/eclipse-pdebuild.sh
index b781e90..c96536d 100755
--- a/eclipse-pdebuild.sh
+++ b/eclipse-pdebuild.sh
@@ -216,6 +216,11 @@ $debugPlatformArgs \
 -DorbitDepsDir="$orbitDepsDir" \
 -Dp2.root.name="$featureName" \
 -Dp2.root.version="$featureVersion" \
+-Dgenerate.p2.metadata=true \
+-Dp2.metadata.repo=file:$buildDir/repo \
+-Dp2.artifact.repo=file:$buildDir/repo \
+-Dp2.flavor=tooling \
+-Dp2.publish.artifacts=true \
 $additionalArgs \
 -f $pdeBuildDir/scripts/build.xml \
 -vmargs \
@@ -234,11 +239,16 @@ if [ $dryRun -ne 1 ]; then
     -DsourceDirectory=$sourceDir \
     -DbuildDirectory=$buildDir \
     -Dbuilder=$datadir/eclipse/dropins/sdk/eclipse/plugins/org.eclipse.pde.build_@PDEBUILDVERSION@/templates/package-build \
-    -DorbitDepsDir=\""$orbitDepsDir"\" \
-    -Dp2.root.name=\""$featureName\"" \
-    -Dp2.root.version=\""$featureVersion\"" \
-    -Dp2.metadata.repo.name=\""$featureName\"" \
-    -Dp2.artifact.repo.version=\""$featureVersion\"" \
+    -DorbitDepsDir=$orbitDepsDir \
+    -Dp2.root.name="$featureName" \
+    -Dp2.root.version="$featureVersion" \
+    -Dp2.metadata.repo.name="$featureName" \
+    -Dp2.artifact.repo.version="$featureVersion" \
+    -Dgenerate.p2.metadata=true \
+    -Dp2.metadata.repo=file:$buildDir/repo \
+    -Dp2.artifact.repo=file:$buildDir/repo \
+    -Dp2.flavor=tooling \
+    -Dp2.publish.artifacts=true \
     $additionalArgs \
     -f $pdeBuildDir/scripts/build.xml \
     -vmargs \
diff --git a/eclipse.spec b/eclipse.spec
index 4b3766d..c817142 100644
--- a/eclipse.spec
+++ b/eclipse.spec
@@ -212,7 +212,7 @@ 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 >= 3.6.1-1jpp.4
+Requires:       icu4j-eclipse >= 3.8.1
 Requires:       java >= 1.6.0
 
 %description    rcp
@@ -1449,11 +1449,12 @@ fi
 
 %changelog
 * Wed Aug 06 2008 Andrew Overholt <overholt@redhat.com> 3.4.0-17
-- Add p2 metadata generation to package-build and pdebuild
+- Add p2 metadata generation to pdebuild
 - Fix symlinking to %%{_libdir}/eclipse/dropins/* stuff in
   copy-platform
 - Fix brightness in splash screen
 - Fix icon symlinks
+- Bump icu4j-eclipse requirement
 
 * Tue Aug 05 2008 Andrew Overholt <overholt@redhat.com> 3.4.0-16
 - Ensure %%{_datadir}/eclipse/dropins gets watched in eclipse.ini
diff --git a/sources b/sources
index e620b25..7755ccb 100644
--- a/sources
+++ b/sources
@@ -3,4 +3,4 @@ e1313563c7e36aa46e33789a1386b815  eclipse-fileinitializerapp.tar.bz2
 611d3dc63e9e4246e325848d32773132  ecf-filetransfer-v20080611-1715.tar.bz2
 555c99aee06fc52d2ec03995b5ac0710  eclipse-sourceBuild-srcIncluded-3.4.zip
 485f281cd968bf30d5266dc254004b1e  eclipse-ecj-gcj.tar.bz2
-be338ba0836dd4edc6b72849b55aae4b  org.fedoraproject.ide.platform-3.4.0-1.zip
+372361ae6f1355ec5cfb9a301ad690f5  org.fedoraproject.ide.platform-3.4.0-1.zip