rpms/eclipse/F-11 eclipse-pde.build-add-package-build.patch, 1.11, 1.12 eclipse.spec, 1.628, 1.629

Andrew Overholt overholt at fedoraproject.org
Wed Apr 22 13:07:16 UTC 2009


Author: overholt

Update of /cvs/pkgs/rpms/eclipse/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18730

Modified Files:
	eclipse-pde.build-add-package-build.patch eclipse.spec 
Log Message:
* Tue Apr 21 2009 Andrew Overholt <overholt at redhat.com> 1:3.4.2-10
- Update "package build" patch to not nest symlinks (Elliott Baron).
- RHBZ#496963.

eclipse-pde.build-add-package-build.patch:

Index: eclipse-pde.build-add-package-build.patch
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse/F-11/eclipse-pde.build-add-package-build.patch,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- eclipse-pde.build-add-package-build.patch	19 Dec 2008 17:47:47 -0000	1.11
+++ eclipse-pde.build-add-package-build.patch	22 Apr 2009 13:07:13 -0000	1.12
@@ -68,7 +68,7 @@
 +    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 @@
 +    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;
 +


Index: eclipse.spec
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse/F-11/eclipse.spec,v
retrieving revision 1.628
retrieving revision 1.629
diff -u -r1.628 -r1.629
--- eclipse.spec	6 Apr 2009 21:26:05 -0000	1.628
+++ eclipse.spec	22 Apr 2009 13:07:13 -0000	1.629
@@ -29,7 +29,7 @@
 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 @@
 #%{_libdir}/%{name}/configuration/org.eclipse.equinox.source
 
 %changelog
+* Tue Apr 21 2009 Andrew Overholt <overholt at 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 at redhat.com> 1:3.4.2-9
 - Re-add patch to build libswt-xulrunner instead of libswt-mozilla.
 - RHBZ#484453




More information about the scm-commits mailing list