[eclipse] - New e-b snapshot to update build on 3.7 RC3 - removed efj as it's part of eclipse-build now - remo

Thu Jun 2 18:23:07 UTC 2011

commit c5f789d91b4f2644caa05938148ff78ee50f6b37
Author: Chris Aniszczyk <caniszczyk at gmail.com>
Date:   Wed Jun 1 17:01:27 2011 -0500

    - New e-b snapshot to update build on 3.7 RC3
    - removed efj as it's part of eclipse-build now
    - removed usage of features
    
    Signed-off-by: Chris Aniszczyk <zx at redhat.com>

 .gitignore   |   36 +++---------------------------------
 eclipse.spec |   28 ++++++++++------------------
 efj.sh.in    |    6 ------
 sources      |    4 ++--
 4 files changed, 15 insertions(+), 59 deletions(-)
---

diff --git a/.gitignore b/.gitignore
index 4366514..9e4e303 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,33 +1,3 @@
-ecf-filetransfer-v20080611-1715.tar.bz2
-eclipse-ecj-gcj.tar.bz2
-eclipse-I20090611-1540-fetched-src.tar.bz2
-eclipse-build-R0_3_0.tar.gz
-ecf-filetransfer-v20090604-1131.tar.bz2
-eclipse-build-0_4_RC0.tar.gz
-eclipse-R3_5_1-fetched-src.tar.bz2
-eclipse-build-0.4.0RC0.tar.gz
-eclipse-build-0_4_RC3.tar.gz
-eclipse-build-0_4_RC4.tar.gz
-eclipse-build-R0_4_0.tar.gz
-eclipse-3.5.2-src.tar.bz2
-eclipse-build-0_5_0RC0.tar.gz
-eclipse-build-0.5.0.tar.bz2
-eclipse-3.6.0-src.tar.bz2
-eclipse-build-0.6.1RC0.tar.bz2
-eclipse-build-0_6_1_RC2.tar.bz2
-eclipse-build-0.6.1.tar.bz2
-eclipse-build-0.6.2RC0.tar.bz2
-eclipse-3.6.1-src.tar.bz2
-/eclipse-3.6.2-src.tar.bz2
-eclipse-build-bedb7791752e6bd2c954582489d43ece5229b49a.tar.bz2
-eclipse-build-0106a4c5904078e2e03d047210222a677337a1f1.tar.xz
-/eclipse-build-18efdaa0e10def52618f67199d1ccc4d21b8ab30.tar.xz
-/eclipse-build-074773feb001e726bbf254a61b68e47c5a8b5c05.tar.xz
-/eclipse-build-f67d432bd0b197665955ac7bb450a8f4712d0783.tar.xz
-/eclipse-build-6e174444f2517bbebb585a3e634c2f04af221c43.tar.xz
-/eclipse-3.7.0-I20110510-0800-src.tar.bz2
-/eclipse-build-cf93b86bacf8ba102cdb911a8aedfbebee4285df.tar.xz
-/eclipse-3.7.0-I20110512-2000-src.tar.bz2
-/eclipse-build-e9abe2e00591bb6a56a4c136fa2efd86e451d59c.tar.xz
-/eclipse-build-04609626a590e823870c883cc5314cde7ef63504.tar.xz
-/eclipse-build-a749348ab5d50d7e4e6db349ec468b9621e96d61.tar.xz
+eclipse-*-src.tar.bz2
+eclipse-build-*
+*.rpm
diff --git a/eclipse.spec b/eclipse.spec
index c35ed3d..738c8d0 100644
--- a/eclipse.spec
+++ b/eclipse.spec
@@ -23,13 +23,12 @@ Epoch:  1
 Summary:        An open, extensible IDE
 Name:           eclipse
 Version:        %{eclipse_majmin}.%{eclipse_micro}
-Release:        0.2.RC1%{?dist}
+Release:        0.3.RC3%{?dist}
 License:        EPL
 Group:          Text Editors/Integrated Development Environments (IDE)
 URL:            http://www.eclipse.org/
-Source0:        %{download_url}eclipse-build-a749348ab5d50d7e4e6db349ec468b9621e96d61.tar.xz
-Source1:        %{download_url}eclipse-3.7.0-I20110512-2000-src.tar.bz2
-Source17:       efj.sh.in
+Source0:        %{download_url}eclipse-build-72f69517dd6d60c307730f5aa59be90d06b22cc8.tar.xz
+Source1:        %{download_url}eclipse-3.7.0-I20110526-1708-src.tar.bz2
 # Patch to allow xpcom.cpp to build under latest xulrunner which has removed
 # a particular API and a type it depends on so we don't want to compile that
 # API
@@ -166,10 +165,10 @@ Eclipse Plugin Development Environment.  This package is required for
 developing Eclipse plugins.
 
 %prep
-%setup -q -n eclipse-build-a749348ab5d50d7e4e6db349ec468b9621e96d61
+%setup -q -n eclipse-build-72f69517dd6d60c307730f5aa59be90d06b22cc8
 cp %{SOURCE1} .
 ant -DbuildArch=%{eclipse_arch} applyPatches
-pushd build/eclipse-3.7.0-I20110512-2000-src
+pushd build/eclipse-3.7.0-I20110526-1708-src
 pushd plugins/org.eclipse.swt
 pushd Eclipse\ SWT\ Mozilla/common/library/
 %patch1
@@ -264,9 +263,6 @@ pushd $RPM_BUILD_ROOT%{_libdir}/%{name}
 ln -s ../%{name}/swt-gtk-%{eclipse_majmin}.%{eclipse_micro}.jar ../java/swt.jar
 popd
 
-# Install the efj wrapper script
-install -p -D -m0755 %{SOURCE17} $RPM_BUILD_ROOT%{_bindir}/efj
-
 # A sanity check.
 desktop-file-validate %{buildroot}/%{_datadir}/applications/%{name}.desktop
 
@@ -344,7 +340,6 @@ fi
 
 %files rcp
 %defattr(-,root,root)
-%dir %{_libdir}/%{name}/features
 %dir %{_datadir}/%{name}
 %if %{initialize}
 %{_libdir}/%{name}/configuration/org.eclipse.osgi/.bundledata*
@@ -363,7 +358,6 @@ fi
 %{_libdir}/%{name}/about_files
 %endif
 %{_libdir}/%{name}/readme
-%{_libdir}/%{name}/features/org.eclipse.rcp_*
 %{_libdir}/%{name}/plugins/org.eclipse.core.commands_*
 %{_libdir}/%{name}/plugins/org.eclipse.core.contenttype_*
 %{_libdir}/%{name}/plugins/org.eclipse.core.databinding_*
@@ -410,7 +404,6 @@ fi
 %{_libdir}/%{name}/eclipse
 %dir %{_libdir}/%{name}/dropins
 %dir %{_datadir}/%{name}/dropins
-%{_libdir}/%{name}/features/org.eclipse.platform_*
 %{_libdir}/%{name}/plugins/com.jcraft.jsch_*
 %{_libdir}/%{name}/plugins/javax.servlet_*
 %{_libdir}/%{name}/plugins/javax.servlet.jsp_*
@@ -491,16 +484,10 @@ fi
 %{_libdir}/%{name}/plugins/org.eclipse.cvs_*
 %{_libdir}/%{name}/plugins/org.eclipse.team.cvs.ssh2_*
 %{_libdir}/%{name}/plugins/org.eclipse.team.cvs.ui_*
-%{_libdir}/%{name}/features/org.eclipse.cvs_*
-%{_libdir}/%{name}/features/org.eclipse.help_*
 %{_libdir}/%{name}/plugins/org.apache.jasper_*
 %{_libdir}/%{name}/plugins/org.eclipse.equinox.frameworkadmin_*
 %{_libdir}/%{name}/plugins/org.eclipse.equinox.frameworkadmin.equinox_*
 %{_libdir}/%{name}/plugins/org.eclipse.equinox.simpleconfigurator.manipulator_*
-%{_libdir}/%{name}/features/org.eclipse.equinox.p2.core.feature_*
-%{_libdir}/%{name}/features/org.eclipse.equinox.p2.extras.feature_*
-%{_libdir}/%{name}/features/org.eclipse.equinox.p2.rcp.feature_*
-%{_libdir}/%{name}/features/org.eclipse.equinox.p2.user.ui_*
 %{_libdir}/%{name}/plugins/org.eclipse.equinox.p2.director_*
 %{_libdir}/%{name}/plugins/org.eclipse.equinox.p2.core_*
 %{_libdir}/%{name}/plugins/org.eclipse.equinox.p2.engine_*
@@ -560,6 +547,11 @@ fi
 %{_libdir}/%{name}/dropins/sdk
 
 %changelog
+* Thu Jun 02 2011 Chris Aniszczyk <zx at redhat.com> 1:3.7.0-0.3.RC3
+- New e-b snapshot to update build on 3.7 RC3
+- removed efj as it's part of eclipse-build now
+- removed usage of features
+
 * Tue May 17 2011 Chris Aniszczyk <zx at redhat.com> 1:3.7.0-0.2.RC1
 - New e-b snapshot, fixes org.eclipse.equinox.util issue
 - updated servlet and jsp related dependencies
diff --git a/sources b/sources
index 626dd41..ce053f0 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-734e567150b66bd8c4da083e2afa19ec  eclipse-3.7.0-I20110512-2000-src.tar.bz2
-fefae8aa961b46f518e0d2f8c316d1af  eclipse-build-a749348ab5d50d7e4e6db349ec468b9621e96d61.tar.xz
+00e1387dcd95c6e3d0743e4c64578ea3  eclipse-3.7.0-I20110526-1708-src.tar.bz2
+d72c685082f95c9117b63a787c956132  eclipse-build-72f69517dd6d60c307730f5aa59be90d06b22cc8.tar.xz
