- New e-b snapshot - first eclipse 3.7 build based on 3.7 RC1.
Signed-off-by: Chris Aniszczyk <zx@redhat.com>
This commit is contained in:
Chris Aniszczyk
Chris Aniszczyk
parent
08d4641625
commit
539fd3f99d
|
|
@ -25,3 +25,8 @@ eclipse-build-0106a4c5904078e2e03d047210222a677337a1f1.tar.xz
|
|||
/eclipse-build-074773feb001e726bbf254a61b68e47c5a8b5c05.tar.xz
|
||||
/eclipse-build-f67d432bd0b197665955ac7bb450a8f4712d0783.tar.xz
|
||||
/eclipse-build-6e174444f2517bbebb585a3e634c2f04af221c43.tar.xz
|
||||
/eclipse-3.7.0-I20110510-0800-src.tar.bz2
|
||||
/eclipse-build-cf93b86bacf8ba102cdb911a8aedfbebee4285df.tar.xz
|
||||
/eclipse-3.7.0-I20110512-2000-src.tar.bz2
|
||||
/eclipse-build-e9abe2e00591bb6a56a4c136fa2efd86e451d59c.tar.xz
|
||||
/eclipse-build-04609626a590e823870c883cc5314cde7ef63504.tar.xz
|
||||
|
|
|
|||
59
eclipse.spec
59
eclipse.spec
|
|
@ -1,11 +1,11 @@
|
|||
Epoch: 1
|
||||
|
||||
%global eclipse_major 3
|
||||
%global eclipse_minor 6
|
||||
%global eclipse_minor 7
|
||||
%global eclipse_majmin %{eclipse_major}.%{eclipse_minor}
|
||||
%global eclipse_micro 2
|
||||
%global eclipse_micro 0
|
||||
%global initialize 1
|
||||
%global download_url http://download.eclipse.org/technology/linuxtools/eclipse-build/3.6.x_Helios/
|
||||
%global download_url http://download.eclipse.org/technology/linuxtools/eclipse-build/3.7.x_Indigo/
|
||||
|
||||
# All arches line up between Eclipse and Linux kernel names except i386 -> x86
|
||||
%ifarch %{ix86}
|
||||
|
|
@ -23,12 +23,12 @@ Epoch: 1
|
|||
Summary: An open, extensible IDE
|
||||
Name: eclipse
|
||||
Version: %{eclipse_majmin}.%{eclipse_micro}
|
||||
Release: 5%{?dist}
|
||||
Release: 0.1.RC1%{?dist}
|
||||
License: EPL
|
||||
Group: Text Editors/Integrated Development Environments (IDE)
|
||||
URL: http://www.eclipse.org/
|
||||
Source0: %{download_url}eclipse-build-6e174444f2517bbebb585a3e634c2f04af221c43.tar.xz
|
||||
Source1: %{download_url}eclipse-%{version}-src.tar.bz2
|
||||
Source0: %{download_url}eclipse-build-04609626a590e823870c883cc5314cde7ef63504.tar.xz
|
||||
Source1: %{download_url}eclipse-3.7.0-I20110512-2000-src.tar.bz2
|
||||
Source17: efj.sh.in
|
||||
# Patch to allow xpcom.cpp to build under latest xulrunner which has removed
|
||||
# a particular API and a type it depends on so we don't want to compile that
|
||||
|
|
@ -55,20 +55,20 @@ BuildRequires: libXt-devel
|
|||
BuildRequires: xulrunner-devel
|
||||
BuildRequires: webkitgtk-devel
|
||||
|
||||
BuildRequires: icu4j-eclipse >= 1:4.2.1-1
|
||||
BuildRequires: icu4j-eclipse >= 1:4.4.2-2
|
||||
BuildRequires: tomcat5-jasper-eclipse >= 5.5.27-6.3
|
||||
BuildRequires: tomcat6-servlet-2.5-api >= 6.0.18-9.2
|
||||
BuildRequires: tomcat6-jsp-2.1-api
|
||||
BuildRequires: ant-antlr ant-apache-bcel ant-apache-log4j ant-apache-oro ant-apache-regexp ant-apache-resolver ant-commons-logging ant-apache-bsf ant-commons-net
|
||||
BuildRequires: ant-javamail ant-jdepend ant-junit ant-swing ant-jsch
|
||||
BuildRequires: ant-javamail ant-jdepend ant-junit ant-swing ant-jsch ant-testutil ant-apache-xalan2 ant-jmf
|
||||
BuildRequires: jsch >= 0:0.1.41
|
||||
BuildRequires: apache-commons-el
|
||||
BuildRequires: apache-commons-logging
|
||||
BuildRequires: apache-commons-codec
|
||||
BuildRequires: jakarta-commons-httpclient
|
||||
BuildRequires: jetty >= 6.1.24-1
|
||||
BuildRequires: lucene >= 2.3.1-3.4
|
||||
BuildRequires: lucene-contrib >= 2.3.1-3.4
|
||||
BuildRequires: lucene >= 2.9.4-5
|
||||
BuildRequires: lucene-contrib >= 2.9.4-5
|
||||
BuildRequires: junit >= 3.8.1-3jpp
|
||||
BuildRequires: junit4
|
||||
BuildRequires: hamcrest >= 0:1.1-9.2
|
||||
|
|
@ -101,7 +101,7 @@ SWT Library for GTK+-2.0.
|
|||
Summary: Eclipse Rich Client Platform
|
||||
Group: Development/Languages
|
||||
Requires: %{name}-swt = %{epoch}:%{version}-%{release}
|
||||
Requires: icu4j-eclipse >= 1:4.2.1-1
|
||||
Requires: icu4j-eclipse >= 1:4.4.2-2
|
||||
Requires: java >= 1.6.0
|
||||
|
||||
%description rcp
|
||||
|
|
@ -112,7 +112,7 @@ Summary: Eclipse platform common files
|
|||
Group: Text Editors/Integrated Development Environments (IDE)
|
||||
Requires: %{name}-rcp = %{epoch}:%{version}-%{release}
|
||||
Requires: ant-antlr ant-apache-bcel ant-apache-log4j ant-apache-oro ant-apache-regexp ant-apache-resolver ant-commons-logging ant-apache-bsf ant-commons-net
|
||||
Requires: ant-javamail ant-jdepend ant-junit ant-swing ant-jsch
|
||||
Requires: ant-javamail ant-jdepend ant-junit ant-swing ant-jsch ant-testutil ant-apache-xalan2 ant-jmf
|
||||
Requires: apache-commons-el
|
||||
Requires: apache-commons-logging
|
||||
Requires: apache-commons-codec
|
||||
|
|
@ -121,8 +121,8 @@ Requires: tomcat6-servlet-2.5-api >= 6.0.18-9.2
|
|||
Requires: tomcat6-jsp-2.1-api
|
||||
Requires: jetty >= 6.1.24-1
|
||||
Requires: jsch >= 0.1.41
|
||||
Requires: lucene >= 2.3.1-3.4
|
||||
Requires: lucene-contrib >= 2.3.1-3.4
|
||||
Requires: lucene >= 2.9.4-5
|
||||
Requires: lucene-contrib >= 2.9.4-5
|
||||
Requires: sat4j >= 2.3.0-1
|
||||
Provides: eclipse-cvs-client = 1:%{version}-%{release}
|
||||
Obsoletes: eclipse-cvs-client < 1:3.3.2-20
|
||||
|
|
@ -166,10 +166,10 @@ Eclipse Plugin Development Environment. This package is required for
|
|||
developing Eclipse plugins.
|
||||
|
||||
%prep
|
||||
%setup -q -n eclipse-build-master
|
||||
%setup -q -n eclipse-build-04609626a590e823870c883cc5314cde7ef63504
|
||||
cp %{SOURCE1} .
|
||||
ant -DbuildArch=%{eclipse_arch} applyPatches
|
||||
pushd build/eclipse-%{version}-src
|
||||
pushd build/eclipse-3.7.0-I20110512-2000-src
|
||||
pushd plugins/org.eclipse.swt
|
||||
pushd Eclipse\ SWT\ Mozilla/common/library/
|
||||
%patch1
|
||||
|
|
@ -184,7 +184,6 @@ sed -i -e "s|http://java.sun.com/j2se/1.4.2/docs/api|%{_datadir}/javadoc/java|"
|
|||
plugins/org.eclipse.platform.doc.isv/platformOptions.txt
|
||||
sed -i -e "s|http://java.sun.com/j2se/1.5/docs/api|%{_datadir}/javadoc/java|" \
|
||||
-e "s/win32.win32.x86/gtk.linux.%{eclipse_arch}/" \
|
||||
plugins/org.eclipse.jdt.doc.isv/jdtaptOptions.txt \
|
||||
plugins/org.eclipse.jdt.doc.isv/jdtOptions.txt
|
||||
sed -i -e "s|http://java.sun.com/j2se/1.4/docs/api|%{_datadir}/javadoc/java|" \
|
||||
-e "s/motif.linux.x86/gtk.linux.%{eclipse_arch}/" \
|
||||
|
|
@ -196,11 +195,11 @@ sed -i -e "s|http://java.sun.com/j2se/1.4/docs/api|%{_datadir}/javadoc/java|" \
|
|||
#
|
||||
# the swt version is set to HEAD on s390x but shouldn't be
|
||||
# get swt version
|
||||
SWT_MAJ_VER=$(grep maj_ver plugins/org.eclipse.swt/Eclipse\ SWT/common/library/make_common.mak | cut -f 2 -d =)
|
||||
SWT_MIN_VER=$(grep min_ver plugins/org.eclipse.swt/Eclipse\ SWT/common/library/make_common.mak | cut -f 2 -d =)
|
||||
SWT_VERSION=$SWT_MAJ_VER$SWT_MIN_VER
|
||||
swt_frag_ver=$(grep v$SWT_VERSION plugins/org.eclipse.swt.gtk.linux.x86/build.xml | sed "s:.*<.*\"\(.*\)\" />:\1:")
|
||||
swt_frag_ver_s390x=$(grep "version\.suffix\" value=" plugins/org.eclipse.swt.gtk.linux.s390x/build.xml | sed "s:.*<.*\"\(.*\)\" />:\1:")
|
||||
#SWT_MAJ_VER=$(grep maj_ver plugins/org.eclipse.swt/Eclipse\ SWT/common/library/make_common.mak | cut -f 2 -d =)
|
||||
#SWT_MIN_VER=$(grep min_ver plugins/org.eclipse.swt/Eclipse\ SWT/common/library/make_common.mak | cut -f 2 -d =)
|
||||
#SWT_VERSION=$SWT_MAJ_VER$SWT_MIN_VER
|
||||
#swt_frag_ver=$(grep v$SWT_VERSION plugins/org.eclipse.swt.gtk.linux.x86/build.xml | sed "s:.*<.*\"\(.*\)\" />:\1:")
|
||||
#swt_frag_ver_s390x=$(grep "version\.suffix\" value=" plugins/org.eclipse.swt.gtk.linux.s390x/build.xml | sed "s:.*<.*\"\(.*\)\" />:\1:")
|
||||
|
||||
# make sure there are no jars left
|
||||
JARS=""
|
||||
|
|
@ -267,8 +266,6 @@ popd
|
|||
|
||||
# Install the efj wrapper script
|
||||
install -p -D -m0755 %{SOURCE17} $RPM_BUILD_ROOT%{_bindir}/efj
|
||||
sed --in-place "s:startup.jar:%{_libdir}/%{name}/startup.jar:" \
|
||||
$RPM_BUILD_ROOT%{_bindir}/efj
|
||||
|
||||
# A sanity check.
|
||||
desktop-file-validate %{buildroot}/%{_datadir}/applications/%{name}.desktop
|
||||
|
|
@ -366,7 +363,6 @@ fi
|
|||
%{_libdir}/%{name}/about_files
|
||||
%endif
|
||||
%{_libdir}/%{name}/readme
|
||||
%{_libdir}/%{name}/startup.jar
|
||||
%{_libdir}/%{name}/features/org.eclipse.rcp_*
|
||||
%{_libdir}/%{name}/plugins/org.eclipse.core.commands_*
|
||||
%{_libdir}/%{name}/plugins/org.eclipse.core.contenttype_*
|
||||
|
|
@ -380,7 +376,6 @@ fi
|
|||
%{_libdir}/%{name}/plugins/org.eclipse.core.runtime.compatibility.auth_*
|
||||
%{_libdir}/%{name}/plugins/org.eclipse.equinox.app_*
|
||||
%{_libdir}/%{name}/plugins/org.eclipse.equinox.common_*
|
||||
%{_libdir}/%{name}/plugins/org.eclipse.equinox.ds_*
|
||||
%{_libdir}/%{name}/plugins/org.eclipse.equinox.launcher_*
|
||||
%{_libdir}/%{name}/plugins/org.eclipse.equinox.launcher.gtk.linux.%{eclipse_arch}_*
|
||||
%{_libdir}/%{name}/plugins/org.eclipse.equinox.preferences_*
|
||||
|
|
@ -423,6 +418,7 @@ fi
|
|||
%{_libdir}/%{name}/plugins/org.apache.commons.el_*
|
||||
%{_libdir}/%{name}/plugins/org.apache.commons.logging_*
|
||||
%{_libdir}/%{name}/plugins/org.apache.lucene_*
|
||||
%{_libdir}/%{name}/plugins/org.apache.lucene.core_*
|
||||
%{_libdir}/%{name}/plugins/org.apache.lucene.analysis_*
|
||||
%{_libdir}/%{name}/plugins/org.eclipse.ant.core_*
|
||||
%{_libdir}/%{name}/plugins/org.eclipse.compare_*
|
||||
|
|
@ -443,6 +439,7 @@ fi
|
|||
%{_libdir}/%{name}/plugins/org.eclipse.core.variables_*
|
||||
%{_libdir}/%{name}/plugins/org.eclipse.debug.core_*
|
||||
%{_libdir}/%{name}/plugins/org.eclipse.debug.ui_*
|
||||
%{_libdir}/%{name}/plugins/org.eclipse.equinox.ds_*
|
||||
%{_libdir}/%{name}/plugins/org.eclipse.equinox.event_*
|
||||
%{_libdir}/%{name}/plugins/org.eclipse.equinox.http.jetty_*
|
||||
%{_libdir}/%{name}/plugins/org.eclipse.equinox.http.registry_*
|
||||
|
|
@ -500,6 +497,9 @@ fi
|
|||
%{_libdir}/%{name}/plugins/org.eclipse.equinox.frameworkadmin_*
|
||||
%{_libdir}/%{name}/plugins/org.eclipse.equinox.frameworkadmin.equinox_*
|
||||
%{_libdir}/%{name}/plugins/org.eclipse.equinox.simpleconfigurator.manipulator_*
|
||||
%{_libdir}/%{name}/features/org.eclipse.equinox.p2.core.feature_*
|
||||
%{_libdir}/%{name}/features/org.eclipse.equinox.p2.extras.feature_*
|
||||
%{_libdir}/%{name}/features/org.eclipse.equinox.p2.rcp.feature_*
|
||||
%{_libdir}/%{name}/features/org.eclipse.equinox.p2.user.ui_*
|
||||
%{_libdir}/%{name}/plugins/org.eclipse.equinox.p2.director_*
|
||||
%{_libdir}/%{name}/plugins/org.eclipse.equinox.p2.core_*
|
||||
|
|
@ -513,17 +513,19 @@ fi
|
|||
%{_libdir}/%{name}/plugins/org.eclipse.equinox.p2.console_*
|
||||
%{_libdir}/%{name}/plugins/org.eclipse.equinox.p2.ql_*
|
||||
%{_libdir}/%{name}/plugins/org.eclipse.equinox.p2.operations_*
|
||||
%{_libdir}/%{name}/plugins/org.eclipse.equinox.p2.transport.ecf_*
|
||||
%{_libdir}/%{name}/plugins/org.eclipse.equinox.p2.ui_*
|
||||
%{_libdir}/%{name}/plugins/org.eclipse.equinox.p2.ui.importexport_*
|
||||
%{_libdir}/%{name}/plugins/org.eclipse.equinox.p2.ui.sdk_*
|
||||
%{_libdir}/%{name}/plugins/org.eclipse.equinox.p2.ui.sdk.scheduler_*
|
||||
%{_libdir}/%{name}/plugins/org.eclipse.equinox.p2.updatechecker_*
|
||||
%{_libdir}/%{name}/plugins/org.eclipse.equinox.p2.garbagecollector_*
|
||||
%{_libdir}/%{name}/plugins/org.eclipse.equinox.p2.directorywatcher_*
|
||||
%{_libdir}/%{name}/plugins/org.eclipse.equinox.p2.publisher_*
|
||||
%{_libdir}/%{name}/plugins/org.eclipse.equinox.p2.publisher.eclipse_*
|
||||
%{_libdir}/%{name}/plugins/org.eclipse.equinox.p2.repository_*
|
||||
%{_libdir}/%{name}/plugins/org.eclipse.equinox.p2.repository.tools_*
|
||||
%{_libdir}/%{name}/plugins/org.eclipse.equinox.p2.reconciler.dropins_*
|
||||
%{_libdir}/%{name}/plugins/org.eclipse.equinox.p2.metadata.generator_*
|
||||
%{_libdir}/%{name}/plugins/org.eclipse.equinox.p2.updatesite_*
|
||||
%{_libdir}/%{name}/plugins/org.eclipse.equinox.security_*
|
||||
%{_libdir}/%{name}/plugins/org.eclipse.equinox.security.ui_*
|
||||
|
|
@ -558,6 +560,9 @@ fi
|
|||
%{_libdir}/%{name}/dropins/sdk
|
||||
|
||||
%changelog
|
||||
* Tue May 17 2011 Chris Aniszczyk <zx@redhat.com> 1:3.7.0-0.1.RC1
|
||||
- New e-b snapshot - first eclipse 3.7 build based on 3.7 RC1.
|
||||
|
||||
* Wed Apr 27 2011 Chris Aniszczyk <zx@redhat.com> 1:3.6.2-5
|
||||
- New e-b snapshot - really fixes dropins issue.
|
||||
- update sat4j dependency to 2.3.0
|
||||
|
|
|
|||
|
|
@ -1,5 +1,6 @@
|
|||
#!/bin/sh
|
||||
|
||||
java -cp startup.jar org.eclipse.core.launcher.Main \
|
||||
launcherJar=$(ls /usr/lib/eclipse/plugins | grep "org.eclipse.equinox.launcher_")
|
||||
java -cp ${launcherJar} org.eclipse.core.launcher.Main \
|
||||
-application org.eclipse.jdt.core.JavaCodeFormatter \
|
||||
${1+"$@"}
|
||||
|
|
|
|||
4
sources
4
sources
|
|
@ -1,2 +1,2 @@
|
|||
0a8ea8e3359da67483c3728ad6fc2864 eclipse-build-6e174444f2517bbebb585a3e634c2f04af221c43.tar.xz
|
||||
eef922f52818ca428f8efce86025b19b eclipse-3.6.2-src.tar.bz2
|
||||
734e567150b66bd8c4da083e2afa19ec eclipse-3.7.0-I20110512-2000-src.tar.bz2
|
||||
cdc6de7eb2658abe11c0dc0814d4bb1d eclipse-build-04609626a590e823870c883cc5314cde7ef63504.tar.xz
|
||||
|
|
|
|||
Loading…
Reference in New Issue