[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]

rpms/eclipse/devel eclipse-add-ppc64-sparc64-s390-s390x.patch, 1.1, 1.2 eclipse.spec, 1.407, 1.408



Author: bkonrath

Update of /cvs/dist/rpms/eclipse/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv26319

Modified Files:
	eclipse-add-ppc64-sparc64-s390-s390x.patch eclipse.spec 
Log Message:
* Tue Feb 06 2007 Ben Konrath <bkonrath redhat com> 3.2.1-36
- Rework ppc64, s390{x} and sparc{64} hack again to try to fix multilib 
  problem.


eclipse-add-ppc64-sparc64-s390-s390x.patch:
 eclipseAdaptor/src/org/eclipse/core/runtime/internal/adaptor/PluginConverterImpl.java                          |    0 
 eclipseAdaptor/src/org/eclipse/osgi/service/environment/Constants.java                                         |    0 
 features/org.eclipse.platform.source/feature.xml                                                               |    4 
 features/org.eclipse.rcp.source/feature.xml                                                                    |    5 
 features/org.eclipse.rcp/feature.xml                                                                           |   55 ++++++++++
 plugins/org.eclipse.core.runtime/src/org/eclipse/core/internal/runtime/InternalPlatform.java                   |    4 
 plugins/org.eclipse.core.runtime/src/org/eclipse/core/runtime/Platform.java                                    |    5 
 plugins/org.eclipse.osgi/eclipseAdaptor/src/org/eclipse/core/runtime/internal/adaptor/PluginConverterImpl.java |    2 
 plugins/org.eclipse.osgi/eclipseAdaptor/src/org/eclipse/osgi/service/environment/Constants.java                |    5 
 src/org/eclipse/core/internal/runtime/InternalPlatform.java                                                    |    0 
 src/org/eclipse/core/runtime/Platform.java                                                                     |    0 
 11 files changed, 79 insertions(+), 1 deletion(-)

Index: eclipse-add-ppc64-sparc64-s390-s390x.patch
===================================================================
RCS file: /cvs/dist/rpms/eclipse/devel/eclipse-add-ppc64-sparc64-s390-s390x.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- eclipse-add-ppc64-sparc64-s390-s390x.patch	31 Jan 2007 23:36:17 -0000	1.1
+++ eclipse-add-ppc64-sparc64-s390-s390x.patch	7 Feb 2007 00:29:16 -0000	1.2
@@ -70,3 +70,96 @@
  	/**
  	 * Constant string (value "win32") indicating the platform is running on a
  	 * machine using the Windows windowing system.
+Index: feature.xml
+===================================================================
+RCS file: /cvsroot/eclipse/org.eclipse.sdk-feature/features/org.eclipse.rcp/feature.xml,v
+retrieving revision 1.40.2.1
+diff -u -r1.40.2.1 feature.xml
+--- features/org.eclipse.rcp/feature.xml 1 Aug 2006 17:29:33 -0000 1.40.2.1
++++ features/org.eclipse.rcp/feature.xml 6 Feb 2007 23:44:22 -0000
+@@ -308,5 +308,60 @@
+          install-size="0"
+          version="0.0.0"
+          unpack="false"/>
++    
++   <plugin
++         id="org.eclipse.swt.gtk.linux.ppc64"
++         os="linux"
++         ws="gtk"
++         arch="ia64"
++         download-size="0"
++         install-size="0"
++         version="0.0.0"
++         fragment="true"
++         unpack="false"/>
++
++   <plugin
++         id="org.eclipse.swt.gtk.linux.s390"
++         os="linux"
++         ws="gtk"
++         arch="ia64"
++         download-size="0"
++         install-size="0"
++         version="0.0.0"
++         fragment="true"
++         unpack="false"/>
++
++   <plugin
++         id="org.eclipse.swt.gtk.linux.s390x"
++         os="linux"
++         ws="gtk"
++         arch="ia64"
++         download-size="0"
++         install-size="0"
++         version="0.0.0"
++         fragment="true"
++         unpack="false"/>
++
++   <plugin
++         id="org.eclipse.swt.gtk.linux.sparc"
++         os="linux"
++         ws="gtk"
++         arch="ia64"
++         download-size="0"
++         install-size="0"
++         version="0.0.0"
++         fragment="true"
++         unpack="false"/>
++
++   <plugin
++         id="org.eclipse.swt.gtk.linux.sparc64"
++         os="linux"
++         ws="gtk"
++         arch="ia64"
++         download-size="0"
++         install-size="0"
++         version="0.0.0"
++         fragment="true"
++         unpack="false"/>
+ 
+ </feature>
+diff -ru features/org.eclipse.platform.source/feature.xml features/org.eclipse.platform.source/feature.xml
+--- features/org.eclipse.platform.source/feature.xml	2007-02-06 19:04:05.000000000 -0500
++++ features/org.eclipse.platform.source/feature.xml	2007-02-06 19:07:26.000000000 -0500
+@@ -28,4 +28,8 @@
+ 	<plugin ws="gtk"  os="linux" fragment="true" arch="x86" download-size="0" install-size="0" id="org.eclipse.platform.source.linux.gtk.x86" version="3.2.1.r321_v20060921-MGDh_08KUYM-Bvn"/>
+ 	<plugin ws="win32"  os="win32" fragment="true" arch="x86" download-size="0" install-size="0" id="org.eclipse.platform.source.win32.win32.x86" version="3.2.1.r321_v20060921-MGDh_08KUYM-Bvn"/>
+ 	<plugin ws="motif"  os="linux" fragment="true" arch="x86" download-size="0" install-size="0" id="org.eclipse.platform.source.linux.motif.x86" version="3.2.1.r321_v20060921-MGDh_08KUYM-Bvn"/>
++	<plugin ws="gtk"  os="linux" fragment="true" arch="s390" download-size="0" install-size="0" id="org.eclipse.platform.source.linux.gtk.s390" version="3.2.1.r321_v20060921-MGDh_08KUYM-Bvn"/>
++	<plugin ws="gtk"  os="linux" fragment="true" arch="s390x" download-size="0" install-size="0" id="org.eclipse.platform.source.linux.gtk.s390x" version="3.2.1.r321_v20060921-MGDh_08KUYM-Bvn"/>
++	<plugin ws="gtk"  os="linux" fragment="true" arch="sparc" download-size="0" install-size="0" id="org.eclipse.platform.source.linux.gtk.sparc" version="3.2.1.r321_v20060921-MGDh_08KUYM-Bvn"/>
++	<plugin ws="gtk"  os="linux" fragment="true" arch="sparc64" download-size="0" install-size="0" id="org.eclipse.platform.source.linux.gtk.sparc64" version="3.2.1.r321_v20060921-MGDh_08KUYM-Bvn"/>
+ </feature>
+diff -ru features/org.eclipse.rcp.source/feature.xml features/org.eclipse.rcp.source/feature.xml
+--- features/org.eclipse.rcp.source/feature.xml	2007-02-06 19:04:06.000000000 -0500
++++ features/org.eclipse.rcp.source/feature.xml	2007-02-06 19:09:11.000000000 -0500
+@@ -28,4 +28,9 @@
+ 	<plugin ws="win32"  os="win32" fragment="true" arch="x86" download-size="0" install-size="0" id="org.eclipse.rcp.source.win32.win32.x86" version="3.2.1.r321_v20060801-clWbqCmjexIWDqg"/>
+ 	<plugin ws="motif"  os="solaris" fragment="true" arch="sparc" download-size="0" install-size="0" id="org.eclipse.rcp.source.solaris.motif.sparc" version="3.2.1.r321_v20060801-clWbqCmjexIWDqg"/>
+ 	<plugin ws="motif"  os="linux" fragment="true" arch="x86" download-size="0" install-size="0" id="org.eclipse.rcp.source.linux.motif.x86" version="3.2.1.r321_v20060801-clWbqCmjexIWDqg"/>
++	<plugin ws="gtk"  os="linux" fragment="true" arch="ppc64" download-size="0" install-size="0" id="org.eclipse.rcp.source.linux.gtk.ppc64" version="3.2.1.r321_v20060801-clWbqCmjexIWDqg"/>
++	<plugin ws="gtk"  os="linux" fragment="true" arch="s390" download-size="0" install-size="0" id="org.eclipse.rcp.source.linux.gtk.s390" version="3.2.1.r321_v20060801-clWbqCmjexIWDqg"/>
++	<plugin ws="gtk"  os="linux" fragment="true" arch="s390x" download-size="0" install-size="0" id="org.eclipse.rcp.source.linux.gtk.s390x" version="3.2.1.r321_v20060801-clWbqCmjexIWDqg"/>
++	<plugin ws="gtk"  os="linux" fragment="true" arch="sparc" download-size="0" install-size="0" id="org.eclipse.rcp.source.linux.gtk.sparc" version="3.2.1.r321_v20060801-clWbqCmjexIWDqg"/>
++	<plugin ws="gtk"  os="linux" fragment="true" arch="sparc64" download-size="0" install-size="0" id="org.eclipse.rcp.source.linux.gtk.sparc64" version="3.2.1.r321_v20060801-clWbqCmjexIWDqg"/>
+ </feature>


Index: eclipse.spec
===================================================================
RCS file: /cvs/dist/rpms/eclipse/devel/eclipse.spec,v
retrieving revision 1.407
retrieving revision 1.408
diff -u -r1.407 -r1.408
--- eclipse.spec	2 Feb 2007 01:04:18 -0000	1.407
+++ eclipse.spec	7 Feb 2007 00:29:16 -0000	1.408
@@ -19,7 +19,7 @@
 Summary:        An open, extensible IDE
 Name:           eclipse
 Version:        %{eclipse_majmin}.%{eclipse_micro}
-Release:        35%{?dist} 
+Release:        36%{?dist} 
 License:        Eclipse Public License
 Group:          Text Editors/Integrated Development Environments (IDE)
 URL:            http://www.eclipse.org/
@@ -684,18 +684,15 @@
 sed --in-place "s/,.\{38\}ppc64.*macosx/,org.eclipse.platform.source.macosx/g" features/org.eclipse.platform.source/build.xml
 # replace final occurances with an existing arch
 sed --in-place "s/ppc64/x86_64/g" features/org.eclipse.platform.source/build.xml
-# remove ppc64 support from features/org.eclipse.platform.source/feature.xml
-mv features/org.eclipse.platform.source/feature.xml features/org.eclipse.platform.source/feature.xml.orig
-grep -v ppc64 features/org.eclipse.platform.source/feature.xml.orig > features/org.eclipse.platform.source/feature.xml
 # Move all of the ia64 directories to ppc64 or s390{,x} or sparc{,64} dirs and replace 
 # the ia64 strings with ppc64 or s390(x)
 %ifarch ppc64 s390 s390x sparc sparc64
   for f in $(find -name \*ia64\* | grep -v motif | grep -v ia64_32); do 
     mv $f $(echo $f | sed "s/ia64/%{_arch}/")
   done
-  find -type f ! -name \*.java -exec sed --in-place "s/ia64_32/@eye-eh-64_32@/g" "{}" \;
-  find -type f ! -name \*.java -exec sed --in-place "s/ia64/%{_arch}/g" "{}" \;
-  find -type f ! -name \*.java -exec sed --in-place "s/@eye-eh-64_32@/ia64_32/g" "{}" \;
+  find -type f ! -name \*.java -a ! -name feature.xml -exec sed --in-place "s/ia64_32/@eye-eh-64_32@/g" "{}" \;
+  find -type f ! -name \*.java -a ! -name feature.xml -exec sed --in-place "s/ia64/%{_arch}/g" "{}" \;
+  find -type f ! -name \*.java -a ! -name feature.xml -exec sed --in-place "s/@eye-eh-64_32@/ia64_32/g" "{}" \;
 %endif 
 
 # gjdoc can't handle Mac-encoded files
@@ -963,10 +960,17 @@
 mv $RPM_BUILD_ROOT%{_datadir}/%{name}/plugins/com.ibm.icu.source_3.4.5 $RPM_BUILD_ROOT%{_libdir}/%{name}/plugins
 
 # FIXME: there is a problem with gjdoc generating different HTML on different
-# architectures.  This happens with this plugin.
+# architectures.
 PLATFORMDOCISVVERSION=$(ls $RPM_BUILD_ROOT%{_datadir}/%{name}/plugins | grep platform.doc.isv_ | sed 's/org.eclipse.platform.doc.isv_//')
 mv $RPM_BUILD_ROOT%{_datadir}/%{name}/plugins/org.eclipse.platform.doc.isv_$PLATFORMDOCISVVERSION \
   $RPM_BUILD_ROOT%{_libdir}/%{name}/plugins
+# ppc64 is problematic with these two
+JDTDOCISVVERSION=$(ls $RPM_BUILD_ROOT%{_datadir}/%{name}/plugins | grep jdt.doc.isv_ | sed 's/org.eclipse.jdt.doc.isv_//')
+mv $RPM_BUILD_ROOT%{_datadir}/%{name}/plugins/org.eclipse.jdt.doc.isv_$JDTDOCISVVERSION \
+  $RPM_BUILD_ROOT%{_libdir}/%{name}/plugins
+PDEDOCUSERVERSION=$(ls $RPM_BUILD_ROOT%{_datadir}/%{name}/plugins | grep pde.doc.user_ | sed 's/org.eclipse.pde.doc.user_//')
+mv $RPM_BUILD_ROOT%{_datadir}/%{name}/plugins/org.eclipse.pde.doc.user_$PDEDOCUSERVERSION \
+  $RPM_BUILD_ROOT%{_libdir}/%{name}/plugins
 
 # To ensure that the product is org.eclipse.sdk.ide when eclipse-sdk is
 # installed, we must check for its presence at %%post{,un} time.  This does not
@@ -1697,13 +1701,13 @@
 %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_*
@@ -1738,6 +1742,10 @@
 %{_libdir}/%{name}/plugins/org.eclipse.sdk_*
 
 %changelog
+* Tue Feb 06 2007 Ben Konrath <bkonrath redhat com> 3.2.1-36
+- Rework ppc64, s390{x} and sparc{64} hack again to try to fix multilib 
+  problem.
+
 * Thu Feb 01 2007 Ben Konrath <bkonrath redhat com> 3.2.1-35
 - Use original name for the SWT JNI symlinks.
 - Rework ppc64, s390{x} and sparc{64} hack to fix multilib problem.


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]