rpms/eclipse/devel eclipse-launcher-addplatformtotildeeclipse.patch, 1.3, 1.4 eclipse.spec, 1.425, 1.426
fedora-cvs-commits at redhat.com
fedora-cvs-commits at redhat.com
Wed May 2 13:35:16 UTC 2007
- Previous message (by thread): rpms/alsa-utils/devel alsa-utils.spec, 1.52, 1.53 alsaunmute.c, 1.12, 1.13
- Next message (by thread): rpms/minicom/FC-6 minicom-2.2-drop-privs.patch, NONE, 1.1 minicom-2.2-esc.patch, NONE, 1.1 minicom-2.2-gotodir.patch, NONE, 1.1 minicom-2.2-ncurses.patch, NONE, 1.1 minicom-2.2-rh.patch, NONE, 1.1 minicom-2.2-setlocale.patch, NONE, 1.1 minicom-2.2-spaces.patch, NONE, 1.1 minicom-2.2-staticbuf.patch, NONE, 1.1 minicom-2.2-umask.patch, NONE, 1.1 minicom-2.2-wchar.patch, NONE, 1.1 .cvsignore, 1.5, 1.6 minicom.spec, 1.23, 1.24 sources, 1.5, 1.6 minicom-2.00.0-gcc4.patch, 1.1, NONE minicom-2.00.0-gotodir.patch, 1.1, NONE minicom-2.00.0-inssp.patch, 1.1, NONE minicom-2.00.0-offby1.patch, 1.1, NONE minicom-2.1-debug.patch, 1.1, NONE minicom-2.1-esc.patch, 1.1, NONE minicom-2.1-rh.patch, 1.1, NONE minicom-2.1-staticbuf.patch, 1.1, NONE minicom-drop-privs.patch, 1.1, NONE minicom-umask.patch, 1.1, NONE minicom.desktop, 1.1, NONE
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: bkonrath
Update of /cvs/dist/rpms/eclipse/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv9801
Modified Files:
eclipse-launcher-addplatformtotildeeclipse.patch eclipse.spec
Log Message:
* Wed May 02 2007 Ben Konrath <bkonrath at redhat.com> 3.2.2-12
- Fix additional problem with launcher-addplatformtotildeeclipse.patch.
- Resolves: #238109.
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/devel/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 18:03:28 -0000 1.3
+++ eclipse-launcher-addplatformtotildeeclipse.patch 2 May 2007 13:35:13 -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/devel/eclipse.spec,v
retrieving revision 1.425
retrieving revision 1.426
diff -u -r1.425 -r1.426
--- eclipse.spec 30 Apr 2007 18:03:28 -0000 1.425
+++ eclipse.spec 2 May 2007 13:35:13 -0000 1.426
@@ -19,7 +19,7 @@
Summary: An open, extensible IDE
Name: eclipse
Version: %{eclipse_majmin}.%{eclipse_micro}
-Release: 11%{?dist}
+Release: 12%{?dist}
License: Eclipse Public License
Group: Text Editors/Integrated Development Environments (IDE)
URL: http://www.eclipse.org/
@@ -1718,6 +1718,10 @@
%{_libdir}/%{name}/plugins/org.eclipse.sdk_*
%changelog
+* Wed May 02 2007 Ben Konrath <bkonrath at redhat.com> 3.2.2-12
+- Fix additional problem with launcher-addplatformtotildeeclipse.patch.
+- Resolves: #238109.
+
* Mon Apr 30 2007 Ben Konrath <bkonrath at redhat.com> 3.2.2-11
- Add workaround in launcher-addplatformtotildeeclipse.patch for problems
caused by bug #238109.
- Previous message (by thread): rpms/alsa-utils/devel alsa-utils.spec, 1.52, 1.53 alsaunmute.c, 1.12, 1.13
- Next message (by thread): rpms/minicom/FC-6 minicom-2.2-drop-privs.patch, NONE, 1.1 minicom-2.2-esc.patch, NONE, 1.1 minicom-2.2-gotodir.patch, NONE, 1.1 minicom-2.2-ncurses.patch, NONE, 1.1 minicom-2.2-rh.patch, NONE, 1.1 minicom-2.2-setlocale.patch, NONE, 1.1 minicom-2.2-spaces.patch, NONE, 1.1 minicom-2.2-staticbuf.patch, NONE, 1.1 minicom-2.2-umask.patch, NONE, 1.1 minicom-2.2-wchar.patch, NONE, 1.1 .cvsignore, 1.5, 1.6 minicom.spec, 1.23, 1.24 sources, 1.5, 1.6 minicom-2.00.0-gcc4.patch, 1.1, NONE minicom-2.00.0-gotodir.patch, 1.1, NONE minicom-2.00.0-inssp.patch, 1.1, NONE minicom-2.00.0-offby1.patch, 1.1, NONE minicom-2.1-debug.patch, 1.1, NONE minicom-2.1-esc.patch, 1.1, NONE minicom-2.1-rh.patch, 1.1, NONE minicom-2.1-staticbuf.patch, 1.1, NONE minicom-drop-privs.patch, 1.1, NONE minicom-umask.patch, 1.1, NONE minicom.desktop, 1.1, NONE
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-cvs-commits
mailing list