- New e-b snapshot to update build on 3.7 RC4

- Added usage of features back

Signed-off-by: Chris Aniszczyk <zx@redhat.com>
This commit is contained in:
Chris Aniszczyk 2011-06-07 09:30:53 -05:00 committed by Chris Aniszczyk
parent c5f789d91b
commit 65fce14d09
2 changed files with 22 additions and 9 deletions

View File

@ -23,12 +23,12 @@ Epoch: 1
Summary: An open, extensible IDE
Name: eclipse
Version: %{eclipse_majmin}.%{eclipse_micro}
Release: 0.3.RC3%{?dist}
Release: 0.4.RC4%{?dist}
License: EPL
Group: Text Editors/Integrated Development Environments (IDE)
URL: http://www.eclipse.org/
Source0: %{download_url}eclipse-build-72f69517dd6d60c307730f5aa59be90d06b22cc8.tar.xz
Source1: %{download_url}eclipse-3.7.0-I20110526-1708-src.tar.bz2
Source0: %{download_url}eclipse-build-369d253fab5d971d17c5a782d97db6723bdeed5a.tar.xz
Source1: %{download_url}eclipse-3.7.0-I20110603-0909-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
@ -72,7 +72,7 @@ BuildRequires: junit >= 3.8.1-3jpp
BuildRequires: junit4
BuildRequires: hamcrest >= 0:1.1-9.2
BuildRequires: sat4j >= 2.3.0-1
BuildRequires: objectweb-asm
BuildRequires: objectweb-asm >= 3.3.1-1
%description
The Eclipse platform is designed for building integrated development
@ -152,7 +152,7 @@ Provides: eclipse = %{epoch}:%{version}-%{release}
Provides: eclipse-sdk = %{epoch}:%{version}-%{release}
Requires: %{name}-platform = %{epoch}:%{version}-%{release}
Requires: %{name}-jdt = %{epoch}:%{version}-%{release}
Requires: objectweb-asm
Requires: objectweb-asm >= 3.3.1-1
Requires: hamcrest >= 0:1.1-9.2
# For PDE Build wrapper script + creating jars
Requires: zip
@ -165,10 +165,10 @@ Eclipse Plugin Development Environment. This package is required for
developing Eclipse plugins.
%prep
%setup -q -n eclipse-build-72f69517dd6d60c307730f5aa59be90d06b22cc8
%setup -q -n eclipse-build-369d253fab5d971d17c5a782d97db6723bdeed5a
cp %{SOURCE1} .
ant -DbuildArch=%{eclipse_arch} applyPatches
pushd build/eclipse-3.7.0-I20110526-1708-src
pushd build/eclipse-3.7.0-I20110603-0909-src
pushd plugins/org.eclipse.swt
pushd Eclipse\ SWT\ Mozilla/common/library/
%patch1
@ -340,6 +340,7 @@ fi
%files rcp
%defattr(-,root,root)
%dir %{_libdir}/%{name}/features
%dir %{_datadir}/%{name}
%if %{initialize}
%{_libdir}/%{name}/configuration/org.eclipse.osgi/.bundledata*
@ -358,6 +359,7 @@ 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_*
@ -404,6 +406,7 @@ 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_*
@ -484,10 +487,16 @@ 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_*
@ -547,6 +556,10 @@ fi
%{_libdir}/%{name}/dropins/sdk
%changelog
* Tue Jun 07 2011 Chris Aniszczyk <zx@redhat.com> 1:3.7.0-0.4.RC4
- New e-b snapshot to update build on 3.7 RC4
- Added usage of features back
* Thu Jun 02 2011 Chris Aniszczyk <zx@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

View File

@ -1,2 +1,2 @@
00e1387dcd95c6e3d0743e4c64578ea3 eclipse-3.7.0-I20110526-1708-src.tar.bz2
d72c685082f95c9117b63a787c956132 eclipse-build-72f69517dd6d60c307730f5aa59be90d06b22cc8.tar.xz
98b76c619fb45ee4b17ef8af9fd7a973 eclipse-3.7.0-I20110603-0909-src.tar.bz2
dcc5ff2068286f88f76264e59dfb66b3 eclipse-build-369d253fab5d971d17c5a782d97db6723bdeed5a.tar.xz