From a721e707e8f0f2050d395585713ab7610a4d9ae4 Mon Sep 17 00:00:00 2001
From: Krzysztof Daniel <kdaniel@redhat.com>
Date: May 18 2012 17:39:59 +0000
Subject: - Prevent running Eclipse as root.

- Populate Update Sites.
- Pick renamed plugins on startup.
- Bundle the .option file for investigating startup problems.
---

diff --git a/.gitignore b/.gitignore
index 68d1ff2..902ae01 100644
--- a/.gitignore
+++ b/.gitignore
@@ -18,3 +18,5 @@ eclipse-build-2c0f2ac34e3aee110187aa1dea28430bec724bdb.tar.xz
 eclipse-4.2.0-I20120405-1114-src.tar.bz2
 eclipse-build-5b8ee4c44320ee145596a3ce98fef1aa199055dd.tar.xz
 /.project
+eclipse-build-6df9efbd645d64284c969e9775d51be63fec7627.tar.xz
+eclipse-build-bbaaeebc6916cc28848e3f7f8f2ae5b8390c2ee3.tar.xz
diff --git a/eclipse.spec b/eclipse.spec
index 10155b3..2eac78b 100644
--- a/eclipse.spec
+++ b/eclipse.spec
@@ -6,7 +6,7 @@ Epoch:  1
 %global eclipse_micro   0
 %global initialize      1
 %global download_url    http://download.eclipse.org/technology/linuxtools/eclipse-build/4.2.x/
-%global eb_sha1         d747eda66dae13c133f56952466ff0ca30da99bf
+%global eb_sha1         db6cfaa61bd9fe37b480f52561a65b15e64d3383
 %global build_id        I20120503-1800
 %global eclipse_version %{eclipse_majmin}.%{eclipse_micro}
 %global emf_version     2.8.0
@@ -20,7 +20,7 @@ Epoch:  1
 Summary:        An open, extensible IDE
 Name:           eclipse
 Version:        %{eclipse_version}
-Release:        0.20.I201205031800%{?dist}
+Release:        0.21.I201205031800%{?dist}
 License:        EPL
 Group:          Text Editors/Integrated Development Environments (IDE)
 URL:            http://www.eclipse.org/
@@ -295,6 +295,13 @@ echo "-XX:CompileCommand=exclude,org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOM
 echo "-XX:CompileCommand=exclude,org/python/pydev/editor/codecompletion/revisited/PythonPathHelper,isValidSourceFile" >> $RPM_BUILD_ROOT/%{_sysconfdir}/eclipse.ini
 echo "-XX:CompileCommand=exclude,org/python/pydev/ui/filetypes/FileTypesPreferencesPage,getDottedValidSourceFiles" >> $RPM_BUILD_ROOT/%{_sysconfdir}/eclipse.ini
 
+# Prevent running master Eclipse in a shared configuration
+echo "-preventMasterEclipseLaunch" | cat - $RPM_BUILD_ROOT/%{_sysconfdir}/eclipse.ini > /tmp/out && mv -f /tmp/out $RPM_BUILD_ROOT/%{_sysconfdir}/eclipse.ini
+
+# Deploy installation debug config
+echo -e "org.eclipse.equinox.p2.core/debug=true" >  $RPM_BUILD_ROOT%{_libdir}/%{name}/.options
+echo -e "org.eclipse.equinox.p2.core/reconciler=true" >>  $RPM_BUILD_ROOT%{_libdir}/%{name}/.options
+
 # SWT JAR symlink in libdir
 pushd $RPM_BUILD_ROOT%{_libdir}/%{name}
 ln -s ../%{name}/swt.jar ../java/swt.jar
@@ -386,6 +393,8 @@ rm -rf %{_bindir}/efj/
 %dir %{_libdir}/%{name}/configuration/org.eclipse.osgi/bundles
 %endif
 %{_libdir}/%{name}/notice.html
+%{_libdir}/%{name}/eclipse.ini
+%{_libdir}/%{name}/.options
 %{_libdir}/%{name}/epl-v10.html
 %{_libdir}/%{name}/plugins/org.eclipse.swt_*
 %{_libdir}/%{name}/plugins/org.eclipse.swt.gtk.linux.*
@@ -665,6 +674,12 @@ rm -rf %{_bindir}/efj/
 %{_libdir}/%{name}/dropins/sdk
 
 %changelog
+* Fri May 18 2012 Krzysztof Daniel <kdaniel@redhat.com> 1:4.2.0-0.21.I201205031800
+- Prevent running Eclipse as root.
+- Populate Update Sites.
+- Pick renamed plugins on startup.
+- Bundle the .option file for investigating startup problems.
+
 * Sat May 5 2012 Krzysztof Daniel <kdaniel@redhat.com> 1:4.2.0-0.20.I201205031800
 - Update to M7.
 
diff --git a/sources b/sources
index 9b381bf..10caa0b 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
 3a0a246297515b6dbce78dbdb81b30be  eclipse-4.2.0-I20120503-1800-src.tar.bz2
-105cbd5f034ad980a8d4e66ad0057ff3  eclipse-build-d747eda66dae13c133f56952466ff0ca30da99bf.tar.xz
+5e436872caa360e080e4c2ced7569637  eclipse-build-db6cfaa61bd9fe37b480f52561a65b15e64d3383.tar.xz