Update to latest I-build of Luna 4.4.0
- New e-b snapshot for updated gnome appdata - Rebuilt for new dependency versions.
This commit is contained in:
parent
2ef21fd1fd
commit
ec734db413
47
eclipse.spec
47
eclipse.spec
|
@ -15,8 +15,8 @@ Epoch: 1
|
||||||
%global eclipse_majmin %{eclipse_major}.%{eclipse_minor}
|
%global eclipse_majmin %{eclipse_major}.%{eclipse_minor}
|
||||||
%global eclipse_micro 0
|
%global eclipse_micro 0
|
||||||
%global initialize 1
|
%global initialize 1
|
||||||
%global eb_commit 718530cb80abfabdebe3d2ea19d0e842dc1dd314
|
%global eb_commit ebb132b8e5d9235ca3ef5ecb54029594abd77dcd
|
||||||
%global eclipse_tag I20140501-0200
|
%global eclipse_tag I20140506-2000
|
||||||
%global eclipse_version %{eclipse_majmin}.%{eclipse_micro}
|
%global eclipse_version %{eclipse_majmin}.%{eclipse_micro}
|
||||||
|
|
||||||
%global _jetty_version 9.1.3
|
%global _jetty_version 9.1.3
|
||||||
|
@ -43,7 +43,7 @@ Epoch: 1
|
||||||
Summary: An open, extensible IDE
|
Summary: An open, extensible IDE
|
||||||
Name: %{?scl_prefix}eclipse
|
Name: %{?scl_prefix}eclipse
|
||||||
Version: %{eclipse_version}
|
Version: %{eclipse_version}
|
||||||
Release: 0.16.git201405010200%{?dist}
|
Release: 0.17.git201405062000%{?dist}
|
||||||
License: EPL
|
License: EPL
|
||||||
Group: Development/Tools
|
Group: Development/Tools
|
||||||
URL: http://www.eclipse.org/
|
URL: http://www.eclipse.org/
|
||||||
|
@ -128,7 +128,7 @@ BuildRequires: mesa-libGLU-devel
|
||||||
BuildRequires: cairo >= 1.0
|
BuildRequires: cairo >= 1.0
|
||||||
BuildRequires: unzip
|
BuildRequires: unzip
|
||||||
BuildRequires: desktop-file-utils
|
BuildRequires: desktop-file-utils
|
||||||
BuildRequires: java-devel >= 1:1.8.0
|
BuildRequires: java-1.8.0-openjdk-devel
|
||||||
BuildRequires: libXt-devel
|
BuildRequires: libXt-devel
|
||||||
BuildRequires: webkitgtk-devel
|
BuildRequires: webkitgtk-devel
|
||||||
BuildRequires: webkitgtk3
|
BuildRequires: webkitgtk3
|
||||||
|
@ -140,8 +140,8 @@ BuildRequires: jsch >= 0:0.1.46-2
|
||||||
BuildRequires: apache-commons-el >= 1.0-22
|
BuildRequires: apache-commons-el >= 1.0-22
|
||||||
BuildRequires: apache-commons-logging
|
BuildRequires: apache-commons-logging
|
||||||
BuildRequires: apache-commons-codec >= 1.6-2
|
BuildRequires: apache-commons-codec >= 1.6-2
|
||||||
BuildRequires: %{?scl_prefix}felix-gogo-command >= 0.12
|
BuildRequires: felix-gogo-command >= 0.12
|
||||||
BuildRequires: %{?scl_prefix}felix-gogo-shell >= 0.10.0-3
|
BuildRequires: felix-gogo-shell >= 0.10.0-3
|
||||||
BuildRequires: osgi(org.eclipse.jetty.util) >= %{_jetty_version}
|
BuildRequires: osgi(org.eclipse.jetty.util) >= %{_jetty_version}
|
||||||
BuildRequires: osgi(org.eclipse.jetty.server) >= %{_jetty_version}
|
BuildRequires: osgi(org.eclipse.jetty.server) >= %{_jetty_version}
|
||||||
BuildRequires: osgi(org.eclipse.jetty.http) >= %{_jetty_version}
|
BuildRequires: osgi(org.eclipse.jetty.http) >= %{_jetty_version}
|
||||||
|
@ -149,8 +149,8 @@ BuildRequires: osgi(org.eclipse.jetty.continuation) >= %{_jetty_version}
|
||||||
BuildRequires: osgi(org.eclipse.jetty.io) >= %{_jetty_version}
|
BuildRequires: osgi(org.eclipse.jetty.io) >= %{_jetty_version}
|
||||||
BuildRequires: osgi(org.eclipse.jetty.security) >= %{_jetty_version}
|
BuildRequires: osgi(org.eclipse.jetty.security) >= %{_jetty_version}
|
||||||
BuildRequires: osgi(org.eclipse.jetty.servlet) >= %{_jetty_version}
|
BuildRequires: osgi(org.eclipse.jetty.servlet) >= %{_jetty_version}
|
||||||
BuildRequires: %{?scl_prefix}lucene-core >= 4.7.2-1
|
BuildRequires: %{?scl_prefix}lucene-core >= 4.8.0-1
|
||||||
BuildRequires: %{?scl_prefix}lucene-analysis >= 4.7.2-1
|
BuildRequires: %{?scl_prefix}lucene-analysis >= 4.8.0-1
|
||||||
BuildRequires: junit >= 4.10-5
|
BuildRequires: junit >= 4.10-5
|
||||||
BuildRequires: hamcrest >= 0:1.1-11
|
BuildRequires: hamcrest >= 0:1.1-11
|
||||||
BuildRequires: %{?scl_prefix}sat4j >= 2.3.5-1
|
BuildRequires: %{?scl_prefix}sat4j >= 2.3.5-1
|
||||||
|
@ -162,8 +162,8 @@ BuildRequires: xml-commons-apis >= 1.4.01-12
|
||||||
BuildRequires: atinject >= 1-6
|
BuildRequires: atinject >= 1-6
|
||||||
BuildRequires: tycho >= 0.19
|
BuildRequires: tycho >= 0.19
|
||||||
BuildRequires: tycho-extras >= 0.19
|
BuildRequires: tycho-extras >= 0.19
|
||||||
BuildRequires: eclipse-emf-core >= 1:2.9.2-1
|
BuildRequires: eclipse-ecf-core >= 3.8.0-1
|
||||||
BuildRequires: %{?scl_prefix}eclipse-ecf-core >= 3.8.0-1
|
BuildRequires: eclipse-emf-core >= 1:2.9.2-2
|
||||||
BuildRequires: tomcat-servlet-3.0-api
|
BuildRequires: tomcat-servlet-3.0-api
|
||||||
BuildRequires: tomcat-el-2.2-api
|
BuildRequires: tomcat-el-2.2-api
|
||||||
BuildRequires: glassfish-jsp-api >= 2.2.1-4
|
BuildRequires: glassfish-jsp-api >= 2.2.1-4
|
||||||
|
@ -217,8 +217,8 @@ Requires: ant-javamail ant-jdepend ant-junit ant-swing ant-jsch ant-testutil ant
|
||||||
Requires: apache-commons-el >= 1.0-23
|
Requires: apache-commons-el >= 1.0-23
|
||||||
Requires: apache-commons-logging
|
Requires: apache-commons-logging
|
||||||
Requires: apache-commons-codec >= 1.6-2
|
Requires: apache-commons-codec >= 1.6-2
|
||||||
Requires: %{?scl_prefix}felix-gogo-command >= 0.12
|
Requires: felix-gogo-command >= 0.12
|
||||||
Requires: %{?scl_prefix}felix-gogo-shell >= 0.10.0-3
|
Requires: felix-gogo-shell >= 0.10.0-3
|
||||||
Requires: osgi(org.eclipse.jetty.util) >= %{_jetty_version}
|
Requires: osgi(org.eclipse.jetty.util) >= %{_jetty_version}
|
||||||
Requires: osgi(org.eclipse.jetty.server) >= %{_jetty_version}
|
Requires: osgi(org.eclipse.jetty.server) >= %{_jetty_version}
|
||||||
Requires: osgi(org.eclipse.jetty.http) >= %{_jetty_version}
|
Requires: osgi(org.eclipse.jetty.http) >= %{_jetty_version}
|
||||||
|
@ -227,16 +227,16 @@ Requires: osgi(org.eclipse.jetty.io) >= %{_jetty_version}
|
||||||
Requires: osgi(org.eclipse.jetty.security) >= %{_jetty_version}
|
Requires: osgi(org.eclipse.jetty.security) >= %{_jetty_version}
|
||||||
Requires: osgi(org.eclipse.jetty.servlet) >= %{_jetty_version}
|
Requires: osgi(org.eclipse.jetty.servlet) >= %{_jetty_version}
|
||||||
Requires: jsch >= 0.1.46-2
|
Requires: jsch >= 0.1.46-2
|
||||||
Requires: %{?scl_prefix}lucene-core >= 4.7.2-1
|
Requires: %{?scl_prefix}lucene-core >= 4.8.0-1
|
||||||
Requires: %{?scl_prefix}lucene-analysis >= 4.7.2-1
|
Requires: %{?scl_prefix}lucene-analysis >= 4.8.0-1
|
||||||
Requires: %{?scl_prefix}sat4j >= 2.3.5-1
|
Requires: %{?scl_prefix}sat4j >= 2.3.5-1
|
||||||
Requires: sac >= 1.3-12
|
Requires: sac >= 1.3-12
|
||||||
Requires: xml-commons-apis >= 1.4.01-12
|
Requires: xml-commons-apis >= 1.4.01-12
|
||||||
Requires: batik >= 1.8
|
Requires: batik >= 1.8
|
||||||
Requires: atinject >= 1-6
|
Requires: atinject >= 1-6
|
||||||
Requires: geronimo-annotation >= 1.0-7
|
Requires: geronimo-annotation >= 1.0-7
|
||||||
Requires: %{?scl_prefix}eclipse-ecf-core >= 3.8.0-1
|
Requires: eclipse-ecf-core >= 3.8.0-1
|
||||||
Requires: eclipse-emf-core >= 2.9.2-1
|
Requires: eclipse-emf-core >= 1:2.9.2-2
|
||||||
Requires: tomcat-servlet-3.0-api
|
Requires: tomcat-servlet-3.0-api
|
||||||
Requires: tomcat-el-2.2-api
|
Requires: tomcat-el-2.2-api
|
||||||
Requires: glassfish-jsp-api >= 2.2.1-4
|
Requires: glassfish-jsp-api >= 2.2.1-4
|
||||||
|
@ -362,10 +362,16 @@ tar --strip-components=1 -xf %{SOURCE1}
|
||||||
# Remove platform-specific stuff that we don't care about to reduce build time
|
# Remove platform-specific stuff that we don't care about to reduce build time
|
||||||
# (i.e., all bundles that are only applicable on non-linux platforms)
|
# (i.e., all bundles that are only applicable on non-linux platforms)
|
||||||
for b in `ls eclipse.platform.swt.binaries/bundles | grep -P -e 'org.eclipse.swt\.(?!gtk\.linux)'` ; do
|
for b in `ls eclipse.platform.swt.binaries/bundles | grep -P -e 'org.eclipse.swt\.(?!gtk\.linux)'` ; do
|
||||||
grep -q ">bundles/$b<" eclipse.platform.swt.binaries/pom.xml && %pom_disable_module bundles/$b eclipse.platform.swt.binaries
|
module=$(grep ">bundles/$b<" eclipse.platform.swt.binaries/pom.xml || :)
|
||||||
|
if [ -n "$module" ] ; then
|
||||||
|
%pom_disable_module bundles/$b eclipse.platform.swt.binaries
|
||||||
|
fi
|
||||||
done
|
done
|
||||||
for b in `ls rt.equinox.framework/bundles | grep -P -e 'org.eclipse.equinox.launcher\.(?!gtk\.linux)'` ; do
|
for b in `ls rt.equinox.framework/bundles | grep -P -e 'org.eclipse.equinox.launcher\.(?!gtk\.linux)'` ; do
|
||||||
grep -q ">bundles/$b<" rt.equinox.framework/pom.xml && %pom_disable_module bundles/$b rt.equinox.framework
|
module=$(grep ">bundles/$b<" rt.equinox.framework/pom.xml || :)
|
||||||
|
if [ -n "$module" ] ; then
|
||||||
|
%pom_disable_module bundles/$b rt.equinox.framework
|
||||||
|
fi
|
||||||
done
|
done
|
||||||
%pom_disable_module org.eclipse.jdt.launching.macosx eclipse.jdt.debug
|
%pom_disable_module org.eclipse.jdt.launching.macosx eclipse.jdt.debug
|
||||||
%pom_disable_module org.eclipse.jdt.launching.ui.macosx eclipse.jdt.debug
|
%pom_disable_module org.eclipse.jdt.launching.ui.macosx eclipse.jdt.debug
|
||||||
|
@ -990,6 +996,11 @@ fi
|
||||||
%{_libdir}/%{pkg_name}/plugins/org.eclipse.osgi.compatibility.state_*
|
%{_libdir}/%{pkg_name}/plugins/org.eclipse.osgi.compatibility.state_*
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Wed May 07 2014 Mat Booth <mat.booth@redhat.com> - 1:4.4.0-0.17.git201405062000
|
||||||
|
- Update to latest I-build of Luna 4.4.0
|
||||||
|
- New e-b snapshot for updated gnome appdata
|
||||||
|
- Rebuilt for new dependency versions.
|
||||||
|
|
||||||
* Thu May 01 2014 Mat Booth <mat.booth@redhat.com> - 1:4.4.0-0.16.git201405010200
|
* Thu May 01 2014 Mat Booth <mat.booth@redhat.com> - 1:4.4.0-0.16.git201405010200
|
||||||
- Update to latest I-build of Luna 4.4.0
|
- Update to latest I-build of Luna 4.4.0
|
||||||
|
|
||||||
|
|
|
@ -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=I20140501-0200
|
TAG=I20140506-2000
|
||||||
|
|
||||||
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
|
||||||
|
|
4
sources
4
sources
|
@ -1,2 +1,2 @@
|
||||||
89f46935ac71012a6bce13b2fe3c25c4 org.eclipse.linuxtools.eclipse-build-718530cb80abfabdebe3d2ea19d0e842dc1dd314.tar.bz2
|
cc545b1682c05825e6036f70ba55d360 R4_platform-aggregator-I20140506-2000.tar.xz
|
||||||
c7d53d78f7c54e43919aaddd3df13ab1 R4_platform-aggregator-I20140501-0200.tar.xz
|
7f4dfd229b4c33333dff9af1ce875383 org.eclipse.linuxtools.eclipse-build-ebb132b8e5d9235ca3ef5ecb54029594abd77dcd.tar.bz2
|
||||||
|
|
Loading…
Reference in New Issue