Update to latest release candidate build
Rebuild for latest EMF and ECF Drop nashorn extension mechanism
This commit is contained in:
parent
514254ef98
commit
67799d4caa
@ -31,8 +31,8 @@
|
|||||||
-DGTK3_LIB="\"libgtk-3.so.0\"" -DGDK3_LIB="\"libgdk-3.so.0\"" \
|
-DGTK3_LIB="\"libgtk-3.so.0\"" -DGDK3_LIB="\"libgdk-3.so.0\"" \
|
||||||
-DPIXBUF_LIB="\"libgdk_pixbuf-2.0.so.0\"" -DGOBJ_LIB="\"libgobject-2.0.so.0\"" -DX11_LIB="\"libX11.so.6\""
|
-DPIXBUF_LIB="\"libgdk_pixbuf-2.0.so.0\"" -DGOBJ_LIB="\"libgobject-2.0.so.0\"" -DX11_LIB="\"libX11.so.6\""
|
||||||
LFLAGS = ${M_ARCH} -shared -fpic -Wl,--export-dynamic
|
LFLAGS = ${M_ARCH} -shared -fpic -Wl,--export-dynamic
|
||||||
-CFLAGS = ${M_ARCH} -g -s -Wall\
|
-CFLAGS = ${M_CFLAGS} ${M_ARCH} -g -s -Wall\
|
||||||
+CFLAGS = ${M_ARCH} -g -Wall\
|
+CFLAGS = ${M_CFLAGS} ${M_ARCH} -g -Wall\
|
||||||
-fpic \
|
-fpic \
|
||||||
-DLINUX \
|
-DLINUX \
|
||||||
-DMOZILLA_FIX \
|
-DMOZILLA_FIX \
|
||||||
|
@ -70,7 +70,7 @@
|
|||||||
</execution>
|
</execution>
|
||||||
--- eclipse.platform.releng/features/org.eclipse.platform-feature/pom.xml.orig 2014-11-28 15:27:07.874872769 +0000
|
--- eclipse.platform.releng/features/org.eclipse.platform-feature/pom.xml.orig 2014-11-28 15:27:07.874872769 +0000
|
||||||
+++ eclipse.platform.releng/features/org.eclipse.platform-feature/pom.xml 2014-11-28 15:31:02.592652099 +0000
|
+++ eclipse.platform.releng/features/org.eclipse.platform-feature/pom.xml 2014-11-28 15:31:02.592652099 +0000
|
||||||
@@ -73,6 +73,8 @@
|
@@ -72,6 +72,8 @@
|
||||||
<plugin id="org.eclipse.core.net.linux.x86_64"/>
|
<plugin id="org.eclipse.core.net.linux.x86_64"/>
|
||||||
<plugin id="org.eclipse.core.net.win32.x86"/>
|
<plugin id="org.eclipse.core.net.win32.x86"/>
|
||||||
<plugin id="org.eclipse.core.net.win32.x86_64"/>
|
<plugin id="org.eclipse.core.net.win32.x86_64"/>
|
||||||
@ -81,7 +81,7 @@
|
|||||||
</execution>
|
</execution>
|
||||||
--- eclipse.platform.ui/features/org.eclipse.e4.rcp/pom.xml.orig 2014-05-26 18:37:25.406426611 +0300
|
--- eclipse.platform.ui/features/org.eclipse.e4.rcp/pom.xml.orig 2014-05-26 18:37:25.406426611 +0300
|
||||||
+++ eclipse.platform.ui/features/org.eclipse.e4.rcp/pom.xml 2014-05-26 18:37:47.327449374 +0300
|
+++ eclipse.platform.ui/features/org.eclipse.e4.rcp/pom.xml 2014-05-26 18:37:47.327449374 +0300
|
||||||
@@ -46,6 +46,21 @@
|
@@ -45,6 +45,21 @@
|
||||||
<plugin id="org.eclipse.equinox.launcher.gtk.linux.x86_64"/>
|
<plugin id="org.eclipse.equinox.launcher.gtk.linux.x86_64"/>
|
||||||
<plugin id="org.eclipse.equinox.launcher.win32.win32.x86"/>
|
<plugin id="org.eclipse.equinox.launcher.win32.win32.x86"/>
|
||||||
<plugin id="org.eclipse.equinox.launcher.win32.win32.x86_64"/>
|
<plugin id="org.eclipse.equinox.launcher.win32.win32.x86_64"/>
|
||||||
@ -112,10 +112,10 @@
|
|||||||
- <requires>
|
- <requires>
|
||||||
- <import feature="org.eclipse.emf.common.source" version="2.7.0" match="compatible"/>
|
- <import feature="org.eclipse.emf.common.source" version="2.7.0" match="compatible"/>
|
||||||
- <import feature="org.eclipse.emf.ecore.source" version="2.7.0" match="compatible"/>
|
- <import feature="org.eclipse.emf.ecore.source" version="2.7.0" match="compatible"/>
|
||||||
- <import feature="org.eclipse.ecf.core.feature.source" version="1.3.0" match="compatible"/>
|
- <import feature="org.eclipse.ecf.core.feature.source" version="1.4.0" match="compatible"/>
|
||||||
- <import feature="org.eclipse.ecf.core.ssl.feature.source" version="1.1.0" match="compatible"/>
|
- <import feature="org.eclipse.ecf.core.ssl.feature.source" version="1.1.0" match="compatible"/>
|
||||||
- <import feature="org.eclipse.ecf.filetransfer.feature.source" version="3.13.3" match="compatible"/>
|
- <import feature="org.eclipse.ecf.filetransfer.feature.source" version="3.13.7" match="compatible"/>
|
||||||
- <import feature="org.eclipse.ecf.filetransfer.httpclient4.feature.source" version="3.13.3" match="compatible"/>
|
- <import feature="org.eclipse.ecf.filetransfer.httpclient4.feature.source" version="3.13.7" match="compatible"/>
|
||||||
- <import feature="org.eclipse.ecf.filetransfer.httpclient4.ssl.feature.source" version="1.1.0" match="compatible"/>
|
- <import feature="org.eclipse.ecf.filetransfer.httpclient4.ssl.feature.source" version="1.1.0" match="compatible"/>
|
||||||
- <import feature="org.eclipse.ecf.filetransfer.ssl.feature.source" version="1.1.0" match="compatible"/>
|
- <import feature="org.eclipse.ecf.filetransfer.ssl.feature.source" version="1.1.0" match="compatible"/>
|
||||||
- </requires>
|
- </requires>
|
||||||
|
33
eclipse.spec
33
eclipse.spec
@ -6,7 +6,7 @@
|
|||||||
Epoch: 1
|
Epoch: 1
|
||||||
|
|
||||||
%global eb_commit 2ec387778205043124434190b43f747551fd36fc
|
%global eb_commit 2ec387778205043124434190b43f747551fd36fc
|
||||||
%global eclipse_tag I20170515-0910
|
%global eclipse_tag S4_7_0_RC4a
|
||||||
|
|
||||||
%global _jetty_version 9.4.3
|
%global _jetty_version 9.4.3
|
||||||
%global _lucene_version 6.1.0
|
%global _lucene_version 6.1.0
|
||||||
@ -38,7 +38,7 @@ Epoch: 1
|
|||||||
Summary: An open, extensible IDE
|
Summary: An open, extensible IDE
|
||||||
Name: eclipse
|
Name: eclipse
|
||||||
Version: 4.7.0
|
Version: 4.7.0
|
||||||
Release: 0.13%{?dist}
|
Release: 0.14%{?dist}
|
||||||
License: EPL
|
License: EPL
|
||||||
URL: http://www.eclipse.org/
|
URL: http://www.eclipse.org/
|
||||||
|
|
||||||
@ -124,8 +124,8 @@ Patch29: fix_ant_build.patch
|
|||||||
Patch30: eclipse-hide-droplets-from-install-wizard.patch
|
Patch30: eclipse-hide-droplets-from-install-wizard.patch
|
||||||
|
|
||||||
BuildRequires: maven-local
|
BuildRequires: maven-local
|
||||||
BuildRequires: tycho >= 0.25.0
|
BuildRequires: tycho
|
||||||
BuildRequires: tycho-extras >= 0.25.0
|
BuildRequires: tycho-extras
|
||||||
BuildRequires: cbi-plugins
|
BuildRequires: cbi-plugins
|
||||||
BuildRequires: maven-antrun-plugin
|
BuildRequires: maven-antrun-plugin
|
||||||
BuildRequires: maven-enforcer-plugin
|
BuildRequires: maven-enforcer-plugin
|
||||||
@ -183,7 +183,7 @@ BuildRequires: lucene-queryparser >= %{_lucene_version}
|
|||||||
BuildRequires: lucene-analyzers-smartcn >= %{_lucene_version}
|
BuildRequires: lucene-analyzers-smartcn >= %{_lucene_version}
|
||||||
BuildRequires: junit >= 4.12
|
BuildRequires: junit >= 4.12
|
||||||
BuildRequires: hamcrest >= 1.3
|
BuildRequires: hamcrest >= 1.3
|
||||||
BuildRequires: sat4j >= 2.3.5-1
|
BuildRequires: sat4j
|
||||||
BuildRequires: objectweb-asm >= 5.0.3-1
|
BuildRequires: objectweb-asm >= 5.0.3-1
|
||||||
BuildRequires: sac
|
BuildRequires: sac
|
||||||
BuildRequires: batik-css
|
BuildRequires: batik-css
|
||||||
@ -191,8 +191,8 @@ BuildRequires: xml-commons-apis
|
|||||||
BuildRequires: atinject
|
BuildRequires: atinject
|
||||||
BuildRequires: atinject-tck
|
BuildRequires: atinject-tck
|
||||||
BuildRequires: eclipse-filesystem
|
BuildRequires: eclipse-filesystem
|
||||||
BuildRequires: eclipse-ecf-core >= 3.13.6-1
|
BuildRequires: eclipse-ecf-core >= 3.13.7-1
|
||||||
BuildRequires: eclipse-emf-core >= 1:2.13.0-0.1
|
BuildRequires: eclipse-emf-core >= 1:2.13.0-1
|
||||||
BuildRequires: eclipse-license
|
BuildRequires: eclipse-license
|
||||||
BuildRequires: glassfish-el-api >= 3.0.1
|
BuildRequires: glassfish-el-api >= 3.0.1
|
||||||
BuildRequires: glassfish-el >= 3.0.1
|
BuildRequires: glassfish-el >= 3.0.1
|
||||||
@ -204,11 +204,12 @@ BuildRequires: httpcomponents-client
|
|||||||
BuildRequires: xz-java
|
BuildRequires: xz-java
|
||||||
BuildRequires: mockito
|
BuildRequires: mockito
|
||||||
BuildRequires: osgi(osgi.annotation)
|
BuildRequires: osgi(osgi.annotation)
|
||||||
%if ! %{bootstrap}
|
|
||||||
# Build deps that are excluded when bootstrapping
|
# Build deps that are excluded when bootstrapping
|
||||||
|
%if ! %{bootstrap}
|
||||||
|
# For building docs and apitooling
|
||||||
BuildRequires: eclipse-pde
|
BuildRequires: eclipse-pde
|
||||||
# Build deps needed for contributor tools
|
# For contributor tools
|
||||||
BuildRequires: eclipse-egit >= 4.0.0
|
BuildRequires: eclipse-egit
|
||||||
BuildRequires: eclipse-emf-runtime
|
BuildRequires: eclipse-emf-runtime
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
@ -273,13 +274,13 @@ Requires: lucene-misc >= %{_lucene_version}
|
|||||||
Requires: lucene-analysis >= %{_lucene_version}
|
Requires: lucene-analysis >= %{_lucene_version}
|
||||||
Requires: lucene-queryparser >= %{_lucene_version}
|
Requires: lucene-queryparser >= %{_lucene_version}
|
||||||
Requires: lucene-analyzers-smartcn >= %{_lucene_version}
|
Requires: lucene-analyzers-smartcn >= %{_lucene_version}
|
||||||
Requires: sat4j >= 2.3.5-1
|
Requires: sat4j
|
||||||
Requires: sac
|
Requires: sac
|
||||||
Requires: batik-css
|
Requires: batik-css
|
||||||
Requires: xml-commons-apis
|
Requires: xml-commons-apis
|
||||||
Requires: atinject
|
Requires: atinject
|
||||||
Requires: eclipse-ecf-core >= 3.13.6-1
|
Requires: eclipse-ecf-core >= 3.13.7-1
|
||||||
Requires: eclipse-emf-core >= 1:2.13.0-0.1
|
Requires: eclipse-emf-core >= 1:2.13.0-1
|
||||||
Requires: glassfish-el-api >= 3.0.1
|
Requires: glassfish-el-api >= 3.0.1
|
||||||
Requires: glassfish-el >= 3.0.1
|
Requires: glassfish-el >= 3.0.1
|
||||||
Requires: glassfish-jsp-api >= 2.2.1-4
|
Requires: glassfish-jsp-api >= 2.2.1-4
|
||||||
@ -704,7 +705,6 @@ cat >> eclipse.ini <<EOF
|
|||||||
-Dorg.eclipse.equinox.p2.reconciler.dropins.directory=%{_datadir}/eclipse/dropins
|
-Dorg.eclipse.equinox.p2.reconciler.dropins.directory=%{_datadir}/eclipse/dropins
|
||||||
-Dp2.fragments=%{_eclipsedir}/droplets,%{_datadir}/eclipse/droplets
|
-Dp2.fragments=%{_eclipsedir}/droplets,%{_datadir}/eclipse/droplets
|
||||||
-Declipse.p2.skipMovedInstallDetection=true
|
-Declipse.p2.skipMovedInstallDetection=true
|
||||||
-Dosgi.framework.extensions=org.eclipse.wst.jsdt.nashorn.extension
|
|
||||||
EOF
|
EOF
|
||||||
|
|
||||||
popd #eclipse
|
popd #eclipse
|
||||||
@ -1047,6 +1047,11 @@ fi
|
|||||||
%{_eclipsedir}/plugins/org.eclipse.osgi.util_*
|
%{_eclipsedir}/plugins/org.eclipse.osgi.util_*
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Thu Jun 15 2017 Mat Booth <mat.booth@redhat.com> - 1:4.7.0-0.14
|
||||||
|
- Update to latest release candidate build
|
||||||
|
- Rebuild for latest EMF and ECF
|
||||||
|
- Drop nashorn extension mechanism
|
||||||
|
|
||||||
* Wed May 31 2017 Mikolaj Izdebski <mizdebsk@redhat.com> - 1:4.7.0-0.13
|
* Wed May 31 2017 Mikolaj Izdebski <mizdebsk@redhat.com> - 1:4.7.0-0.13
|
||||||
- Add missing build-requires on Maven plugins
|
- Add missing build-requires on Maven plugins
|
||||||
- Run xmvn in batch mode
|
- Run xmvn in batch mode
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
#!/bin/bash
|
#!/bin/bash
|
||||||
set -e
|
set -e
|
||||||
AGGREGATOR_PATH=git://git.eclipse.org/gitroot/platform/eclipse.platform.releng.aggregator.git
|
AGGREGATOR_PATH=git://git.eclipse.org/gitroot/platform/eclipse.platform.releng.aggregator.git
|
||||||
TAG=I20170515-0910
|
TAG=S4_7_0_RC4a
|
||||||
|
|
||||||
rm -rf R4_platform-aggregator-$TAG
|
rm -rf R4_platform-aggregator-$TAG
|
||||||
rm -rf R4_platform-aggregator-$TAG.tar.xz
|
rm -rf R4_platform-aggregator-$TAG.tar.xz
|
||||||
|
2
sources
2
sources
@ -1,2 +1,2 @@
|
|||||||
SHA512 (org.eclipse.linuxtools.eclipse-build-2ec387778205043124434190b43f747551fd36fc.tar.xz) = ce351ac1658304b9d2661dde73d7f0bd3e7e57c690cfac561bf08f4d14a3db0b7ffe0cac27d75f4ef7b31fefd7ebe65383e68873f8e0083758949dd7ec8f46b0
|
SHA512 (org.eclipse.linuxtools.eclipse-build-2ec387778205043124434190b43f747551fd36fc.tar.xz) = ce351ac1658304b9d2661dde73d7f0bd3e7e57c690cfac561bf08f4d14a3db0b7ffe0cac27d75f4ef7b31fefd7ebe65383e68873f8e0083758949dd7ec8f46b0
|
||||||
SHA512 (R4_platform-aggregator-I20170515-0910.tar.xz) = 92ac2c5ea80110540f7e180bef866594f6f457924857d62606c622bea2ac63920c9840466d64dad830b07b4f71549d68ad1db05a6278aade9e86ea58e2927a3f
|
SHA512 (R4_platform-aggregator-S4_7_0_RC4a.tar.xz) = e1b964d00e02511499a00d41fdc33ab522349046be1fd6e90b0fe3b233d120016a2353a668d3493720b381c3639eb84da2793c6b2dc3044bdcbf037cf1bdd17f
|
||||||
|
Loading…
Reference in New Issue
Block a user