From a69cc9cf220a9a8e7827c9f7725c67d51396b95a Mon Sep 17 00:00:00 2001 From: mbooth Date: Apr 25 2008 23:56:41 +0000 Subject: - Fixed some benign errors in copy-platform when calling pdebuild multiple times. --- diff --git a/eclipse-copy-platform.sh b/eclipse-copy-platform.sh index feefc88..d270f6e 100644 --- a/eclipse-copy-platform.sh +++ b/eclipse-copy-platform.sh @@ -27,16 +27,15 @@ fi where=$1; shift eclipse=$1; shift -mkdir $where +mkdir -p $where/plugins $where/features $where/links cd $where -mkdir plugins features links # Are there any optional arguments left? if [ $# -gt 0 ]; then for optional in "$@"; do (cd $eclipse; ls -d plugins/*"$optional"* features/*"$optional"*) | while read f; do - ln -s $eclipse/$f $f + [ ! -e $f ] && ln -s $eclipse/$f $f done done fi diff --git a/eclipse.spec b/eclipse.spec index 0af5e7f..69b8b91 100644 --- a/eclipse.spec +++ b/eclipse.spec @@ -20,7 +20,7 @@ Epoch: 1 Summary: An open, extensible IDE Name: eclipse Version: %{eclipse_majmin}.%{eclipse_micro} -Release: 10%{?dist} +Release: 11%{?dist} License: Eclipse Public License Group: Text Editors/Integrated Development Environments (IDE) URL: http://www.eclipse.org/ @@ -1013,7 +1013,7 @@ cp %{SOURCE16} copy-platform ls -d * | egrep -v '^(plugins|features|links|about_files)$' ls -d plugins/* features/* links/* ) | -sed -e's/^\(.*\)$/\1 \1/' -e's,^,ln -s $eclipse/,' >> copy-platform +sed -e's,^\(.*\),[ ! -e \1 ] \&\& ln -s $eclipse/\1 \1,' >> copy-platform mkdir -p $RPM_BUILD_ROOT%{_datadir}/%{name}/buildscripts cp copy-platform $RPM_BUILD_ROOT%{_datadir}/%{name}/buildscripts @@ -1652,6 +1652,10 @@ fi %endif %changelog +* Sat Apr 26 2008 Mat Booth 3.3.2-11 +- Fixed some benign errors in copy-platform when calling pdebuild + multiple times. + * Fri Apr 25 2008 Andrew Overholt 3.3.2-10 - Bump maximum heap size from 256 MB to 512 MB. - Add patch for https://bugs.eclipse.org/bugs/show_bug.cgi?id=214092