From 113c7271af16400fde9b8f3999c69565cee68f0b Mon Sep 17 00:00:00 2001 From: Alexander Kurtakov Date: Oct 15 2009 10:33:35 +0000 Subject: - Add bootstrap flag. --- diff --git a/eclipse.spec b/eclipse.spec index 2f81e0e..dc2b216 100644 --- a/eclipse.spec +++ b/eclipse.spec @@ -6,12 +6,13 @@ # - fix ant libs Epoch: 1 -%define eclipse_major 3 -%define eclipse_minor 5 -%define eclipse_majmin %{eclipse_major}.%{eclipse_minor} -%define eclipse_micro 1 -%define initialize 1 +%global eclipse_major 3 +%global eclipse_minor 5 +%global eclipse_majmin %{eclipse_major}.%{eclipse_minor} +%global eclipse_micro 1 +%global initialize 1 %global download_url http://download.eclipse.org/technology/linuxtools/eclipse-build/ +%global bootstrap 0 # All arches line up between Eclipse and Linux kernel names except i386 -> x86 %ifarch %{ix86} @@ -29,7 +30,7 @@ Epoch: 1 Summary: An open, extensible IDE Name: eclipse Version: %{eclipse_majmin}.%{eclipse_micro} -Release: 7%{?dist} +Release: 8%{?dist} License: EPL Group: Text Editors/Integrated Development Environments (IDE) URL: http://www.eclipse.org/ @@ -68,15 +69,16 @@ BuildRequires: mesa-libGL-devel BuildRequires: mesa-libGLU-devel BuildRequires: cairo >= 1.0 BuildRequires: unzip -BuildRequires: icu4j-eclipse >= 1:4.0.1-3 -BuildRequires: tomcat5-jasper-eclipse >= 5.5.27-6.3 -BuildRequires: tomcat6-servlet-2.5-api >= 6.0.18-9.2 BuildRequires: desktop-file-utils BuildRequires: java-devel >= 1.6.0 BuildRequires: java-javadoc BuildRequires: libXt-devel BuildRequires: xulrunner-devel-unstable +%if !%{bootstrap} +BuildRequires: icu4j-eclipse >= 1:4.0.1-3 +BuildRequires: tomcat5-jasper-eclipse >= 5.5.27-6.3 +BuildRequires: tomcat6-servlet-2.5-api >= 6.0.18-9.2 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-nodeps ant-swing ant-trax ant-jsch BuildRequires: jsch >= 0:0.1.41 @@ -95,6 +97,7 @@ BuildRequires: junit4 BuildRequires: hamcrest >= 0:1.1-9.2 BuildRequires: sat4j >= 2.1.0-1 BuildRequires: objectweb-asm +%endif %description The Eclipse platform is designed for building integrated development @@ -121,7 +124,9 @@ SWT Library for GTK+-2.0. Summary: Eclipse Rich Client Platform Group: Development/Languages Requires: %{name}-swt = %{epoch}:%{version}-%{release} +%if ! %{bootstrap} Requires: icu4j-eclipse >= 1:4.0.1-3 +%endif Requires: java >= 1.6.0 %description rcp @@ -131,6 +136,7 @@ Eclipse Rich Client Platform Summary: Eclipse platform common files Group: Text Editors/Integrated Development Environments (IDE) Requires: %{name}-rcp = %{epoch}:%{version}-%{release} +%if ! %{bootstrap} 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-nodeps ant-swing ant-trax ant-jsch Requires: jakarta-commons-beanutils jakarta-commons-collections jakarta-commons-digester jakarta-commons-dbcp jakarta-commons-fileupload jakarta-commons-launcher jakarta-commons-modeler jakarta-commons-pool @@ -146,6 +152,7 @@ Requires: lucene >= 2.3.1-3.4 Requires: lucene-contrib >= 2.3.1-3.4 Requires: regexp Requires: sat4j >= 2.1.0-1 +%endif Provides: eclipse-cvs-client = 1:%{version}-%{release} Obsoletes: eclipse-cvs-client < 1:3.3.2-20 @@ -158,9 +165,11 @@ Summary: Eclipse Java Development Tools Group: Text Editors/Integrated Development Environments (IDE) Requires: %{name}-platform = %{epoch}:%{version}-%{release} Requires: %{name}-cvs-client = %{epoch}:%{version}-%{release} +%if ! %{bootstrap} Requires: junit >= 3.8.1-3jpp Requires: junit4 Requires: jakarta-commons-httpclient +%endif Requires: java-javadoc Requires: java-devel @@ -175,8 +184,10 @@ Provides: eclipse Provides: eclipse-sdk Requires: %{name}-platform = %{epoch}:%{version}-%{release} Requires: %{name}-jdt = %{epoch}:%{version}-%{release} +%if ! %{bootstrap} Requires: objectweb-asm Requires: hamcrest >= 0:1.1-9.2 +%endif # For PDE Build wrapper script Requires: bash Provides: %{name}-pde-runtime = 1:%{version}-%{release} @@ -308,6 +319,7 @@ IFS=' %endif +%if ! %{bootstrap} # Symlinks rm plugins/org.sat4j* ln -s %{_javadir}/org.sat4j.core* plugins/org.sat4j.core_2.1.0.v20090520.jar @@ -463,6 +475,7 @@ if [ ! -z "$JARS" ]; then echo "These jars should be deleted and symlinked to system jars: $JARS" #FIXME: enable exit 1 fi +%endif # target platform template patch %patch3 -p0 @@ -780,6 +793,7 @@ PDEBUILDVERSION=$(ls $RPM_BUILD_ROOT%{_libdir}/%{name}/dropins/sdk/plugins \ sed -i "s/@PDEBUILDVERSION@/$PDEBUILDVERSION/g" \ $RPM_BUILD_ROOT%{_libdir}/%{name}/buildscripts/pdebuild +%if ! %{bootstrap} pushd $RPM_BUILD_ROOT%{_libdir}/%{name} rm plugins/org.sat4j* ln -s %{_javadir}/org.sat4j.core* plugins/org.sat4j.core_2.1.0.v20090520.jar @@ -909,8 +923,8 @@ JSPAPIVERSION=$(ls plugins | grep javax.servlet.jsp_ | \ rm plugins/javax.servlet.jsp_* ln -s %{_javadir}/tomcat5-jsp-2.0-api.jar \ plugins/javax.servlet.jsp_$JSPAPIVERSION - popd +%endif %clean rm -rf $RPM_BUILD_ROOT @@ -959,6 +973,9 @@ fi %{_libdir}/%{name}/configuration/org.eclipse.osgi/.manager %{_libdir}/%{name}/configuration/org.eclipse.osgi/.state* %endif +%if %{bootstrap} +%{_libdir}/%{name}/plugins/com.ibm.icu_* +%endif %config %{_libdir}/%{name}/configuration %config %{_libdir}/%{name}/configuration/config.ini %config %{_libdir}/%{name}/configuration/org.eclipse.equinox.simpleconfigurator/bundles.info @@ -1164,6 +1181,9 @@ fi #%{_libdir}/%{name}/configuration/org.eclipse.equinox.source %changelog +* Thu Oct 15 2009 Alexander Kurtakov 1:3.5.1-8 +- Add bootstrap flag. + * Mon Oct 12 2009 Alexander Kurtakov 1:3.5.1-7 - Put back JAVA_HOME.