- fix swt requires, symlink to icu4j jar in %install
This commit is contained in:
parent
d0ce53878c
commit
82b907742c
10
eclipse.spec
10
eclipse.spec
@ -154,7 +154,7 @@ Summary: Eclipse Rich Client Platform
|
|||||||
Group: Development/Languages
|
Group: Development/Languages
|
||||||
Requires: %{libname}-gtk2 = %{epoch}:%{version}-%{release}
|
Requires: %{libname}-gtk2 = %{epoch}:%{version}-%{release}
|
||||||
# This file-level requirement is for the bi-arch multilib case
|
# This file-level requirement is for the bi-arch multilib case
|
||||||
Requires: %{_libdir}/%{name}/plugins/org.eclipse.swt.gtk.linux.%{eclipse_arch}_3.3.0.v3345f.jar
|
Requires: %{_libdir}/%{name}/plugins/org.eclipse.swt.gtk.linux.%{eclipse_arch}_3.3.0.v3346.jar
|
||||||
Requires(post): %{libname}-gtk2 = %{epoch}:%{version}-%{release}
|
Requires(post): %{libname}-gtk2 = %{epoch}:%{version}-%{release}
|
||||||
Requires(postun): %{libname}-gtk2 = %{epoch}:%{version}-%{release}
|
Requires(postun): %{libname}-gtk2 = %{epoch}:%{version}-%{release}
|
||||||
Requires: icu4j-eclipse > = 3.6.1
|
Requires: icu4j-eclipse > = 3.6.1
|
||||||
@ -215,7 +215,7 @@ Requires(postun): java-gcj-compat >= 1.0.64
|
|||||||
%endif
|
%endif
|
||||||
Requires: %{name}-rcp = %{epoch}:%{version}-%{release}
|
Requires: %{name}-rcp = %{epoch}:%{version}-%{release}
|
||||||
# This file-level requirement is for the bi-arch multilib case
|
# This file-level requirement is for the bi-arch multilib case
|
||||||
Requires: %{_libdir}/%{name}/plugins/org.eclipse.swt.gtk.linux.%{eclipse_arch}_3.3.0.v3345f.jar
|
Requires: %{_libdir}/%{name}/plugins/org.eclipse.swt.gtk.linux.%{eclipse_arch}_3.3.0.v3346.jar
|
||||||
Requires(post): %{name}-rcp = %{epoch}:%{version}-%{release}
|
Requires(post): %{name}-rcp = %{epoch}:%{version}-%{release}
|
||||||
Requires(postun): %{name}-rcp = %{epoch}:%{version}-%{release}
|
Requires(postun): %{name}-rcp = %{epoch}:%{version}-%{release}
|
||||||
# Need to investigate why we don't build ant-apache-bsf or ant-commons-net in
|
# Need to investigate why we don't build ant-apache-bsf or ant-commons-net in
|
||||||
@ -1047,6 +1047,12 @@ build-jar-repository -s -p plugins/org.junit_* junit
|
|||||||
rm plugins/com.jcraft.jsch_0.1.31.jar
|
rm plugins/com.jcraft.jsch_0.1.31.jar
|
||||||
ln -s %{_javadir}/jsch.jar plugins/com.jcraft.jsch_0.1.31.jar
|
ln -s %{_javadir}/jsch.jar plugins/com.jcraft.jsch_0.1.31.jar
|
||||||
|
|
||||||
|
# link to the icu4j stuff
|
||||||
|
rm plugins/com.ibm.icu_3.6.1.v20070417.jar
|
||||||
|
ln -s %{_datadir}/eclipse/plugins/com.ibm.icu_3.6.1.v20070417.jar plugins/com.ibm.icu_3.6.1.v20070417.jar
|
||||||
|
|
||||||
|
popd
|
||||||
|
|
||||||
# Ensure that the zip files are the same across all builds.
|
# Ensure that the zip files are the same across all builds.
|
||||||
# This is needed to make these package multilib compatible.
|
# This is needed to make these package multilib compatible.
|
||||||
# FIXME: this needs to be re-written as a separate program
|
# FIXME: this needs to be re-written as a separate program
|
||||||
|
Loading…
Reference in New Issue
Block a user