- Link to system-installed jsch instead of including it.
This commit is contained in:
parent
f4c4bd1682
commit
f23231dfc5
36
eclipse.spec
36
eclipse.spec
@ -19,7 +19,7 @@ Epoch: 1
|
||||
Summary: An open, extensible IDE
|
||||
Name: eclipse
|
||||
Version: %{eclipse_majmin}.%{eclipse_micro}
|
||||
Release: 7%{?dist}
|
||||
Release: 8%{?dist}
|
||||
License: Eclipse Public License
|
||||
Group: Text Editors/Integrated Development Environments (IDE)
|
||||
URL: http://www.eclipse.org/
|
||||
@ -138,7 +138,7 @@ BuildRequires: java-devel >= 1.4.2
|
||||
# https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=180642
|
||||
BuildRequires: ant-antlr ant-apache-bcel ant-apache-log4j ant-apache-oro ant-apache-regexp ant-apache-resolver ant-commons-logging
|
||||
BuildRequires: ant-javamail ant-jdepend ant-junit ant-nodeps ant-swing ant-trax ant-jsch
|
||||
BuildRequires: jsch >= 0:0.1.28-1jpp
|
||||
BuildRequires: jsch >= 0:0.1.28-1jpp.6
|
||||
BuildRequires: jakarta-commons-beanutils jakarta-commons-collections jakarta-commons-digester jakarta-commons-dbcp jakarta-commons-el jakarta-commons-fileupload jakarta-commons-launcher jakarta-commons-logging jakarta-commons-modeler jakarta-commons-pool
|
||||
BuildRequires: mx4j >= 2.1
|
||||
BuildRequires: tomcat5 = 5.5.20
|
||||
@ -242,6 +242,7 @@ Requires: mx4j >= 2.1
|
||||
Requires: tomcat5 = 5.5.20
|
||||
Requires: tomcat5-jasper = 5.5.20
|
||||
Requires: tomcat5-servlet-2.4-api = 5.5.20
|
||||
Requires: jsch >= 0:0.1.28-1jpp.6
|
||||
Requires: lucene, lucene-devel
|
||||
Requires: regexp
|
||||
|
||||
@ -685,6 +686,10 @@ sed --in-place "s/ppc64/x86_64/g" features/org.eclipse.platform.source/build.xml
|
||||
find -type f ! -name \*.java -a ! -name feature.xml -exec sed --in-place "s/@eye-eh-64_32@/ia64_32/g" "{}" \;
|
||||
%endif
|
||||
|
||||
# link to the jsch jar
|
||||
rm baseLocation/plugins/com.jcraft.jsch_0.1.28.jar
|
||||
ln -s %{_javadir}/jsch.jar baseLocation/plugins/com.jcraft.jsch_0.1.28.jar
|
||||
|
||||
# set the icu4j plugins for building
|
||||
pushd baseLocation/plugins
|
||||
rm com.ibm.icu.base_3.4.5.20061213.jar \
|
||||
@ -734,24 +739,8 @@ fi
|
||||
tar jxf %{SOURCE20}
|
||||
|
||||
%build
|
||||
env
|
||||
ORIGCLASSPATH=$CLASSPATH
|
||||
|
||||
# Build jsch
|
||||
pushd baseLocation/plugins
|
||||
# extract the Manifest file
|
||||
unzip -qq -o -d com.jcraft.jsch_0.1.28.jar-build com.jcraft.jsch_*.jar -x com\*
|
||||
rm com.jcraft.jsch_*.jar
|
||||
popd
|
||||
# FIXME jar -V does not work for proprietary VMs
|
||||
pushd baseLocation/plugins/com.jcraft.jsch_0.1.28.jar-build
|
||||
unzip -qq %{_javadir}/jsch.jar -x META-INF\*
|
||||
sed --in-place "s/$(grep Created-By: META-INF/MANIFEST.MF)/Created-By: $(jar -V | head -1)/" META-INF/MANIFEST.MF
|
||||
jar -Mcf ../com.jcraft.jsch_0.1.28.jar *
|
||||
popd
|
||||
# FIXME don't delete this, do what icu4j does
|
||||
rm -r baseLocation/plugins/com.jcraft.jsch_0.1.28.jar-build
|
||||
|
||||
# Finish the icu4j build
|
||||
pushd baseLocation/plugins
|
||||
|
||||
@ -1230,6 +1219,10 @@ build-jar-repository -s -p plugins/org.eclipse.tomcat_$TOMCATPLUGINVERSION/lib s
|
||||
|
||||
build-jar-repository -s -p plugins/org.junit_* junit
|
||||
|
||||
# link to the jsch jar
|
||||
rm plugins/com.jcraft.jsch_0.1.28.jar
|
||||
ln -s %{_javadir}/jsch.jar plugins/com.jcraft.jsch_0.1.28.jar
|
||||
|
||||
# Ensure that the zip files are the same across all builds.
|
||||
# This is needed to make these package multilib compatible.
|
||||
# FIXME: this needs to be re-written as a separate program
|
||||
@ -1323,7 +1316,6 @@ aot-compile-rpm --exclude %{_datadir}/%{name}/plugins/org.eclipse.ui.ide_$UIIDEP
|
||||
%else
|
||||
OSGIPLUGINVERSION=$(ls plugins | grep osgi_ | sed 's/org.eclipse.osgi_//')
|
||||
aot-compile-rpm --exclude %{_datadir}/%{name}/plugins/org.eclipse.ui.ide_$UIIDEPLUGINVERSION \
|
||||
--exclude %{_datadir}/%{name}/plugins/com.jcraft.jsch_0.1.28.jar \
|
||||
--exclude %{_datadir}/%{name}/plugins/org.eclipse.osgi_$OSGIPLUGINVERSION
|
||||
%endif
|
||||
%endif
|
||||
@ -1593,9 +1585,6 @@ fi
|
||||
%{_libdir}/gcj/%{name}/org.eclipse.jface.text_*
|
||||
%{_libdir}/gcj/%{name}/org.eclipse.ui.intro_*
|
||||
#%{_libdir}/gcj/%{name}/org.eclipse.ui.ide_*
|
||||
%ifnarch ia64
|
||||
%{_libdir}/gcj/%{name}/com.jcraft.jsch_*
|
||||
%endif
|
||||
%{_libdir}/gcj/%{name}/org.eclipse.ui.cheatsheets_*
|
||||
%{_libdir}/gcj/%{name}/org.eclipse.ant.core_*
|
||||
%{_libdir}/gcj/%{name}/org.eclipse.help.appserver_*
|
||||
@ -1730,6 +1719,9 @@ fi
|
||||
%{_libdir}/%{name}/plugins/org.eclipse.sdk_*
|
||||
|
||||
%changelog
|
||||
* Tue Apr 03 2007 Ben Konrath <bkonrath@redhat.com> 3.2.2-8
|
||||
- Link to system-installed jsch instead of including it.
|
||||
|
||||
* Tue Mar 20 2007 Ben Konrath <bkonrath@redhat.com> 3.2.2-7
|
||||
- Remove search and processing for mac encoded files.
|
||||
- Remove BR dos2unix.
|
||||
|
Loading…
Reference in New Issue
Block a user