diff --git a/eclipse-copy-platform.sh b/eclipse-copy-platform.sh index 59d5bbe..be81789 100644 --- a/eclipse-copy-platform.sh +++ b/eclipse-copy-platform.sh @@ -29,7 +29,8 @@ eclipse=$1; shift mkdir $where cd $where -mkdir plugins features +mkdir plugins features fragments +cp -r $eclipse/links . # Are there any optional arguments left? if [ $# -gt 0 ]; then diff --git a/eclipse.spec b/eclipse.spec index 88862d5..790316f 100644 --- a/eclipse.spec +++ b/eclipse.spec @@ -26,7 +26,7 @@ Epoch: 1 Summary: An open, extensible IDE Name: eclipse Version: %{eclipse_majmin}.%{eclipse_micro} -Release: 10%{?dist} +Release: 11%{?dist} License: EPL Group: Text Editors/Integrated Development Environments (IDE) URL: http://www.eclipse.org/ @@ -1044,10 +1044,12 @@ popd cp %{SOURCE16} copy-platform ( cd $RPM_BUILD_ROOT%{_datadir}/%{name} - ls -d * | egrep -v '^(plugins|features)$' + ls -d * | egrep -v '^(links|plugins|features)$' ls -d plugins/* features/* ) | sed -e's/^\(.*\)$/\1 \1/' -e's,^,ln -s $eclipse/,' >> copy-platform +echo "ln -s %{_libdir}/eclipse fragments" >> copy-platform +echo "sed --in-place s:%{_libdir}:\$where/fragments: links/fragments.link" >> copy-platform mkdir -p $RPM_BUILD_ROOT%{_datadir}/%{name}/buildscripts cp copy-platform $RPM_BUILD_ROOT%{_datadir}/%{name}/buildscripts @@ -1616,6 +1618,9 @@ rm -f %{_datadir}/%{name}/configuration/org.eclipse.update/platform.xml* %{_datadir}/%{name}/plugins/org.eclipse.sdk_* %changelog +* Tue Oct 31 2006 Andrew Overholt 3.2.1-11 +- Fix copy-platform to work with split install. + * Tue Oct 31 2006 Ben Konrath 3.2.1-10 - Add 3.2.1 splash screen. - Sort the java source files before building (#209249).