From 2893eea98525f3d9caf389e9a0d49a3c82bd1de7 Mon Sep 17 00:00:00 2001
From: Andrew Overholt <overholt@fedoraproject.org>
Date: Apr 22 2009 13:07:13 +0000
Subject: - Update "package build" patch to not nest symlinks (Elliott Baron).

- RHBZ#496963.

---

diff --git a/eclipse-pde.build-add-package-build.patch b/eclipse-pde.build-add-package-build.patch
index c32ab00..12ce373 100644
--- a/eclipse-pde.build-add-package-build.patch
+++ b/eclipse-pde.build-add-package-build.patch
@@ -68,7 +68,7 @@ diff -N templates/package-build/prepare-build-dir.sh
 +    if [ "x$ERROR" != "xyes" ]; then
 +      if [[ $TESTING != true || `echo $PROJECTNAME | grep "org.eclipse"` ]]; then
 +        echo "  making symlink: $BUILDDIR/features/$PROJECTNAME -> $PROJECTDIR"
-+        ln -sf "$PROJECTDIR" $BUILDDIR/features/"$PROJECTNAME"
++        ln -sfT "$PROJECTDIR" $BUILDDIR/features/"$PROJECTNAME"
 +      fi
 +    fi
 +  fi
@@ -102,7 +102,7 @@ diff -N templates/package-build/prepare-build-dir.sh
 +    if [ "x$ERROR" != "xyes" ]; then
 +      if [[ $TESTING != true || `echo $PROJECTNAME | grep "org.eclipse"` ]]; then
 +        echo "  making symlink: $BUILDDIR/plugins/$PROJECTNAME -> $dir"
-+        ln -sf "$dir" $BUILDDIR/plugins/"$PROJECTNAME"
++        ln -sfT "$dir" $BUILDDIR/plugins/"$PROJECTNAME"
 +      fi
 +    fi;
 +
diff --git a/eclipse.spec b/eclipse.spec
index 91d8a1e..33fb3f6 100644
--- a/eclipse.spec
+++ b/eclipse.spec
@@ -29,7 +29,7 @@ Epoch:  1
 Summary:        An open, extensible IDE
 Name:           eclipse
 Version:        %{eclipse_majmin}.%{eclipse_micro}
-Release:        9%{?dist}
+Release:        10%{?dist}
 License:        EPL
 Group:          Text Editors/Integrated Development Environments (IDE)
 URL:            http://www.eclipse.org/
@@ -1491,6 +1491,10 @@ fi
 #%{_libdir}/%{name}/configuration/org.eclipse.equinox.source
 
 %changelog
+* Tue Apr 21 2009 Andrew Overholt <overholt@redhat.com> 1:3.4.2-10
+- Update "package build" patch to not nest symlinks (Elliott Baron).
+- RHBZ#496963.
+
 * Mon Apr 6 2009 Andrew Overholt <overholt@redhat.com> 1:3.4.2-9
 - Re-add patch to build libswt-xulrunner instead of libswt-mozilla.
 - RHBZ#484453