rpms/eclipse/FC-6 eclipse-launcher-addplatformtotildeeclipse.patch, 1.1, 1.2 eclipse.spec, 1.354, 1.355
fedora-cvs-commits at redhat.com
fedora-cvs-commits at redhat.com
Fri Apr 27 08:45:50 UTC 2007
Author: bkonrath
Update of /cvs/dist/rpms/eclipse/FC-6
In directory cvs.devel.redhat.com:/tmp/cvs-serv13470
Modified Files:
eclipse-launcher-addplatformtotildeeclipse.patch eclipse.spec
Log Message:
* Fri Apr 27 2007 Ben Konrath <bkonrath at redhat.com> 3.2.2-3.fc6
- Fix problem in launcher-addplatformtotildeeclipse.patch.
- Resolves: #238107.
eclipse-launcher-addplatformtotildeeclipse.patch:
eclipse.c | 2 +
gtk/eclipseGtk.c | 85 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
2 files changed, 87 insertions(+)
Index: eclipse-launcher-addplatformtotildeeclipse.patch
===================================================================
RCS file: /cvs/dist/rpms/eclipse/FC-6/eclipse-launcher-addplatformtotildeeclipse.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- eclipse-launcher-addplatformtotildeeclipse.patch 28 Nov 2006 20:05:45 -0000 1.1
+++ eclipse-launcher-addplatformtotildeeclipse.patch 27 Apr 2007 08:45:47 -0000 1.2
@@ -6,8 +6,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 28 Nov 2006 19:50:03 -0000
-@@ -335,3 +335,73 @@
++++ library/gtk/eclipseGtk.c 27 Apr 2007 08:39:06 -0000
+@@ -335,3 +335,88 @@
gtk_main_quit();
return FALSE;
}
@@ -20,22 +20,37 @@
+ gsize old_length;
+ gchar *old_contents, *new_contents;
+ GError *error = NULL;
-+ const gchar *site_element = "<site url=\"platform:/base/\" enabled=\"true\" updateable=\"true\" policy=\"USER-EXCLUDE\">\n<feature id=\"org.eclipse.rcp\" version=\"3.2.1.r321_v20060801-clWbqCmjexIWDqg\" url=\"features/org.eclipse.rcp_3.2.1.r321_v20060801-clWbqCmjexIWDqg/\">\n</feature>\n</site>\n\0";
++ const gchar *site_element = "<site url=\"platform:/base/\" enabled=\"true\" updateable=\"true\" policy=\"USER-EXCLUDE\">\n<feature id=\"org.eclipse.rcp\" version=\"3.2.2.r322_v20070104-iwP0VLKnfFC923K\" url=\"features/org.eclipse.rcp_3.2.2.r322_v20070104-iwP0VLKnfFC923K/\">\n</feature>\n</site>\n\0";
+
+ platform_xml = g_strconcat(g_get_home_dir(), "/.eclipse/org.eclipse.platform_3.2.0/configuration/org.eclipse.update/platform.xml", NULL);
-+ touched = g_strconcat(g_get_home_dir(), "/.eclipse/.homedirmodified-fedora", NULL);
++ touched = g_strconcat(g_get_home_dir(), "/.eclipse/.dont-need-to-modify-homedir-fedora", NULL);
+
-+ /* If platform.xml doesn't exist, Eclipse has yet to be started
-+ * so don't worry about doing anything. Also, guard against doing
-+ * this more than once with a dot file. */
-+ if (!g_file_test(platform_xml, G_FILE_TEST_EXISTS) || \
-+ g_file_test(touched, G_FILE_TEST_EXISTS)) {
++
++ if (!g_file_test(platform_xml, G_FILE_TEST_EXISTS))
++ {
++ /* 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_file_set_contents(touched, "\0", -1, &error) == FALSE)
++ {
++ g_print("Error touching ~/.eclipse/.dont-need-to-modify-homedir-fedora.");
++ g_print(g_strconcat(error->message, "\n\0", NULL));
++ g_free(error);
++ }
+ g_free(platform_xml);
+ g_free(touched);
+ return;
++
++ } else if (g_file_test(touched, G_FILE_TEST_EXISTS)) {
++ /* touched exists, we don't need to do anything */
++ g_free(platform_xml);
++ g_free(touched);
++ return;
+ }
-+
+
++
++ /* At this point platform_xml exists and touched does not exist */
++
+ if (g_file_get_contents (platform_xml,
+ &old_contents, &old_length, &error) == FALSE)
+ {
@@ -68,7 +83,7 @@
+
+ if (g_file_set_contents(touched, "\0", -1, &error) == FALSE)
+ {
-+ g_print("Error touching ~/.eclipse/.homedirmodified-fedora.\
++ g_print("Error touching ~/.eclipse/.dont-need-to-modify-homedir-fedora.\
+ You should remove ~/.eclipse before restarting Eclipse:\0");
+ g_print(g_strconcat(error->message, "\n\0", NULL));
+ g_free(error);
@@ -87,7 +102,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 28 Nov 2006 19:50:03 -0000
++++ library/eclipse.c 27 Apr 2007 08:39:05 -0000
@@ -512,6 +512,8 @@
/* Get the command to start the Java VM. */
vmCommandArgs = getVMCommand( argc, argv );
Index: eclipse.spec
===================================================================
RCS file: /cvs/dist/rpms/eclipse/FC-6/eclipse.spec,v
retrieving revision 1.354
retrieving revision 1.355
diff -u -r1.354 -r1.355
--- eclipse.spec 25 Apr 2007 16:53:32 -0000 1.354
+++ eclipse.spec 27 Apr 2007 08:45:47 -0000 1.355
@@ -19,7 +19,7 @@
Summary: An open, extensible IDE
Name: eclipse
Version: %{eclipse_majmin}.%{eclipse_micro}
-Release: 2%{?dist}
+Release: 3%{?dist}
License: Eclipse Public License
Group: Text Editors/Integrated Development Environments (IDE)
URL: http://www.eclipse.org/
@@ -1763,6 +1763,10 @@
%{_libdir}/%{name}/plugins/org.eclipse.sdk_*
%changelog
+* Fri Apr 27 2007 Ben Konrath <bkonrath at redhat.com> 3.2.2-3.fc6
+- Fix problem in launcher-addplatformtotildeeclipse.patch.
+- Resolves: #238107.
+
* Wed Apr 11 2007 Ben Konrath <bkonrath at redhat.com> 3.2.2-2.fc6
- Fix links to system-installed javadocs.
- Update package-build releng script to work with 3.2 plugins.
More information about the fedora-cvs-commits
mailing list