From dc9f536855a081df621e84dcf227afb596fca0ad Mon Sep 17 00:00:00 2001
From: Krzysztof Daniel <kdaniel@redhat.com>
Date: Mon, 24 Jun 2013 13:35:19 +0200
Subject: [PATCH] Rebuild to reflect shape change of ecf and emf packages.

---
 .gitignore   |  1 +
 eclipse.spec | 16 ++++++----------
 sources      |  2 +-
 3 files changed, 8 insertions(+), 11 deletions(-)

diff --git a/.gitignore b/.gitignore
index 8b97960..f73798a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -47,3 +47,4 @@ eclipse-build-bbaaeebc6916cc28848e3f7f8f2ae5b8390c2ee3.tar.xz
 /.xmvn
 /R4_platform-aggregator-2caa8794a57a9479ad642d7f6e3607a020aa36e0.tar.bz2
 /eclipse-build-b963e34cbd5ead603a051b7d4b79fc91114ccd87.tar.xz
+/eclipse-build-60a5a559fd746d946d869720c889bc698d9e6ab3.tar.xz
diff --git a/eclipse.spec b/eclipse.spec
index 057c55c..f46c420 100644
--- a/eclipse.spec
+++ b/eclipse.spec
@@ -9,7 +9,7 @@ Epoch:                  1
 %global eclipse_majmin  %{eclipse_major}.%{eclipse_minor}
 %global eclipse_micro   0
 %global initialize      1
-%global eb_commit       b963e34cbd5ead603a051b7d4b79fc91114ccd87
+%global eb_commit       60a5a559fd746d946d869720c889bc698d9e6ab3
 %global eclipse_tag     84cba7bf43da88dc3f33bc113104eb680f12aa2d
 %global eclipse_version %{eclipse_majmin}.%{eclipse_micro}
 %global installation_loc %{_libdir}/%{pkg_name}
@@ -51,7 +51,7 @@ fi;
 Summary:        An open, extensible IDE
 Name:           %{?scl_prefix}eclipse
 Version:        %{eclipse_version}
-Release:        1%{?dist}
+Release:        2%{?dist}
 License:        EPL
 Group:          Development/Tools
 URL:            http://www.eclipse.org/
@@ -173,8 +173,8 @@ BuildRequires: xml-commons-apis >= 1.4.01-12
 BuildRequires: atinject >= 1-6
 BuildRequires: tycho >= 0.16
 BuildRequires: tycho-extras >= 0.16
-BuildRequires: eclipse-emf-core >= 1:2.8.1
-BuildRequires: %{?scl_prefix}eclipse-ecf-core
+BuildRequires: eclipse-emf-core >= 1:2.9.0-0.2
+BuildRequires: %{?scl_prefix}eclipse-ecf-core >= 3.6.0-2
 BuildRequires: tomcat-servlet-3.0-api
 BuildRequires: tomcat-el-2.2-api
 BuildRequires: glassfish-jsp-api >= 2.2.1-4
@@ -251,8 +251,8 @@ Requires: xml-commons-apis >= 1.4.01-12
 Requires: batik >= 1.8
 Requires: atinject >= 1-6
 Requires: geronimo-annotation >= 1.0-7
-Requires: %{?scl_prefix}eclipse-ecf-core >= 3.6.0
-Requires: eclipse-emf-core >= 2.9.0
+Requires: %{?scl_prefix}eclipse-ecf-core >= 3.6.0-2
+Requires: eclipse-emf-core >= 2.9.0-0.2
 Requires: tomcat-servlet-3.0-api
 Requires: tomcat-el-2.2-api
 Requires: glassfish-jsp-api >= 2.2.1-4
@@ -749,10 +749,6 @@ if [ -x /usr/bin/gtk-update-icon-cache ]; then
   gtk-update-icon-cache -q %{_datadir}/icons/hicolor
 fi
 
-%pre jdt
-# workaround for rpm bug, can be removed in F-20 Fixes the problem with efj being directory instead of launcher
-%{?!scl:rm -rf %{_bindir}/efj/}
-
 
 %files swt
 %dir %{_libdir}/%{pkg_name}
diff --git a/sources b/sources
index 587a42b..628fdb9 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-0aff7988c384ece2ac27e6abfe517e77  eclipse-build-b963e34cbd5ead603a051b7d4b79fc91114ccd87.tar.xz
+23f433f7a884c8029fe903cd1e70a8d7  eclipse-build-60a5a559fd746d946d869720c889bc698d9e6ab3.tar.xz
 3c59e76d97e8efbbcd650e83780e16e0  R4_platform-aggregator-84cba7bf43da88dc3f33bc113104eb680f12aa2d.tar.bz2