rpms/eclipse/devel eclipse-addusrsharedropins.patch, NONE, 1.1 eclipse.spec, 1.663, 1.664

[Andrew Overholt]

Author: overholt

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

Modified Files:
	eclipse.spec 
Added Files:
	eclipse-addusrsharedropins.patch 
Log Message:
* Mon Sep 14 2009 Andrew Overholt <overholt at redhat.com> 1:3.5.0-0.11
- Add /usr/share/eclipse/dropins to list of dropins locations
  (rhbz#522117).

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

--- NEW FILE eclipse-addusrsharedropins.patch ---
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>
 


Index: eclipse.spec
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse/devel/eclipse.spec,v
retrieving revision 1.663
retrieving revision 1.664
diff -u -p -r1.663 -r1.664
--- eclipse.spec	10 Sep 2009 14:11:54 -0000	1.663
+++ eclipse.spec	14 Sep 2009 16:12:51 -0000	1.664
@@ -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-filesy
 # 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\"
 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 at 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 at 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).