diff --git a/eclipse.spec b/eclipse.spec index cb30622..0a4d219 100644 --- a/eclipse.spec +++ b/eclipse.spec @@ -447,17 +447,27 @@ IFS=' %ifarch ppc64 sparc sparcv9 sparc64 alpha ia64 IFS=' ' - # Copy over the fragments for these arches - cp -pr plugins/org.eclipse.equinox.launcher.gtk.linux.{ppc,%{_arch}} + # Fragments for these arches + rm -rf plugins/org.eclipse.equinox.launcher.gtk.linux.%{_arch} + mv plugins/org.eclipse.equinox.launcher.gtk.linux.{ppc,%{_arch}} pushd plugins/org.eclipse.equinox.launcher.gtk.linux.%{_arch} for f in $(find -type f); do sed -i -e "s/ppc/%{_arch}/g" $f + tofile=$(echo $f | sed "s/ppc/%{_arch}/") + if [ $tofile != $f ]; then + cp -rp $f $tofile + fi done popd - cp -pr plugins/org.eclipse.core.filesystem.linux.{ppc,%{_arch}} + rm -rf plugins/org.eclipse.core.filesystem.linux.%{_arch} + mv plugins/org.eclipse.core.filesystem.linux.{ppc,%{_arch}} pushd plugins/org.eclipse.core.filesystem.linux.%{_arch} for f in $(find -type f); do sed -i -e "s/ppc/%{_arch}/g" $f + tofile=$(echo $f | sed "s/ppc/%{_arch}/") + if [ $tofile != $f ]; then + cp -rp $f $tofile + fi done popd IFS=$OLDIFS @@ -1231,9 +1241,7 @@ fi #%{_libdir}/%{name}/configuration/org.eclipse.equinox.simpleconfigurator/bundles.info %{_libdir}/%{name}/notice.html %{_libdir}/%{name}/epl-v10.html -%ifarch %{ix86} x86_64 %{_libdir}/%{name}/about.html -%endif %ifarch x86_64 %{_libdir}/%{name}/about_files %endif @@ -1438,6 +1446,7 @@ fi - Make SWT JAR symlinks relative - Fold pde-runtime into pde - Add patch to add root files for non-upstream arches +- Fix building of fragments for non-upstream arches * Fri Jul 25 2008 Andrew Overholt 3.4.0-10 - Add ability for pdebuild (-o) to work with Orbit-style dependencies