From da2e957bb4c5434cb699e0ce4985758dea98e085 Mon Sep 17 00:00:00 2001
From: Ben Konrath <bkonrath@fedoraproject.org>
Date: Nov 02 2006 06:52:24 +0000
Subject: - Move doc plugins to %%{_libdir}/eclipse/plugins because of html is being

    generated differently on different arches.
- Fix multilib problem when there are two or more jars within a jar.

---

diff --git a/eclipse.spec b/eclipse.spec
index 2bd3ca5..f75a5b8 100644
--- a/eclipse.spec
+++ b/eclipse.spec
@@ -26,7 +26,7 @@ Epoch:	1
 Summary:        An open, extensible IDE
 Name:           eclipse
 Version:        %{eclipse_majmin}.%{eclipse_micro}
-Release:        11%{?dist} 
+Release:        12%{?dist} 
 License:        EPL
 Group:          Text Editors/Integrated Development Environments (IDE)
 URL:            http://www.eclipse.org/
@@ -974,10 +974,13 @@ mv $RPM_BUILD_ROOT%{_datadir}/%{name}/plugins/org.eclipse.help.webapp_$HELPWEBAP
 UPDATECORELINUXVERSION=$(ls $RPM_BUILD_ROOT%{_datadir}/%{name}/plugins | grep update.core.linux_ | sed 's/org.eclipse.update.core.linux_//')
 mv $RPM_BUILD_ROOT%{_datadir}/%{name}/plugins/org.eclipse.update.core.linux_$UPDATECORELINUXVERSION \
   $RPM_BUILD_ROOT%{_libdir}/%{name}/plugins
-# FIXME: icu4j generates res_index.txt differently on different arches.
+# FIXME: icu4j generates res_index.txt differently on different arches - possible libgcj bug.
 mv $RPM_BUILD_ROOT%{_datadir}/%{name}/plugins/com.ibm.icu_3.4.5.jar $RPM_BUILD_ROOT%{_libdir}/%{name}/plugins
 mv $RPM_BUILD_ROOT%{_datadir}/%{name}/plugins/com.ibm.icu.source_3.4.5 $RPM_BUILD_ROOT%{_libdir}/%{name}/plugins
-
+# FIXME: the html in the doc plugins is generated differently on different
+# arches -- specifically <Class>-uses.html (e.g. IProblem-uses.html) are not
+# generated correctly.
+mv $RPM_BUILD_ROOT%{_datadir}/%{name}/plugins/*doc* $RPM_BUILD_ROOT%{_libdir}/%{name}/plugins
 
 mkdir -p home
 homedir=$(cd home && pwd)
@@ -1240,6 +1243,7 @@ build-jar-repository -s -p plugins/org.junit_* junit
 # chmod a+x $RPM_BUILD_ROOT%{_bindir}/ecj
 #%else
 
+exit 1
 # Ensure that the zip files are the same across all builds.
 # This is needed to make these package multilib compatible.
 # FIXME: this needs to be re-written as a separate program
@@ -1257,39 +1261,39 @@ for zip in `find ${RPM_BUILD_ROOT}%{_datadir}/%{name} -type f -name \*.zip -o -t
 
   # check if there are jars or zips inside the zip or jar
   zipsinside=`find $TMPDIR -type f -name \*.zip -o -name \*.jar`
-  if [ -n $zipsinside ]; then
+  if [ -n "$zipsinside" ]; then
      for zip2 in $zipsinside; do
-     # unpack every zip, set the date of the files and directories and repack the zip
-     ZIPNAME2=`basename $zip2`
-     TMPDIR2=`mktemp -d -p ${RPM_BUILD_ROOT}/tmp $ZIPNAME2.tmpdir.XXXXXXXXXX`
-     ZIPDIR2=`mktemp -d -p ${RPM_BUILD_ROOT}/tmp $ZIPNAME2.zipdir.XXXXXXXXXX`
-
-     pushd $TMPDIR2
-     unzip -qq -o $zip2
-     rm -f $zip2
-
-     # create the directories first
-     for d in `find -type d | LC_ALL=C sort`; do
-       mkdir -p $ZIPDIR2/$d
-     done
-     # move the contents over to the a new directory in order and set the times. 
-     for f in `find -type f | LC_ALL=C sort`; do
-       cp $f $ZIPDIR2/$f
-       touch --date="1970-01-01 UTC" $ZIPDIR2/$f
-     done
-     popd
-
-     # Set the times of the directories.
-     touch --date="1970-01-01 UTC" `find $ZIPDIR2 -type d`
-
-     # make the new zip
-     pushd $ZIPDIR2
-     find -type f -print | LC_ALL=C sort | /usr/bin/zip -q -X -9 $zip2 -@
-     popd
-
-     # Cleanup.
-     rm -rf $TMPDIR2
-     rm -rf $ZIPDIR2
+       # unpack every zip, set the date of the files and directories and repack the zip
+       ZIPNAME2=`basename $zip2`
+       TMPDIR2=`mktemp -d -p ${RPM_BUILD_ROOT}/tmp $ZIPNAME2.tmpdir.XXXXXXXXXX`
+       ZIPDIR2=`mktemp -d -p ${RPM_BUILD_ROOT}/tmp $ZIPNAME2.zipdir.XXXXXXXXXX`
+
+       pushd $TMPDIR2
+       unzip -qq -o $zip2
+       rm -f $zip2
+
+       # create the directories first
+       for d in `find -type d | LC_ALL=C sort`; do
+         mkdir -p $ZIPDIR2/$d
+       done
+       # move the contents over to the a new directory in order and set the times. 
+       for f in `find -type f | LC_ALL=C sort`; do
+         cp $f $ZIPDIR2/$f
+         touch --date="1970-01-01 UTC" $ZIPDIR2/$f
+       done
+       popd
+
+       # Set the times of the directories.
+       touch --date="1970-01-01 UTC" `find $ZIPDIR2 -type d`
+
+       # make the new zip
+       pushd $ZIPDIR2
+       find -type f -print | LC_ALL=C sort | /usr/bin/zip -q -X -9 $zip2 -@
+       popd
+
+       # Cleanup.
+       rm -rf $TMPDIR2
+       rm -rf $ZIPDIR2
      done
   fi 
   
@@ -1578,7 +1582,7 @@ rm -f %{_datadir}/%{name}/configuration/org.eclipse.update/platform.xml*
 %{_datadir}/%{name}/plugins/org.eclipse.tomcat_*
 %{_datadir}/%{name}/plugins/org.eclipse.core.filebuffers_*
 %{_datadir}/%{name}/plugins/org.eclipse.core.runtime.compatibility.registry_*
-%{_datadir}/%{name}/plugins/org.eclipse.platform.doc.user_*
+%{_libdir}/%{name}/plugins/org.eclipse.platform.doc.user_*
 %{_datadir}/%{name}/plugins/org.eclipse.ltk.ui.refactoring_*
 %{_datadir}/%{name}/plugins/org.eclipse.ui.workbench.texteditor_*
 %{_datadir}/%{name}/plugins/org.eclipse.text_*
@@ -1645,7 +1649,7 @@ rm -f %{_datadir}/%{name}/configuration/org.eclipse.update/platform.xml*
 %defattr(-,root,root)
 %{_datadir}/%{name}/features/org.eclipse.platform.source_*
 %{_libdir}/%{name}/plugins/org.eclipse.platform.source.linux.gtk.%{eclipse_arch}_*
-%{_datadir}/%{name}/plugins/org.eclipse.platform.doc.isv_*
+%{_libdir}/%{name}/plugins/org.eclipse.platform.doc.isv_*
 %{_libdir}/%{name}/plugins/org.eclipse.platform.source_*
 %if %{gcj_support}
 %{_libdir}/gcj/%{name}/org.eclipse.platform.doc.isv_*
@@ -1658,7 +1662,7 @@ rm -f %{_datadir}/%{name}/configuration/org.eclipse.update/platform.xml*
 %{_datadir}/%{name}/plugins/org.eclipse.ant.ui_*
 %{_datadir}/%{name}/plugins/org.junit_*
 %{_datadir}/%{name}/plugins/org.eclipse.jdt.junit_*
-%{_datadir}/%{name}/plugins/org.eclipse.jdt.doc.user_*
+%{_libdir}/%{name}/plugins/org.eclipse.jdt.doc.user_*
 #%{_datadir}/%{name}/plugins/org.eclipse.jdt.apt.core_*
 %{_datadir}/%{name}/plugins/org.eclipse.jdt.ui_*
 %{_datadir}/%{name}/plugins/org.eclipse.jdt.debug_*
@@ -1689,13 +1693,13 @@ rm -f %{_datadir}/%{name}/configuration/org.eclipse.update/platform.xml*
 %files jdt-sdk
 %defattr(-,root,root)
 %{_datadir}/%{name}/features/org.eclipse.jdt.source_*
-%{_datadir}/%{name}/plugins/org.eclipse.jdt.doc.isv_*
+%{_libdir}/%{name}/plugins/org.eclipse.jdt.doc.isv_*
 %{_datadir}/%{name}/plugins/org.eclipse.jdt.source_*
 
 %files pde
 %defattr(-,root,root)
 %{_datadir}/%{name}/features/org.eclipse.pde_*
-%{_datadir}/%{name}/plugins/org.eclipse.pde.doc.user_*
+%{_libdir}/%{name}/plugins/org.eclipse.pde.doc.user_*
 %{_datadir}/%{name}/plugins/org.eclipse.pde.build_*
 %{_datadir}/%{name}/plugins/org.eclipse.pde.build
 %{_datadir}/%{name}/plugins/org.eclipse.pde_*
@@ -1730,11 +1734,17 @@ rm -f %{_datadir}/%{name}/configuration/org.eclipse.update/platform.xml*
 %{_datadir}/%{name}/plugins/org.eclipse.sdk_*
 
 %changelog
+* Thu Nov 02 2006 Ben Konrath <bkonrath@redhat.com> 3.2.1-12
+- Move doc plugins to %%{_libdir}/eclipse/plugins because of html is being
+  generated differently on different arches.
+- Fix multilib problem when there are two or more jars within a jar.
+
 * Wed Nov 01 2006 Ben Konrath <bkonrath@redhat.com> 3.2.1-11
 - Move copy-platform to %%{_libdir}/eclipse
 - Move the platform.source, icu4j, icu4j.source, help.webapp and
-  update.core.linux plugins to %%{_libdir}/eclipse/plugins because it has
-  the laucher src zip which is arch specific.
+  update.core.linux plugins to %%{_libdir}/eclipse/plugins because these plugins
+  have platform specific content. Some of the platform specific content may be
+  a result of bugs in libgcj. These need to be investigated.
 - Disable building the help indexes on all archs so that we have the same doc
   plugins on all archs.
 - Remove org.apache.ant_1.6.5/bin/runant.py to avoid multilib conflicts.