pool/evolution
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 88112 from GNOME:Factory

Browse Source 
Update to 3.2.1; bug fixes we want for 12.1 (forwarded request 88098 from vuntz)

OBS-URL: https://build.opensuse.org/request/show/88112
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/evolution?expand=0&rev=116
This commit is contained in:
Sascha Peilicke 2011-10-18 12:01:17 +00:00 committed by Git OBS Bridge
commit fd66a1a4d5
5 changed files with 16 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
evolution-3.2.0.tar.bz2
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:375ca9bbfbc7eba9e645ed4407434bdddd20da064882ff91b82fb682eaa875c3
size 16707656

3
evolution-3.2.1.tar.bz2 Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:dd2abaed96c36968dcc9c15d697a1f87db62a83268f48dfbae45076b7edf835d
size 16927181

39
evolution-fix-cannot-upgrade-random.patch
View File

@ -1,39 +0,0 @@
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;
}
}

12
evolution.changes
View File

@ -1,3 +1,15 @@
-------------------------------------------------------------------
Sun Oct 16 17:44:25 UTC 2011 - vuntz@opensuse.org
- Update to version 3.2.1:
+ Bugs fixed: bgo#576478, bgo#655625, bgo#658066, bgo#658835,
bgo#659440, bgo#659486, bgo#659517, bgo#659558, bgo#659568,
bgo#659726, bgo#659828, bgo#659874, bgo#659876, bgo#659932,
bgo#660224, bgo#660721, bgo#660782, bgo#660799, bgo#660829,
bgo#660850, bgo#660861, bgo#661434, bgo#661542.
+ Updated translations.
- Drop evolution-fix-cannot-upgrade-random.patch: fixed upstream.
-------------------------------------------------------------------
Wed Oct 12 09:49:37 UTC 2011 - vuntz@opensuse.org

5
evolution.spec
View File

@ -72,13 +72,11 @@ License: LGPLv2.0 ; LGPLv3
Group: Productivity/Networking/Email/Clients
# This should be updated upon major version changes; it should match BASE_VERSION as defined in configure.in.
%define evolution_base_version 3.2
Version: 3.2.0
Version: 3.2.1
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.
@ -173,7 +171,6 @@ Evolution or embed the existing ones in other applications.
%prep
%setup -q
translation-update-upstream
%patch0 -p1
%if %USE_EVOLDAP
%patch15 -p1
%endif