From 5c8679bab4f2d76225525ba29f12dd2135b74d88 Mon Sep 17 00:00:00 2001
From: Andrew Overholt <overholt@fedoraproject.org>
Date: Sep 14 2009 16:12:51 +0000
Subject: - Add /usr/share/eclipse/dropins to list of dropins locations

    (rhbz#522117).

---

diff --git a/eclipse-addusrsharedropins.patch b/eclipse-addusrsharedropins.patch
new file mode 100644
index 0000000..0d59fdc
--- /dev/null
+++ b/eclipse-addusrsharedropins.patch
@@ -0,0 +1,12 @@
+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 @@
+    
+    <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>
+       <vmArgsMac>-Xdock:icon=../Resources/Eclipse.icns -XstartOnFirstThread -Dorg.eclipse.swt.internal.carbon.smallFonts</vmArgsMac>
+    </launcherArgs>
+ 
diff --git a/eclipse.spec b/eclipse.spec
index 9bd6a49..aa22402 100644
--- a/eclipse.spec
+++ b/eclipse.spec
@@ -30,7 +30,7 @@ Epoch:  1
 Summary:        An open, extensible IDE
 Name:           eclipse
 Version:        %{eclipse_majmin}.%{eclipse_micro}
-Release:        0.10%{?dist}
+Release:        0.11%{?dist}
 License:        EPL
 Group:          Text Editors/Integrated Development Environments (IDE)
 URL:            http://www.eclipse.org/
@@ -132,6 +132,10 @@ Patch49:        %{name}-add-ppc64-filesystem.patch
 # 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
+
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  ant
 BuildRequires:  jpackage-utils >= 0:1.5, make, gcc
@@ -281,6 +285,9 @@ sed --in-place "s/<target name=\"build\" depends=\"applyPatches,bootstrap,compil
 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
@@ -1413,6 +1420,10 @@ fi
 #%{_libdir}/%{name}/configuration/org.eclipse.equinox.source
 
 %changelog
+* Mon Sep 14 2009 Andrew Overholt <overholt@redhat.com> 1:3.5.0-0.11
+- Add /usr/share/eclipse/dropins to list of dropins locations
+  (rhbz#522117).
+
 * Wed Sep 09 2009 Mat Booth <fedora@matbooth.co.uk> 1:3.5.0-0.10
 - Patch the target platform templates so they find all the required
   source bundles (see RHBZ # 521969).