From cdbf0185bf78d872eb1c1dd0c62fbad4c060c498 Mon Sep 17 00:00:00 2001 From: Alexander Kurtakov Date: Wed, 5 Aug 2009 09:19:48 +0000 Subject: [PATCH] Revert initialize call path changes. --- eclipse.spec | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/eclipse.spec b/eclipse.spec index 2cf8228..4c312c1 100644 --- a/eclipse.spec +++ b/eclipse.spec @@ -30,7 +30,7 @@ Epoch: 1 Summary: An open, extensible IDE Name: eclipse Version: %{eclipse_majmin}.%{eclipse_micro} -Release: 0.3.30%{?dist} +Release: 0.3.31%{?dist} License: EPL Group: Text Editors/Integrated Development Environments (IDE) URL: http://www.eclipse.org/ @@ -937,7 +937,7 @@ rm -r $sdkDir/configuration/org.eclipse.update %if %{initialize} # dump bundles.info and config.ini to check what's wrong with ppc64 build -cat $RPM_BUILD_ROOT%{_libdir}/%{name}/config.ini +cat $RPM_BUILD_ROOT%{_libdir}/%{name}/configuration/config.ini cat $RPM_BUILD_ROOT%{_libdir}/%{name}/configuration/org.eclipse.equinox.simpleconfigurator/bundles.info # FIXME: investigate why it doesn't work to set this -- configuration data is # always written to /usr/share/eclipse/configuration, even with @@ -951,8 +951,8 @@ pushd $RPM_BUILD_ROOT mv $RPM_BUILD_ROOT%{_libdir}/eclipse/dropins $RPM_BUILD_ROOT/dropins mkdir $RPM_BUILD_ROOT%{_libdir}/eclipse/dropins libdir_path=$(echo %{_libdir}/%{name} | sed -e 's/^\///') -java -Dosgi.sharedConfiguration.area=$RPM_BUILD_ROOT/$libdir_path/configuration \ - -cp /$libdir_path/startup.jar \ +java -Dosgi.sharedConfiguration.area=$RPM_BUILD_ROOT$libdir_path/configuration \ + -cp $libdir_path/startup.jar \ org.eclipse.core.launcher.Main \ -debug -consolelog \ -metadataRepository file:$metadataDir \ @@ -1488,6 +1488,9 @@ fi #%{_libdir}/%{name}/configuration/org.eclipse.equinox.source %changelog +* Wed Aug 5 2009 Alexander Kurtakov 1:3.5.0-0.3.31 +- Revert initialize call path changes. + * Wed Aug 5 2009 Alexander Kurtakov 1:3.5.0-0.3.30 - Additional output to debug ppc64 build failures.