rpms/eclipse/FC-4 eclipse.spec,1.159,1.160

[fedora-cvs-commits at redhat.com]

Author: overholt

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

Modified Files:
	eclipse.spec 
Log Message:
* Thu Oct 27 2005 Andrew Overholt <overholt at redhat.com> 3.1.1-1jpp_1fc.FC4.3
- Really fix browser issue on x86_64 (rh#168040).



Index: eclipse.spec
===================================================================
RCS file: /cvs/dist/rpms/eclipse/FC-4/eclipse.spec,v
retrieving revision 1.159
retrieving revision 1.160
diff -u -r1.159 -r1.160
--- eclipse.spec	25 Oct 2005 18:44:54 -0000	1.159
+++ eclipse.spec	27 Oct 2005 18:33:07 -0000	1.160
@@ -23,7 +23,7 @@
 Summary:        %{pkg_summary}
 Name:           eclipse
 Version:        %{eclipse_majmin}.%{eclipse_micro}
-Release:        1jpp_1fc.FC4.2
+Release:        1jpp_1fc.FC4.3
 License:        EPL
 Group:          Text Editors/Integrated Development Environments (IDE)
 URL:            http://www.eclipse.org/
@@ -362,15 +362,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
@@ -1190,6 +1201,9 @@
 %{_datadir}/%{name}/plugins/org.eclipse.platform.source.linux.gtk.*_3.1.1
 
 %changelog
+* Thu Oct 27 2005 Andrew Overholt <overholt at redhat.com> 3.1.1-1jpp_1fc.FC4.3
+- Really fix browser issue on x86_64 (rh#168040).
+
 * Tue Oct 25 2005 Andrew Overholt <overholt at redhat.com> 3.1.1-1jpp_1fc.FC4.2
 - Make non-gcj builds not noarch (rh#171711).