rpms/eclipse/devel eclipse.spec,1.193,1.194

[fedora-cvs-commits redhat com]

Author: overholt

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

Modified Files:
	eclipse.spec 
Log Message:
* Thu Oct 27 2005 Andrew Overholt <overholt redhat com> 3.1.1-1jpp_4fc
- Really fix browser issue on x86_64 (rh#168040).
- Attempt to build on ia64 and ppc64 (include swt-mozilla on the latter).



Index: eclipse.spec
===================================================================
RCS file: /cvs/dist/rpms/eclipse/devel/eclipse.spec,v
retrieving revision 1.193
retrieving revision 1.194
diff -u -r1.193 -r1.194
--- eclipse.spec	25 Oct 2005 18:46:20 -0000	1.193
+++ eclipse.spec	27 Oct 2005 20:17:59 -0000	1.194
@@ -23,7 +23,7 @@
 Summary:        %{pkg_summary}
 Name:           eclipse
 Version:        %{eclipse_majmin}.%{eclipse_micro}
-Release:        1jpp_3fc
+Release:        1jpp_4fc
 License:        EPL
 Group:          Text Editors/Integrated Development Environments (IDE)
 URL:            http://www.eclipse.org/
@@ -109,7 +109,7 @@
 Patch39:	%{name}-e.o111299.patch
 
 %if %{gcj_support}
-ExclusiveArch: %{ix86} x86_64 ppc
+ExcludeArch: s390 s390x
 %else
 ExclusiveArch: %{ix86} x86_64 ppc ppc64 ia64
 %endif
@@ -121,12 +121,10 @@
 BuildRequires:  gtk2-devel
 BuildRequires:  glib2-devel
 BuildRequires:  gcc-c++
-%ifnarch ppc64
 BuildRequires:  mozilla = 37:1.7.11
 BuildRequires:  mozilla-devel = 37:1.7.11
 BuildRequires:  mozilla-nspr-devel
 BuildRequires:  xorg-x11-devel
-%endif
 %if %{gcj_support}
 BuildRequires:	gcc-java >= 4.0.2
 BuildRequires:	java-gcj-compat-devel >= 1.0.43
@@ -363,15 +361,26 @@
 %patch34 -p1
 %patch35 -p0
 %patch36 -p1
-pushd features/org.eclipse.platform.launchers
-%patch37 -p1
-popd
 %patch38 -p0
 pushd plugins
 %patch39 -p0
 popd
 cp %{SOURCE21} .
 
+# Because the launcher source is zipped up, we need to unzip, patch, and re-pack
+mkdir launchertmp
+unzip -d launchertmp plugins/org.eclipse.platform/launchersrc.zip
+pushd launchertmp
+%patch37 -p1
+zip -9 -r ../launchersrc.zip *
+popd
+mv launchersrc.zip plugins/org.eclipse.platform
+rm -rf launchertmp
+
+pushd features/org.eclipse.platform.launchers
+%patch37 -p1
+popd
+
 %if %{gcj_support}
   # Fedora splash screen.
   pushd plugins/org.eclipse.platform
@@ -1166,6 +1175,10 @@
 %{_datadir}/%{name}/plugins/org.eclipse.platform.source.linux.gtk.*_3.1.1
 
 %changelog
+* Thu Oct 27 2005 Andrew Overholt <overholt redhat com> 3.1.1-1jpp_4fc
+- Really fix browser issue on x86_64 (rh#168040).
+- Attempt to build on ia64 and ppc64 (include swt-mozilla on the latter).
+
 * Tue Oct 25 2005 Andrew Overholt <overholt redhat com> 3.1.1-1jpp_3fc
 - Make non-gcj builds not noarch (rh#171711).