From c6cf50d63ebd851733b06c5f365013d6dcaff553 Mon Sep 17 00:00:00 2001 From: Ben Konrath Date: Jun 13 2006 01:13:37 +0000 Subject: one more fix for jdtcore symlink --- diff --git a/eclipse.spec b/eclipse.spec index 0604baa..0a2536a 100644 --- a/eclipse.spec +++ b/eclipse.spec @@ -985,6 +985,10 @@ sed --in-place "s:/usr/share/eclipse:%{_datadir}/%{name}:" \ $RPM_BUILD_ROOT%{_datadir}/%{name}/buildscripts/rebuild-sdk-features chmod a+x $RPM_BUILD_ROOT%{_datadir}/%{name}/buildscripts/rebuild-sdk-features + +JDTCOREVERSION=$(grep "compiler\.version = 0\..*, 3.2.0" plugins/org.eclipse.jdt.core/batch/org/eclipse/jdt/internal/compiler/batch/messages.properties | \ + sed "s/^compiler\.version = 0\.\(.*\), 3.2.0 release/\1/") + pushd $RPM_BUILD_ROOT%{_datadir}/%{name} ## BEGIN ANT ## rm plugins/org.apache.ant_*/lib/ant-antlr.jar @@ -1106,9 +1110,7 @@ ln -sf %{_javadir}/junit.jar plugins/org.junit_*/junit.jar # Symlink org.eclipse.jdt.core_%{eclipse_majmin}.%{eclipse_micro}.jar in # %{_datadir}/java/eclipse-ecj.jar for java-1.4.2-gcj-compat's "javac" mkdir -p $RPM_BUILD_ROOT%{_datadir}/java -jdtcoreversion=$(grep "compiler\.version = 0\..*, 3.2.0" plugins/org.eclipse.jdt.core/batch/org/eclipse/jdt/internal/compiler/batch/messages.properties | \ - sed "s/^compiler\.version = 0\.\(.*\), 3.2.0 release/\1/") -ln -s %{_datadir}/%{name}/plugins/org.eclipse.jdt.core_%{eclipse_majmin}.%{eclipse_micro}.v_$jdtcoreversion.jar \ +ln -s %{_datadir}/%{name}/plugins/org.eclipse.jdt.core_%{eclipse_majmin}.%{eclipse_micro}.v_$JDTCOREVERSION.jar \ $RPM_BUILD_ROOT%{_datadir}/java/eclipse-ecj.jar ln -s %{_datadir}/java/eclipse-ecj.jar \ $RPM_BUILD_ROOT%{_datadir}/java/jdtcore.jar