Update to final Luna release
- Rebuild against newer dependencies
This commit is contained in:
parent
36ec014308
commit
1f23ca884b
33
eclipse.spec
33
eclipse.spec
@ -12,13 +12,11 @@ Epoch: 1
|
|||||||
|
|
||||||
%global eclipse_major 4
|
%global eclipse_major 4
|
||||||
%global eclipse_minor 4
|
%global eclipse_minor 4
|
||||||
%global eclipse_majmin %{eclipse_major}.%{eclipse_minor}
|
|
||||||
%global eclipse_micro 0
|
%global eclipse_micro 0
|
||||||
%global initialize 1
|
|
||||||
%global eb_commit 27d9371a79744f02da09de58db140256a6a9b9e7
|
%global eb_commit 27d9371a79744f02da09de58db140256a6a9b9e7
|
||||||
%global eclipse_tag I20140604-2000
|
%global eclipse_tag R4_4
|
||||||
%global eclipse_version %{eclipse_majmin}.%{eclipse_micro}
|
%global eclipse_version %{eclipse_major}.%{eclipse_minor}.%{eclipse_micro}
|
||||||
%global _jetty_version 9.1.3
|
%global _jetty_version 9.2.1
|
||||||
|
|
||||||
%ifarch %{ix86}
|
%ifarch %{ix86}
|
||||||
%define eclipse_arch x86
|
%define eclipse_arch x86
|
||||||
@ -41,11 +39,12 @@ 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.31.git201406042000%{?dist}
|
Release: 1%{?dist}
|
||||||
License: EPL
|
License: EPL
|
||||||
Group: Development/Tools
|
Group: Development/Tools
|
||||||
URL: http://www.eclipse.org/
|
URL: http://www.eclipse.org/
|
||||||
#get-eclipse.sh
|
|
||||||
|
# Tarball generated by calling ./get-eclipse.sh
|
||||||
Source0: R4_platform-aggregator-%{eclipse_tag}.tar.xz
|
Source0: R4_platform-aggregator-%{eclipse_tag}.tar.xz
|
||||||
Source1: http://git.eclipse.org/c/linuxtools/org.eclipse.linuxtools.eclipse-build.git/snapshot/org.eclipse.linuxtools.eclipse-build-%{eb_commit}.tar.bz2
|
Source1: http://git.eclipse.org/c/linuxtools/org.eclipse.linuxtools.eclipse-build.git/snapshot/org.eclipse.linuxtools.eclipse-build-%{eb_commit}.tar.bz2
|
||||||
|
|
||||||
@ -147,8 +146,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.8.0-1
|
BuildRequires: %{?scl_prefix}lucene-core >= 4.8.1-3
|
||||||
BuildRequires: %{?scl_prefix}lucene-analysis >= 4.8.0-1
|
BuildRequires: %{?scl_prefix}lucene-analysis >= 4.8.1-3
|
||||||
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
|
||||||
@ -160,8 +159,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-ecf-core >= 3.8.0-1
|
BuildRequires: eclipse-ecf-core >= 3.8.1-1
|
||||||
BuildRequires: eclipse-emf-core >= 1:2.9.2-2
|
BuildRequires: eclipse-emf-core >= 1:2.10.0-1
|
||||||
BuildRequires: glassfish-jsp-api >= 2.2.1-4
|
BuildRequires: glassfish-jsp-api >= 2.2.1-4
|
||||||
BuildRequires: glassfish-jsp >= 2.2.5
|
BuildRequires: glassfish-jsp >= 2.2.5
|
||||||
BuildRequires: glassfish-servlet-api >= 3.1.0
|
BuildRequires: glassfish-servlet-api >= 3.1.0
|
||||||
@ -220,16 +219,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.8.0-1
|
Requires: %{?scl_prefix}lucene-core >= 4.8.1-3
|
||||||
Requires: %{?scl_prefix}lucene-analysis >= 4.8.0-1
|
Requires: %{?scl_prefix}lucene-analysis >= 4.8.1-3
|
||||||
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: eclipse-ecf-core >= 3.8.0-1
|
Requires: eclipse-ecf-core >= 3.8.1-1
|
||||||
Requires: eclipse-emf-core >= 1:2.9.2-2
|
Requires: eclipse-emf-core >= 1:2.10.0-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
|
||||||
Requires: glassfish-servlet-api >= 3.1.0
|
Requires: glassfish-servlet-api >= 3.1.0
|
||||||
@ -994,6 +993,10 @@ fi
|
|||||||
%{_libdir}/%{pkg_name}/plugins/org.eclipse.osgi.compatibility.state_*
|
%{_libdir}/%{pkg_name}/plugins/org.eclipse.osgi.compatibility.state_*
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Wed Jun 25 2014 Mat Booth <mat.booth@redhat.com> - 1:4.4.0-1
|
||||||
|
- Update to final Luna release
|
||||||
|
- Rebuild against newer dependencies
|
||||||
|
|
||||||
* Tue Jun 24 2014 Alexander Kurtakov <akurtako@redhat.com> 1:4.4.0-0.31.git201406042000
|
* Tue Jun 24 2014 Alexander Kurtakov <akurtako@redhat.com> 1:4.4.0-0.31.git201406042000
|
||||||
- Non bootstrap build.
|
- Non bootstrap build.
|
||||||
|
|
||||||
|
@ -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=I20140604-2000
|
TAG=R4_4
|
||||||
|
|
||||||
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
|
||||||
|
Loading…
Reference in New Issue
Block a user