rpms/eclipse/devel eclipse.spec,1.565,1.566

[Andrew Overholt (overholt)]

Author: overholt

Update of /cvs/pkgs/rpms/eclipse/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2096

Modified Files:
	eclipse.spec 
Log Message:
* Mon Jul 28 2008 Andrew Overholt <overholt at redhat.com> 3.4.0-10
- Fix building of fragments for non-upstream arches


Index: eclipse.spec
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse/devel/eclipse.spec,v
retrieving revision 1.565
retrieving revision 1.566
diff -u -r1.565 -r1.566
--- eclipse.spec	29 Jul 2008 13:40:46 -0000	1.565
+++ eclipse.spec	29 Jul 2008 21:05:08 -0000	1.566
@@ -447,17 +447,27 @@
 %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 @@
 #%{_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 @@
 - 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 <overholt at redhat.com> 3.4.0-10
 - Add ability for pdebuild (-o) to work with Orbit-style dependencies