From 82b907742c4e2f4bca67bf9c9a25965c3e30dc2f Mon Sep 17 00:00:00 2001 From: Ben Konrath Date: Jul 10 2007 13:14:26 +0000 Subject: - fix swt requires, symlink to icu4j jar in %install --- diff --git a/eclipse.spec b/eclipse.spec index 97121d8..2b6682a 100644 --- a/eclipse.spec +++ b/eclipse.spec @@ -154,7 +154,7 @@ Summary: Eclipse Rich Client Platform Group: Development/Languages Requires: %{libname}-gtk2 = %{epoch}:%{version}-%{release} # 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(postun): %{libname}-gtk2 = %{epoch}:%{version}-%{release} Requires: icu4j-eclipse > = 3.6.1 @@ -215,7 +215,7 @@ Requires(postun): java-gcj-compat >= 1.0.64 %endif Requires: %{name}-rcp = %{epoch}:%{version}-%{release} # 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(postun): %{name}-rcp = %{epoch}:%{version}-%{release} # 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 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. # This is needed to make these package multilib compatible. # FIXME: this needs to be re-written as a separate program