rpms/eclipse/devel eclipse-gre64.conf.patch, NONE, 1.1 eclipse.script, 1.14, 1.15 eclipse.spec, 1.181, 1.182

[fedora-cvs-commits at redhat.com]

Author: overholt

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

Modified Files:
	eclipse.script eclipse.spec 
Added Files:
	eclipse-gre64.conf.patch 
Log Message:
* Mon Sep 19 2005 Andrew Overholt <overholt at redhat.com> 3.1.0_fc-15
- Include patch for /etc/gre64.conf (e.o#109253, rh#168040).
- Remove MOZILLA_FIVE_HOME magic from eclipse.script.


eclipse-gre64.conf.patch:
 eclipseGtk.c |   10 ++++++++++
 1 files changed, 10 insertions(+)

--- NEW FILE eclipse-gre64.conf.patch ---
===================================================================
RCS file: /home/eclipse/platform-launcher/library/gtk/eclipseGtk.c,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- platform-launcher/library/gtk/eclipseGtk.c	2005/08/16 16:19:58	1.23
+++ platform-launcher/library/gtk/eclipseGtk.c	2005/09/17 03:35:52	1.24
@@ -375,6 +375,16 @@
 		{
 			struct stat buf;
 			FILE *file = NULL;
+#if defined(__amd64__) || defined(__x86_64__)
+			if (stat("/etc/gre64.conf", &buf) == 0)
+			{
+				file = fopen("/etc/gre64.conf", "r");
+			}
+			else if (stat("/etc/gre.d/gre64.conf", &buf) == 0)
+			{
+				file = fopen("/etc/gre.d/gre64.conf", "r");
+			} else
+#endif
 			if (stat("/etc/gre.conf", &buf) == 0)
 			{
 				file = fopen("/etc/gre.conf", "r");


Index: eclipse.script
===================================================================
RCS file: /cvs/dist/rpms/eclipse/devel/eclipse.script,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- eclipse.script	27 Jun 2005 19:38:29 -0000	1.14
+++ eclipse.script	19 Sep 2005 19:57:47 -0000	1.15
@@ -35,11 +35,4 @@
   perl -p -i.bak -e 's|^site\.[0-9]*\.list\.[0-9]*=.*\n||g;' $USER_DIR/.metadata/.config/platform.cfg
 fi
 
-# This makes the embedded browser work.
-if [ -z "$MOZILLA_FIVE_HOME" ]; then
-  XPCOM=$(ls -t /usr/lib/mozilla-*/libxpcom.so|head -n1)
-  export MOZILLA_FIVE_HOME=$(dirname $XPCOM)
-fi
-export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$MOZILLA_FIVE_HOME
-
 exec /usr/share/eclipse/eclipse $ECLIPSE_OPTS $@ $VM_OPTS


Index: eclipse.spec
===================================================================
RCS file: /cvs/dist/rpms/eclipse/devel/eclipse.spec,v
retrieving revision 1.181
retrieving revision 1.182
diff -u -r1.181 -r1.182
--- eclipse.spec	24 Aug 2005 14:53:53 -0000	1.181
+++ eclipse.spec	19 Sep 2005 19:57:47 -0000	1.182
@@ -24,7 +24,7 @@
 Summary:        %{pkg_summary}
 Name:           eclipse
 Version:        %{eclipse_majmin}.%{eclipse_micro}_fc
-Release:        14
+Release:        15
 License:        EPL
 Group:          Text Editors/Integrated Development Environments (IDE)
 URL:            http://www.eclipse.org/
@@ -98,6 +98,9 @@
 Patch35:	%{name}-javadoc.patch
 # https://bugs.eclipse.org/bugs/show_bug.cgi?id=105430
 Patch36:	%{name}-ecj-classpath.patch
+# https://bugs.eclipse.org/bugs/show_bug.cgi?id=109253
+# http://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=168040
+Patch37:	%{name}-gre64.conf.patch
 
 %if %{gcj_support}
 ExclusiveArch: %{ix86} x86_64 ppc
@@ -354,6 +357,9 @@
 %patch34 -p1
 %patch35 -p0
 %patch36 -p1
+pushd features/org.eclipse.platform.launchers
+%patch37 -p1
+popd
 
 %if %{gcj_support}
   # Fedora splash screen.
@@ -1164,6 +1170,10 @@
 %{_datadir}/%{name}/plugins/org.eclipse.platform.source.linux.gtk.*_3.1.0
 
 %changelog
+* Mon Sep 19 2005 Andrew Overholt <overholt at redhat.com> 3.1.0_fc-15
+- Include patch for /etc/gre64.conf (e.o#109253, rh#168040).
+- Remove MOZILLA_FIVE_HOME magic from eclipse.script.
+
 * Wed Aug 24 2005 Andrew Overholt <overholt at redhat.com> 3.1.0_fc-14
 - /usr/lib -> %{_libdir} in eclipse.script (rh#159031).