rpms/eclipse/FC-6 eclipse-launcher-addplatformtotildeeclipse.patch, 1.3, 1.4 eclipse.spec, 1.356, 1.357

[fedora-cvs-commits at redhat.com]

Author: bkonrath

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

Modified Files:
	eclipse-launcher-addplatformtotildeeclipse.patch eclipse.spec 
Log Message:
* Tue May 01 2007 Ben Konrath <bkonrath at redhat.com> 3.2.2-5.fc6
- Bug fix in launcher-addplatformtotildeeclipse.patch.
- Resolves: #238107.


eclipse-launcher-addplatformtotildeeclipse.patch:
 eclipse.c        |    2 +
 gtk/eclipseGtk.c |  106 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 108 insertions(+)

Index: eclipse-launcher-addplatformtotildeeclipse.patch
===================================================================
RCS file: /cvs/dist/rpms/eclipse/FC-6/eclipse-launcher-addplatformtotildeeclipse.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- eclipse-launcher-addplatformtotildeeclipse.patch	30 Apr 2007 17:58:46 -0000	1.3
+++ eclipse-launcher-addplatformtotildeeclipse.patch	1 May 2007 08:58:31 -0000	1.4
@@ -4,7 +4,7 @@
 retrieving revision 1.71
 diff -u -r1.71 eclipse.c
 --- library/eclipse.c	25 Apr 2006 14:31:50 -0000	1.71
-+++ library/eclipse.c	30 Apr 2007 17:43:21 -0000
++++ library/eclipse.c	1 May 2007 08:48:33 -0000
 @@ -512,6 +513,8 @@
      /* Get the command to start the Java VM. */
      vmCommandArgs = getVMCommand( argc, argv );
@@ -20,8 +20,8 @@
 retrieving revision 1.27
 diff -u -r1.27 eclipseGtk.c
 --- library/gtk/eclipseGtk.c	27 Mar 2006 18:25:42 -0000	1.27
-+++ library/gtk/eclipseGtk.c	30 Apr 2007 17:43:21 -0000
-@@ -335,3 +335,95 @@
++++ library/gtk/eclipseGtk.c	1 May 2007 08:48:33 -0000
+@@ -335,3 +335,109 @@
    	gtk_main_quit();
    	return FALSE;
  }
@@ -43,6 +43,12 @@
 +		/* If platform.xml doesn't exist, Eclipse has yet to be started.
 +	 	 * We don't have worry about doing anything now and in the future 
 +	 	 * so add the appropriate file to ~/.eclipse. */
++		if (g_mkdir(g_strconcat(g_get_home_dir(), "/.eclipse", NULL), 493) < 0) 
++		{
++			g_print("Error creating ~/.eclipse/.");
++			g_print(g_strconcat(error->message, "\n\0", NULL));
++			g_free(error);
++		}
 +	   	if (g_file_set_contents(touched, "\0", -1, &error) == FALSE)
 +		{
 +			g_print("Error touching ~/.eclipse/.homedirmodified-fedora.");
@@ -105,14 +111,22 @@
 +	}
 +
 +	/* At this point platform_xml exists and touched does not exist. */
-+	if (g_remove (platform_xml) < 0) 
++	if (g_remove(platform_xml) < 0) 
 +	{
 +       		g_print("Error writing platform.xml in ~/.eclipse.\
 +		         You should remove ~/.eclipse before restarting Eclipse:\0");
 +		g_print(g_strconcat(error->message, "\n\0", NULL));
 +        	g_free(error);
++		g_free(platform_xml);
++		g_free(touched);
++		return;
++	}
++	if (g_file_set_contents(touched, "\0", -1, &error) == FALSE)
++	{
++		g_print("Error touching ~/.eclipse/.homedirmodified-fedora.");
++		g_print(g_strconcat(error->message, "\n\0", NULL));
++		g_free(error);
 +	}
-+
 +	g_free(platform_xml);
 +	g_free(touched);
 +	return;


Index: eclipse.spec
===================================================================
RCS file: /cvs/dist/rpms/eclipse/FC-6/eclipse.spec,v
retrieving revision 1.356
retrieving revision 1.357
diff -u -r1.356 -r1.357
--- eclipse.spec	30 Apr 2007 17:58:46 -0000	1.356
+++ eclipse.spec	1 May 2007 08:58:31 -0000	1.357
@@ -19,6 +19,7 @@
 Summary:        An open, extensible IDE
 Name:           eclipse
 Version:        %{eclipse_majmin}.%{eclipse_micro}
+Release:        5%{?dist} 
 Release:        4%{?dist} 
 License:        Eclipse Public License
 Group:          Text Editors/Integrated Development Environments (IDE)
@@ -1763,6 +1764,10 @@
 %{_libdir}/%{name}/plugins/org.eclipse.sdk_*
 
 %changelog
+* Tue May 01 2007 Ben Konrath <bkonrath at redhat.com> 3.2.2-5.fc6
+- Bug fix in launcher-addplatformtotildeeclipse.patch.
+- Resolves: #238107.
+
 * Mon Apr 30 2007 Ben Konrath <bkonrath at redhat.com> 3.2.2-4.fc6
 - Add workaround in launcher-addplatformtotildeeclipse.patch for problems 
   caused by bug #238107.