Rebuild for ECF and disable the build of some bundles that are not shipped
This commit is contained in:
parent
cda67b1eea
commit
d96d2db4a8
17
eclipse.spec
17
eclipse.spec
@ -49,7 +49,7 @@ Epoch: 1
|
|||||||
Summary: An open, extensible IDE
|
Summary: An open, extensible IDE
|
||||||
Name: eclipse
|
Name: eclipse
|
||||||
Version: %{eclipse_version}
|
Version: %{eclipse_version}
|
||||||
Release: 4%{?dist}
|
Release: 5%{?dist}
|
||||||
License: EPL
|
License: EPL
|
||||||
URL: http://www.eclipse.org/
|
URL: http://www.eclipse.org/
|
||||||
|
|
||||||
@ -207,7 +207,7 @@ BuildRequires: atinject-tck >= 1-18
|
|||||||
BuildRequires: tycho >= 0.23.0
|
BuildRequires: tycho >= 0.23.0
|
||||||
BuildRequires: tycho-extras >= 0.23.0
|
BuildRequires: tycho-extras >= 0.23.0
|
||||||
BuildRequires: cbi-plugins
|
BuildRequires: cbi-plugins
|
||||||
BuildRequires: eclipse-ecf-core >= 3.12.2-1
|
BuildRequires: eclipse-ecf-core >= 3.12.2-2
|
||||||
BuildRequires: eclipse-emf-core >= 1:2.11.2-1
|
BuildRequires: eclipse-emf-core >= 1:2.11.2-1
|
||||||
BuildRequires: eclipse-license
|
BuildRequires: eclipse-license
|
||||||
BuildRequires: glassfish-jsp-api >= 2.2.1-4
|
BuildRequires: glassfish-jsp-api >= 2.2.1-4
|
||||||
@ -286,7 +286,7 @@ Requires: sac >= 1.3-12
|
|||||||
Requires: batik-css >= 1.8-0.17
|
Requires: batik-css >= 1.8-0.17
|
||||||
Requires: xml-commons-apis >= 1.4.01-12
|
Requires: xml-commons-apis >= 1.4.01-12
|
||||||
Requires: atinject >= 1-18
|
Requires: atinject >= 1-18
|
||||||
Requires: eclipse-ecf-core >= 3.12.2-1
|
Requires: eclipse-ecf-core >= 3.12.2-2
|
||||||
Requires: eclipse-emf-core >= 1:2.11.2-1
|
Requires: eclipse-emf-core >= 1:2.11.2-1
|
||||||
Requires: glassfish-jsp-api >= 2.2.1-4
|
Requires: glassfish-jsp-api >= 2.2.1-4
|
||||||
Requires: glassfish-jsp >= 2.2.5
|
Requires: glassfish-jsp >= 2.2.5
|
||||||
@ -409,7 +409,7 @@ popd
|
|||||||
# Resolving the target platform requires too many changes, so don't use it
|
# Resolving the target platform requires too many changes, so don't use it
|
||||||
%pom_xpath_remove "pom:configuration/pom:target" eclipse-platform-parent
|
%pom_xpath_remove "pom:configuration/pom:target" eclipse-platform-parent
|
||||||
|
|
||||||
# Disable as many things as possible to make the build faster. We care only for Eclipse.
|
# Disable as many products as possible to make the build faster, we care only for the IDE
|
||||||
%pom_disable_module platform.sdk eclipse.platform.releng.tychoeclipsebuilder
|
%pom_disable_module platform.sdk eclipse.platform.releng.tychoeclipsebuilder
|
||||||
%pom_disable_module rcp eclipse.platform.releng.tychoeclipsebuilder
|
%pom_disable_module rcp eclipse.platform.releng.tychoeclipsebuilder
|
||||||
%pom_disable_module rcp.sdk eclipse.platform.releng.tychoeclipsebuilder
|
%pom_disable_module rcp.sdk eclipse.platform.releng.tychoeclipsebuilder
|
||||||
@ -418,6 +418,7 @@ popd
|
|||||||
%pom_disable_module equinox-sdk eclipse.platform.releng.tychoeclipsebuilder
|
%pom_disable_module equinox-sdk eclipse.platform.releng.tychoeclipsebuilder
|
||||||
%pom_disable_module equinox.starterkit.product eclipse.platform.releng.tychoeclipsebuilder
|
%pom_disable_module equinox.starterkit.product eclipse.platform.releng.tychoeclipsebuilder
|
||||||
|
|
||||||
|
# Disable bundles that we don't ship as part of the remaining products
|
||||||
%pom_disable_module bundles/org.eclipse.equinox.region.tests rt.equinox.bundles
|
%pom_disable_module bundles/org.eclipse.equinox.region.tests rt.equinox.bundles
|
||||||
%pom_disable_module features/org.eclipse.equinox.weaving.sdk rt.equinox.bundles
|
%pom_disable_module features/org.eclipse.equinox.weaving.sdk rt.equinox.bundles
|
||||||
%pom_disable_module bundles/org.eclipse.equinox.cm.test rt.equinox.bundles
|
%pom_disable_module bundles/org.eclipse.equinox.cm.test rt.equinox.bundles
|
||||||
@ -437,6 +438,11 @@ popd
|
|||||||
%pom_disable_module features/org.eclipse.equinox.server.p2 rt.equinox.bundles
|
%pom_disable_module features/org.eclipse.equinox.server.p2 rt.equinox.bundles
|
||||||
%pom_disable_module features/org.eclipse.equinox.serverside.sdk rt.equinox.bundles
|
%pom_disable_module features/org.eclipse.equinox.serverside.sdk rt.equinox.bundles
|
||||||
%pom_disable_module bundles/org.eclipse.equinox.p2.tests.reconciler.product rt.equinox.p2
|
%pom_disable_module bundles/org.eclipse.equinox.p2.tests.reconciler.product rt.equinox.p2
|
||||||
|
%pom_disable_module bundles/org.eclipse.equinox.p2.artifact.optimizers rt.equinox.p2
|
||||||
|
%pom_disable_module bundles/org.eclipse.equinox.p2.artifact.processors rt.equinox.p2
|
||||||
|
%pom_disable_module bundles/ie.wombat.jbdiff rt.equinox.p2
|
||||||
|
%pom_disable_module bundles/ie.wombat.jbdiff.test rt.equinox.p2
|
||||||
|
%pom_disable_module tests/com.google.code.atinject.tck eclipse.platform.runtime
|
||||||
|
|
||||||
# We don't need support for Eclipse 2.x style plugins
|
# We don't need support for Eclipse 2.x style plugins
|
||||||
%pom_disable_module features/org.eclipse.osgi.compatibility.plugins.feature rt.equinox.framework
|
%pom_disable_module features/org.eclipse.osgi.compatibility.plugins.feature rt.equinox.framework
|
||||||
@ -1130,6 +1136,9 @@ fi
|
|||||||
%{_libdir}/%{pkg_name}/plugins/org.eclipse.osgi.compatibility.state_*
|
%{_libdir}/%{pkg_name}/plugins/org.eclipse.osgi.compatibility.state_*
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Wed Mar 16 2016 Mat Booth <mat.booth@redhat.com> - 1:4.5.2-5
|
||||||
|
- Rebuild for ECF and disable the build of some bundles that are not shipped
|
||||||
|
|
||||||
* Fri Mar 04 2016 Mat Booth <mat.booth@redhat.com> - 1:4.5.2-4
|
* Fri Mar 04 2016 Mat Booth <mat.booth@redhat.com> - 1:4.5.2-4
|
||||||
- Backport patch for ebz#488226 for incorrect content assist colors,
|
- Backport patch for ebz#488226 for incorrect content assist colors,
|
||||||
fixes rhbz#1253651 and rhbz#1196736
|
fixes rhbz#1253651 and rhbz#1196736
|
||||||
|
Loading…
Reference in New Issue
Block a user