Revert initialize call path changes.

This commit is contained in:
Alexander Kurtakov 2009-08-05 09:19:48 +00:00
parent a7f7382b2b
commit cdbf0185bf

View File

@ -30,7 +30,7 @@ Epoch: 1
Summary: An open, extensible IDE Summary: An open, extensible IDE
Name: eclipse Name: eclipse
Version: %{eclipse_majmin}.%{eclipse_micro} Version: %{eclipse_majmin}.%{eclipse_micro}
Release: 0.3.30%{?dist} Release: 0.3.31%{?dist}
License: EPL License: EPL
Group: Text Editors/Integrated Development Environments (IDE) Group: Text Editors/Integrated Development Environments (IDE)
URL: http://www.eclipse.org/ URL: http://www.eclipse.org/
@ -937,7 +937,7 @@ rm -r $sdkDir/configuration/org.eclipse.update
%if %{initialize} %if %{initialize}
# dump bundles.info and config.ini to check what's wrong with ppc64 build # 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 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 # FIXME: investigate why it doesn't work to set this -- configuration data is
# always written to /usr/share/eclipse/configuration, even with # 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 mv $RPM_BUILD_ROOT%{_libdir}/eclipse/dropins $RPM_BUILD_ROOT/dropins
mkdir $RPM_BUILD_ROOT%{_libdir}/eclipse/dropins mkdir $RPM_BUILD_ROOT%{_libdir}/eclipse/dropins
libdir_path=$(echo %{_libdir}/%{name} | sed -e 's/^\///') libdir_path=$(echo %{_libdir}/%{name} | sed -e 's/^\///')
java -Dosgi.sharedConfiguration.area=$RPM_BUILD_ROOT/$libdir_path/configuration \ java -Dosgi.sharedConfiguration.area=$RPM_BUILD_ROOT$libdir_path/configuration \
-cp /$libdir_path/startup.jar \ -cp $libdir_path/startup.jar \
org.eclipse.core.launcher.Main \ org.eclipse.core.launcher.Main \
-debug -consolelog \ -debug -consolelog \
-metadataRepository file:$metadataDir \ -metadataRepository file:$metadataDir \
@ -1488,6 +1488,9 @@ fi
#%{_libdir}/%{name}/configuration/org.eclipse.equinox.source #%{_libdir}/%{name}/configuration/org.eclipse.equinox.source
%changelog %changelog
* Wed Aug 5 2009 Alexander Kurtakov <akurtako@redhat.com> 1:3.5.0-0.3.31
- Revert initialize call path changes.
* Wed Aug 5 2009 Alexander Kurtakov <akurtako@redhat.com> 1:3.5.0-0.3.30 * Wed Aug 5 2009 Alexander Kurtakov <akurtako@redhat.com> 1:3.5.0-0.3.30
- Additional output to debug ppc64 build failures. - Additional output to debug ppc64 build failures.