diff --git a/baselibs.conf b/baselibs.conf index 65a49b6..d65d06d 100644 --- a/baselibs.conf +++ b/baselibs.conf @@ -1,8 +1,8 @@ -libcamel-1_2-28 +libcamel-1_2-29 libebackend-1_2-1 -libebook-1_2-11 -libecal-1_2-9 -libedata-book-1_2-10 -libedata-cal-1_2-12 -libedataserver-1_2-14 +libebook-1_2-12 +libecal-1_2-10 +libedata-book-1_2-11 +libedata-cal-1_2-13 +libedataserver-1_2-15 libedataserverui-3_0-1 diff --git a/e-d-s-deprecated.patch b/e-d-s-deprecated.patch new file mode 100644 index 0000000..ff16779 --- /dev/null +++ b/e-d-s-deprecated.patch @@ -0,0 +1,37 @@ +Index: evolution-data-server-3.1.90/libedataserver/e-data-server-util.c +=================================================================== +--- evolution-data-server-3.1.90.orig/libedataserver/e-data-server-util.c ++++ evolution-data-server-3.1.90/libedataserver/e-data-server-util.c +@@ -251,7 +251,12 @@ e_util_utf8_strstrcase (const gchar *hay + static gunichar + stripped_char (gunichar ch) + { +- gunichar *decomp, retval; ++#if GLIB_CHECK_VERSION(2,29,12) ++ gunichar decomp[4]; ++#else ++ gunichar *decomp; ++#endif ++ gunichar retval; + GUnicodeType utype; + gsize dlen; + +@@ -268,11 +273,18 @@ stripped_char (gunichar ch) + /* Convert to lowercase, fall through */ + ch = g_unichar_tolower (ch); + case G_UNICODE_LOWERCASE_LETTER: ++#if GLIB_CHECK_VERSION(2,29,12) ++ if ((dlen = g_unichar_fully_decompose (ch, FALSE, decomp, 4))) { ++ retval = decomp[0]; ++ return retval; ++ } ++#else + if ((decomp = g_unicode_canonical_decomposition (ch, &dlen))) { + retval = decomp[0]; + g_free (decomp); + return retval; + } ++#endif + break; + } + diff --git a/evolution-data-server-3.1.4.tar.bz2 b/evolution-data-server-3.1.4.tar.bz2 deleted file mode 100644 index fce1f54..0000000 --- a/evolution-data-server-3.1.4.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:5e950bd95a20b0c7adefaf9236e3a81255e7479965506cf1cb7deed6464b8c98 -size 4496402 diff --git a/evolution-data-server-3.1.91.tar.bz2 b/evolution-data-server-3.1.91.tar.bz2 new file mode 100644 index 0000000..80fe5f1 --- /dev/null +++ b/evolution-data-server-3.1.91.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:9d133d7de1cb2d5ca87b5de67048f01a47465a8f36e9a3a44f00f4eb8147ce8a +size 4593908 diff --git a/evolution-data-server.changes b/evolution-data-server.changes index 604cd86..2369339 100644 --- a/evolution-data-server.changes +++ b/evolution-data-server.changes @@ -1,3 +1,66 @@ +------------------------------------------------------------------- +Sun Sep 4 16:25:26 UTC 2011 - vuntz@opensuse.org + +- Update to version 3.1.91: + + Do not expose password in imapx log + + Add a vapi for ecalendar + + Bugs fixed: + - bgo#566563: Make ESource password prompts clearer + - bgo#655253: Delete of one occurrence of a repeatable event + don't work + - bgo#655433: Drag and Drop of messages out of Junk folder + broken + - bgo#657345: Remember password by default for book/calendar + - bgo#655111, bgo#657836. + + Updated translations. + +------------------------------------------------------------------- +Thu Sep 1 14:49:19 UTC 2011 - vuntz@opensuse.org + +- Update to version 3.1.90: + + Various fixes regarding Google integration, including data loss + bugs. + + Add Google Talk field to the list of IM information + + Camel API changes (see NEWS). + + Pretend successful read when skipping 3+ part of + multipart/signed + + Various other code changes. + + Bugs fixed: + - bgo#562912: Unread vfolder marks unread messages as read + - bgo#576398: vfolder not showing new messages from nntp group + - bgo#651469: Folders don't update after moving mails in + maildir + - bgo#652914: IMAP: moving mail puts a copy into real Trash too + - bgo#656051: Preserve mbox file attributes after rewrite + - bgo#651693, bgo#651849, bgo#652437, bgo#655121, bgo#655272, + bgo#655833, bgo#655997, bgo#657181. + + Updated translations. +- Bump so_camel define to 29 to follow library soversion change. + This results in libcamel-1_2-28 being renamed to libcamel-1_2-29. +- Rewrite e-d-s-deprecated.patch to correctly use + g_unichar_fully_decompose(). + +------------------------------------------------------------------- +Mon Aug 15 09:26:11 CEST 2011 - dimstar@opensuse.org + +- Update to version 3.1.5: + + Various code changes. + + Bugs fixed: + - Several memory leaks fixed (bgo#656490, bgo#656487, + bgo#656480) + - bgo#619135: Add photo support to Google Contacts backend + - bgo#656267, bgo#656058, bgo#652172, bgo#655748, bgo#655190, + bgo#655499, bgo#654893, bgo#655414, bgo#655409, bgo#654472, + bgo#655331, bgo#654480. + + Updated translations. +- Update library sonum defines, following the code changes. + +------------------------------------------------------------------- +Tue Aug 2 19:38:54 UTC 2011 - dimstar@opensuse.org + +- Add e-d-s-deprecated.patch: Use g_unichar_fully_decompose instead + of deprecated g_unicode_canonical_decomposition. + ------------------------------------------------------------------- Sun Jul 24 11:54:53 CEST 2011 - vuntz@opensuse.org diff --git a/evolution-data-server.spec b/evolution-data-server.spec index ddf74c4..7e58394 100644 --- a/evolution-data-server.spec +++ b/evolution-data-server.spec @@ -20,26 +20,28 @@ # Shared Library soNUMs, to make it easier for updates # When updating the sonums, do not forget to also update baselibs.conf -%define so_camel 28 +%define so_camel 29 %define so_ebackend 1 -%define so_ebook 11 -%define so_ecal 9 -%define so_edata_book 10 -%define so_edata_cal 12 -%define so_edataserver 14 +%define so_ebook 12 +%define so_ecal 10 +%define so_edata_book 11 +%define so_edata_cal 13 +%define so_edataserver 15 %define so_edataserverui 1 Name: evolution-data-server %define _evo_version 3.2 License: LGPLv2+ Group: Development/Libraries/GNOME -Version: 3.1.4 +Version: 3.1.91 Release: 1 # FIXME: parallel build is broken in 3.1.3, check in later versions if this works Summary: Evolution Data Server Url: http://www.gnome.org Source0: http://download.gnome.org/sources/evolution-data-server/3.1/%{name}-%{version}.tar.bz2 Source99: baselibs.conf +# PATCH-FIX-UPSTREAM e-d-s-deprecated.patch bgo#655837 dimstar@opensuse.org -- g_unicode_canonical_decomposition is deprecated. +Patch0: e-d-s-deprecated.patch BuildRequires: bison BuildRequires: db-devel %if %USE_EVOLDAP @@ -225,6 +227,7 @@ This package contains developer documentation. %lang_package %prep %setup -q +%patch0 -p1 translation-update-upstream %build