Fix the Eclipse build.
- Enable bootstrap build to work around broken runtime Eclipse. - Make changes to deal with batik manifest update (1.6.0 to 1.7.0).
This commit is contained in:
parent
5d8802038d
commit
dd8ac278cd
12
eclipse.spec
12
eclipse.spec
@ -5,7 +5,7 @@
|
||||
# Set to 1 to build Eclipse without dependency to eclipse-pde
|
||||
# Some parts (help) will not be built, and second run will be required,
|
||||
# but this is a way to bootstrap Eclipse on secondary archs.
|
||||
%global bootstrap 0
|
||||
%global bootstrap 1
|
||||
|
||||
|
||||
Epoch: 1
|
||||
@ -55,7 +55,7 @@ fi;
|
||||
Summary: An open, extensible IDE
|
||||
Name: %{?scl_prefix}eclipse
|
||||
Version: %{eclipse_version}
|
||||
Release: 21%{?dist}
|
||||
Release: 20.1%{?dist}
|
||||
License: EPL
|
||||
Group: Development/Tools
|
||||
URL: http://www.eclipse.org/
|
||||
@ -447,6 +447,10 @@ cp -rf %{_libdir}/eclipse/dropins/sdk/plugins/org.eclipse.pde.core_* .m2/p2/repo
|
||||
sed -i -e 's@>org.eclipse.jdt<@>org.eclipse.tycho<@' eclipse-platform-parent/pom.xml
|
||||
%endif
|
||||
|
||||
# Bump batik from 1.6.0 to 1.7.0
|
||||
sed -i '/org\.apache\.batik/ s/1\.7\.0/1\.8\.0/' eclipse.platform.ui/bundles/org.eclipse.e4.ui.css.core/META-INF/MANIFEST.MF
|
||||
sed -i 's/1\.6\.0/1\.7\.0/' eclipse.platform.ui/features/org.eclipse.e4.rcp/feature.xml
|
||||
|
||||
%pom_remove_plugin org.mortbay.jetty:jetty-jspc-maven-plugin eclipse.platform.ua/org.eclipse.help.webapp
|
||||
%pom_remove_plugin org.eclipse.tycho:tycho-compiler-plugin rt.equinox.p2/org.eclipse.equinox.p2.releng/org.eclipse.equinox.p2-parent
|
||||
|
||||
@ -1015,8 +1019,10 @@ fi
|
||||
%{_libdir}/%{pkg_name}/plugins/org.eclipse.osgi.util_*
|
||||
|
||||
%changelog
|
||||
* Tue Feb 25 2014 Alexander Kurtakov <akurtako@redhat.com> 1:4.3.1-21
|
||||
* Tue Feb 25 2014 Alexander Kurtakov <akurtako@redhat.com> 1:4.3.1-20.1
|
||||
- Use new e-b snapshot that is adapted to ant packaging changes.
|
||||
- Enable bootstrap build to work around broken runtime Eclipse.
|
||||
- Make changes to deal with batik update (1.6.0 to 1.7.0).
|
||||
|
||||
* Fri Feb 21 2014 Alexander Kurtakov <akurtako@redhat.com> 1:4.3.1-20
|
||||
- Require java-headless in equinox-osgi.
|
||||
|
Loading…
Reference in New Issue
Block a user