Drop bootstrap conditional. It is impossible to work this way since we
moved to not shipping deps into the eclipse-build tarballs.
This commit is contained in:
parent
9c17e3baf9
commit
1242510051
17
eclipse.spec
17
eclipse.spec
|
@ -6,7 +6,6 @@ Epoch: 1
|
||||||
%global eclipse_micro 2
|
%global eclipse_micro 2
|
||||||
%global initialize 1
|
%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.6.x_Helios/
|
||||||
%global bootstrap 0
|
|
||||||
|
|
||||||
# All arches line up between Eclipse and Linux kernel names except i386 -> x86
|
# All arches line up between Eclipse and Linux kernel names except i386 -> x86
|
||||||
%ifarch %{ix86}
|
%ifarch %{ix86}
|
||||||
|
@ -55,7 +54,6 @@ BuildRequires: libXt-devel
|
||||||
BuildRequires: xulrunner-devel
|
BuildRequires: xulrunner-devel
|
||||||
BuildRequires: webkitgtk-devel
|
BuildRequires: webkitgtk-devel
|
||||||
|
|
||||||
%if !%{bootstrap}
|
|
||||||
BuildRequires: icu4j-eclipse >= 1:4.2.1-1
|
BuildRequires: icu4j-eclipse >= 1:4.2.1-1
|
||||||
BuildRequires: tomcat5-jasper-eclipse >= 5.5.27-6.3
|
BuildRequires: tomcat5-jasper-eclipse >= 5.5.27-6.3
|
||||||
BuildRequires: tomcat6-servlet-2.5-api >= 6.0.18-9.2
|
BuildRequires: tomcat6-servlet-2.5-api >= 6.0.18-9.2
|
||||||
|
@ -75,7 +73,6 @@ BuildRequires: junit4
|
||||||
BuildRequires: hamcrest >= 0:1.1-9.2
|
BuildRequires: hamcrest >= 0:1.1-9.2
|
||||||
BuildRequires: sat4j >= 2.2.0-1
|
BuildRequires: sat4j >= 2.2.0-1
|
||||||
BuildRequires: objectweb-asm
|
BuildRequires: objectweb-asm
|
||||||
%endif
|
|
||||||
|
|
||||||
%description
|
%description
|
||||||
The Eclipse platform is designed for building integrated development
|
The Eclipse platform is designed for building integrated development
|
||||||
|
@ -103,9 +100,7 @@ SWT Library for GTK+-2.0.
|
||||||
Summary: Eclipse Rich Client Platform
|
Summary: Eclipse Rich Client Platform
|
||||||
Group: Development/Languages
|
Group: Development/Languages
|
||||||
Requires: %{name}-swt = %{epoch}:%{version}-%{release}
|
Requires: %{name}-swt = %{epoch}:%{version}-%{release}
|
||||||
%if ! %{bootstrap}
|
|
||||||
Requires: icu4j-eclipse >= 1:4.2.1-1
|
Requires: icu4j-eclipse >= 1:4.2.1-1
|
||||||
%endif
|
|
||||||
Requires: java >= 1.6.0
|
Requires: java >= 1.6.0
|
||||||
|
|
||||||
%description rcp
|
%description rcp
|
||||||
|
@ -115,7 +110,6 @@ Eclipse Rich Client Platform
|
||||||
Summary: Eclipse platform common files
|
Summary: Eclipse platform common files
|
||||||
Group: Text Editors/Integrated Development Environments (IDE)
|
Group: Text Editors/Integrated Development Environments (IDE)
|
||||||
Requires: %{name}-rcp = %{epoch}:%{version}-%{release}
|
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-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
|
||||||
Requires: apache-commons-el
|
Requires: apache-commons-el
|
||||||
|
@ -129,7 +123,6 @@ Requires: jsch >= 0.1.41
|
||||||
Requires: lucene >= 2.3.1-3.4
|
Requires: lucene >= 2.3.1-3.4
|
||||||
Requires: lucene-contrib >= 2.3.1-3.4
|
Requires: lucene-contrib >= 2.3.1-3.4
|
||||||
Requires: sat4j >= 2.2.0-1
|
Requires: sat4j >= 2.2.0-1
|
||||||
%endif
|
|
||||||
Provides: eclipse-cvs-client = 1:%{version}-%{release}
|
Provides: eclipse-cvs-client = 1:%{version}-%{release}
|
||||||
Obsoletes: eclipse-cvs-client < 1:3.3.2-20
|
Obsoletes: eclipse-cvs-client < 1:3.3.2-20
|
||||||
|
|
||||||
|
@ -142,11 +135,9 @@ Summary: Eclipse Java Development Tools
|
||||||
Group: Text Editors/Integrated Development Environments (IDE)
|
Group: Text Editors/Integrated Development Environments (IDE)
|
||||||
Requires: %{name}-platform = %{epoch}:%{version}-%{release}
|
Requires: %{name}-platform = %{epoch}:%{version}-%{release}
|
||||||
Requires: %{name}-cvs-client = %{epoch}:%{version}-%{release}
|
Requires: %{name}-cvs-client = %{epoch}:%{version}-%{release}
|
||||||
%if ! %{bootstrap}
|
|
||||||
Requires: junit >= 3.8.1-3jpp
|
Requires: junit >= 3.8.1-3jpp
|
||||||
Requires: junit4
|
Requires: junit4
|
||||||
Requires: jakarta-commons-httpclient
|
Requires: jakarta-commons-httpclient
|
||||||
%endif
|
|
||||||
Requires: java-javadoc
|
Requires: java-javadoc
|
||||||
Requires: java-devel
|
Requires: java-devel
|
||||||
|
|
||||||
|
@ -161,10 +152,8 @@ Provides: eclipse = %{epoch}:%{version}-%{release}
|
||||||
Provides: eclipse-sdk = %{epoch}:%{version}-%{release}
|
Provides: eclipse-sdk = %{epoch}:%{version}-%{release}
|
||||||
Requires: %{name}-platform = %{epoch}:%{version}-%{release}
|
Requires: %{name}-platform = %{epoch}:%{version}-%{release}
|
||||||
Requires: %{name}-jdt = %{epoch}:%{version}-%{release}
|
Requires: %{name}-jdt = %{epoch}:%{version}-%{release}
|
||||||
%if ! %{bootstrap}
|
|
||||||
Requires: objectweb-asm
|
Requires: objectweb-asm
|
||||||
Requires: hamcrest >= 0:1.1-9.2
|
Requires: hamcrest >= 0:1.1-9.2
|
||||||
%endif
|
|
||||||
# For PDE Build wrapper script + creating jars
|
# For PDE Build wrapper script + creating jars
|
||||||
Requires: zip
|
Requires: zip
|
||||||
Requires: bash
|
Requires: bash
|
||||||
|
@ -212,7 +201,6 @@ 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=$(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_frag_ver_s390x=$(grep "version\.suffix\" value=" plugins/org.eclipse.swt.gtk.linux.s390x/build.xml | sed "s:.*<.*\"\(.*\)\" />:\1:")
|
||||||
|
|
||||||
%if ! %{bootstrap}
|
|
||||||
# make sure there are no jars left
|
# make sure there are no jars left
|
||||||
JARS=""
|
JARS=""
|
||||||
for j in $(find -name \*.jar); do
|
for j in $(find -name \*.jar); do
|
||||||
|
@ -224,7 +212,6 @@ if [ ! -z "$JARS" ]; then
|
||||||
echo "These jars should be deleted and symlinked to system jars: $JARS"
|
echo "These jars should be deleted and symlinked to system jars: $JARS"
|
||||||
#FIXME: enable exit 1
|
#FIXME: enable exit 1
|
||||||
fi
|
fi
|
||||||
%endif
|
|
||||||
|
|
||||||
popd
|
popd
|
||||||
|
|
||||||
|
@ -367,9 +354,6 @@ fi
|
||||||
%{_libdir}/%{name}/configuration/org.eclipse.osgi/.manager
|
%{_libdir}/%{name}/configuration/org.eclipse.osgi/.manager
|
||||||
%{_libdir}/%{name}/configuration/org.eclipse.osgi/.state*
|
%{_libdir}/%{name}/configuration/org.eclipse.osgi/.state*
|
||||||
%endif
|
%endif
|
||||||
%if %{bootstrap}
|
|
||||||
%{_libdir}/%{name}/plugins/com.ibm.icu_*
|
|
||||||
%endif
|
|
||||||
%dir %{_libdir}/%{name}/configuration
|
%dir %{_libdir}/%{name}/configuration
|
||||||
%config %{_libdir}/%{name}/configuration/config.ini
|
%config %{_libdir}/%{name}/configuration/config.ini
|
||||||
%config %{_libdir}/%{name}/configuration/org.eclipse.equinox.simpleconfigurator/bundles.info
|
%config %{_libdir}/%{name}/configuration/org.eclipse.equinox.simpleconfigurator/bundles.info
|
||||||
|
@ -575,6 +559,7 @@ fi
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
* Wed Apr 6 2011 Alexander Kurtakov <akurtako@redhat.com> 1:3.6.2-0.2
|
* Wed Apr 6 2011 Alexander Kurtakov <akurtako@redhat.com> 1:3.6.2-0.2
|
||||||
|
- Drop bootstrap conditional.
|
||||||
- Drop shell start script.
|
- Drop shell start script.
|
||||||
- Drop jpp versioned dependencies - apache-commons-* have never had such versions.
|
- Drop jpp versioned dependencies - apache-commons-* have never had such versions.
|
||||||
- Removed patches moved to eclipse-build.
|
- Removed patches moved to eclipse-build.
|
||||||
|
|
Loading…
Reference in New Issue