[eclipse/f14/master] Add prepare-build-dir.sh.patch

[jerboaa]

commit dc179d70a52642f8c49e87b481daac1558ef5192
Author: Severin Gehwolf <sgehwolf at redhat.com>
Date:   Thu Oct 14 16:41:15 2010 -0400

    Add prepare-build-dir.sh.patch

 eclipse.spec               |   11 ++++++++++-
 prepare-build-dir.sh.patch |   20 ++++++++++++++++++++
 2 files changed, 30 insertions(+), 1 deletions(-)
---
diff --git a/eclipse.spec b/eclipse.spec
index 1dc17c3..2f14281 100644
--- a/eclipse.spec
+++ b/eclipse.spec
@@ -27,7 +27,7 @@ Epoch:  1
 Summary:        An open, extensible IDE
 Name:           eclipse
 Version:        %{eclipse_majmin}.%{eclipse_micro}
-Release:        1%{?dist}
+Release:        2%{?dist}
 License:        EPL
 Group:          Text Editors/Integrated Development Environments (IDE)
 URL:            http://www.eclipse.org/
@@ -47,6 +47,8 @@ Source28:       %{name}-mv-Platform.sh
 Patch0:        %{name}-target-platform-template.patch
 # make o.e.swt.gtk.linux.ppc64 version to match ppc 
 Patch1:        %{name}-swt-ppc64-version.patch
+# Shell script portability patch: prepare-build-dir.sh
+Patch2:        prepare-build-dir.sh.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  ant ant-nodeps
@@ -191,6 +193,10 @@ cp %{SOURCE1} .
 ant -DbuildArch=%{eclipse_arch} applyPatches
 pushd build/eclipse-%{version}-src
 
+# Apply shell script portability 
+# patch to upstream prepare-build-dir.sh
+%patch2
+
 # Use our system-installed javadocs, reference only what we built, and
 # don't like to osgi.org docs (FIXME:  maybe we should package them?)
 sed -i -e "s|http://java.sun.com/j2se/1.4.2/docs/api|%{_datadir}/javadoc/java|" \
@@ -957,6 +963,9 @@ fi
 #%{_libdir}/%{name}/configuration/org.eclipse.equinox.source
 
 %changelog
+* Thu Oct 14 2010 Severin Gehwolf <sgehwolf at redhat.com> 1:3.6.1-2
+- Add prepare-build-dir.sh patch.
+
 * Tue Oct 5 2010 Alexander Kurtakov <akurtako at redhat.com> 1:3.6.1-1
 - Update to 3.6.1.
 
diff --git a/prepare-build-dir.sh.patch b/prepare-build-dir.sh.patch
new file mode 100644
index 0000000..ed596eb
--- /dev/null
+++ b/prepare-build-dir.sh.patch
@@ -0,0 +1,20 @@
+--- plugins/org.eclipse.pde.build/templates/package-build/prepare-build-dir.sh.orig	2010-09-22 18:11:55.546685423 -0400
++++ plugins/org.eclipse.pde.build/templates/package-build/prepare-build-dir.sh	2010-09-22 17:58:40.763674792 -0400
+@@ -57,7 +57,7 @@
+     fi
+ 
+     if [ "x$ERROR" != "xyes" ]; then
+-      if [ $TESTING != true -o `echo $PROJECTNAME | grep "org.eclipse"` ]; then
++      if [ $TESTING != true ] || `echo "$PROJECTNAME" | grep "org.eclipse"`; then
+         echo "  making symlink: $BUILDDIR/features/$PROJECTNAME -> $PROJECTDIR"
+         ln -sfT "$PROJECTDIR" $BUILDDIR/features/"$PROJECTNAME"
+       fi
+@@ -91,7 +91,7 @@
+     fi
+ 
+     if [ "x$ERROR" != "xyes" ]; then
+-      if [ $TESTING != true -o `echo $PROJECTNAME | grep "org.eclipse"` ]; then
++      if [ $TESTING != true ] || `echo $PROJECTNAME | grep "org.eclipse"`; then
+         echo "  making symlink: $BUILDDIR/plugins/$PROJECTNAME -> $dir"
+         ln -sfT "$dir" $BUILDDIR/plugins/"$PROJECTNAME"
+       fi