Accepting request 87631 from GNOME:Factory

Pushing G:F

OBS-URL: https://build.opensuse.org/request/show/87631
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/evolution?expand=0&rev=115

evolution-fix-cannot-upgrade-random.patch

@@ -0,0 +1,39 @@
+commit 5645064bb35802aa9e9167cac5223fddb8852859
+Author: Vincent Untz <vuntz@gnome.org>
+Date:   Wed Oct 12 11:46:54 2011 +0200
+
+    Correctly initialize the variables when checking version update
+    
+    Else, we end up with non-initialized memory and "Cannot upgrade from
+    version <random data>".
+    
+    https://bugzilla.gnome.org/show_bug.cgi?id=661542
+
+diff --git a/shell/e-shell-migrate.c b/shell/e-shell-migrate.c
+index 89f94b0..dd75a40 100644
+--- a/shell/e-shell-migrate.c
++++ b/shell/e-shell-migrate.c
+@@ -739,6 +739,10 @@ shell_migrate_get_version (EShell *shell,
+ 	const gchar *key;
+ 	gchar *string;
+ 
++	*major = 0;
++	*minor = 0;
++	*micro = 0;
++
+ 	key = GCONF_VERSION_KEY;
+ 	client = e_shell_get_gconf_client (shell);
+ 	string = gconf_client_get_string (client, key, NULL);
+@@ -747,12 +751,6 @@ shell_migrate_get_version (EShell *shell,
+ 		/* Since 1.4.0 we've kept the version key in GConf. */
+ 		sscanf (string, "%d.%d.%d", major, minor, micro);
+ 		g_free (string);
+-
+-	} else {
+-		/* Otherwise, assume it's a new installation. */
+-		*major = 0;
+-		*minor = 0;
+-		*micro = 0;
+ 	}
+ }
+ 

evolution.changes

@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Wed Oct 12 09:49:37 UTC 2011 - vuntz@opensuse.org
+
+- Add evolution-fix-cannot-upgrade-random.patch: fix "Cannot
+  upgrade from version <random>" on initial startup.
+
 -------------------------------------------------------------------
 Wed Oct  5 13:38:54 UTC 2011 - vuntz@opensuse.org
 

evolution.spec

@@ -77,6 +77,8 @@ Release:        1
 # FIXME: check with upstream/meego if we want to enable clutter for express mode
 Summary:        The Integrated GNOME Mail, Calendar, and Address Book Suite
 Source0:        http://download.gnome.org/sources/evolution/3.2/%{name}-%{version}.tar.bz2
+# PATCH-FIX-UPSTREAM evolution-fix-cannot-upgrade-random.patch vuntz@opensuse.org -- Properly initialize memory to avoid weird "Cannot upgrade from version <random>" dialog
+Patch0:         evolution-fix-cannot-upgrade-random.patch
 # PATCH-FIX-OPENSUSE evolution-custom-openldap-includes.patch maw@novell.com -- look for ldap includes in %{_libdir}/evoldap/include
 Patch15:        evolution-custom-openldap-includes.patch
 # PATCH-FIX-UPSTREAM bnc-435722-book-uri-long.patch bnc#435722 abharath@suse.de -- Book URI: Spills Into Second Column.
@@ -171,6 +173,7 @@ Evolution or embed the existing ones in other applications.
 %prep
 %setup -q
 translation-update-upstream
+%patch0 -p1
 %if %USE_EVOLDAP
 %patch15 -p1
 %endif