From 62add6fad1e69a99efd04fc3c18d7d27ac672efe865047fcd9c7814dca5d5252 Mon Sep 17 00:00:00 2001 From: Vincent Untz Date: Wed, 21 Sep 2011 15:43:07 +0000 Subject: [PATCH 1/3] Accepting request 83458 from home:jengelh:bl-e - Remove redundant/obsolete tags/sections from specfile (cf. packaging guidelines) - Use %_smp_mflags for parallel build OBS-URL: https://build.opensuse.org/request/show/83458 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/evolution-data-server?expand=0&rev=106 --- evolution-data-server.changes | 7 +++++++ evolution-data-server.spec | 22 +--------------------- 2 files changed, 8 insertions(+), 21 deletions(-) diff --git a/evolution-data-server.changes b/evolution-data-server.changes index 2369339..172c8f3 100644 --- a/evolution-data-server.changes +++ b/evolution-data-server.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Sun Sep 18 17:17:12 UTC 2011 - jengelh@medozas.de + +- Remove redundant/obsolete tags/sections from specfile + (cf. packaging guidelines) +- Use %_smp_mflags for parallel build + ------------------------------------------------------------------- Sun Sep 4 16:25:26 UTC 2011 - vuntz@opensuse.org diff --git a/evolution-data-server.spec b/evolution-data-server.spec index 7e58394..8a4ef64 100644 --- a/evolution-data-server.spec +++ b/evolution-data-server.spec @@ -92,8 +92,6 @@ Evolution Data Server provides a central location for your address book and calendar in the GNOME Desktop. %package -n libcamel-1_2-%{so_camel} - - Summary: Evolution Data Server - Messaging Library Group: System/Libraries @@ -104,8 +102,6 @@ and calendar in the GNOME Desktop. This package contains a shared system library for messaging. %package -n libebackend-1_2-%{so_ebackend} - - Summary: Evolution Data Server - Backend Utilities Library Group: System/Libraries @@ -116,8 +112,6 @@ and calendar in the GNOME Desktop. This package contains a shared system library for backends. %package -n libebook-1_2-%{so_ebook} - - Summary: Evolution Data Server - Address Book Client Library Group: System/Libraries @@ -128,8 +122,6 @@ and calendar in the GNOME Desktop. This package contains a shared system library to access address books. %package -n libecal-1_2-%{so_ecal} - - Summary: Evolution Data Server - Calendar Client Library Group: System/Libraries @@ -140,8 +132,6 @@ and calendar in the GNOME Desktop. This package contains a shared system library to access calendars. %package -n libedata-book-1_2-%{so_edata_book} - - Summary: Evolution Data Server - Address Book Backend Library Group: System/Libraries @@ -152,8 +142,6 @@ and calendar in the GNOME Desktop. This package contains a shared system library for address book backends. %package -n libedata-cal-1_2-%{so_edata_cal} - - Summary: Evolution Data Server - Calendar Backend Library Group: System/Libraries @@ -164,8 +152,6 @@ and calendar in the GNOME Desktop. This package contains a shared system library for calendar backends. %package -n libedataserver-1_2-%{so_edataserver} - - Summary: Evolution Data Server - Utilities Library Group: System/Libraries @@ -176,8 +162,6 @@ and calendar in the GNOME Desktop. This package contains a shared system library. %package -n libedataserverui-3_0-%{so_edataserverui} - - Summary: Evolution Data Server - Graphical Utilities Library Group: System/Libraries @@ -245,8 +229,7 @@ translation-update-upstream --enable-nntp=yes \ --enable-vala-bindings \ --disable-static -#make %{?_smp_mflags} V=1 -make +make %{?_smp_mflags} %install %{makeinstall} @@ -265,9 +248,6 @@ find %{buildroot} -name '*.la' -type f -delete -print %endif %fdupes %{buildroot} -%clean -%{__rm} -rf %{buildroot} - %post -n libcamel-1_2-%{so_camel} -p /sbin/ldconfig %postun -n libcamel-1_2-%{so_camel} -p /sbin/ldconfig From 136717526c31e2f97baff6d65e1499b281bf0849772e6a1a1c0692c88316cd10 Mon Sep 17 00:00:00 2001 From: Vincent Untz Date: Thu, 22 Sep 2011 12:02:09 +0000 Subject: [PATCH 2/3] Accepting request 84329 from home:vuntz:branches:GNOME:Factory Update to 3.1.92 OBS-URL: https://build.opensuse.org/request/show/84329 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/evolution-data-server?expand=0&rev=107 --- e-d-s-deprecated.patch | 37 ---------------------------- evolution-data-server-3.1.91.tar.bz2 | 3 --- evolution-data-server-3.1.92.tar.bz2 | 3 +++ evolution-data-server.changes | 13 ++++++++++ evolution-data-server.spec | 8 ++---- 5 files changed, 18 insertions(+), 46 deletions(-) delete mode 100644 e-d-s-deprecated.patch delete mode 100644 evolution-data-server-3.1.91.tar.bz2 create mode 100644 evolution-data-server-3.1.92.tar.bz2 diff --git a/e-d-s-deprecated.patch b/e-d-s-deprecated.patch deleted file mode 100644 index ff16779..0000000 --- a/e-d-s-deprecated.patch +++ /dev/null @@ -1,37 +0,0 @@ -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.91.tar.bz2 b/evolution-data-server-3.1.91.tar.bz2 deleted file mode 100644 index 80fe5f1..0000000 --- a/evolution-data-server-3.1.91.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:9d133d7de1cb2d5ca87b5de67048f01a47465a8f36e9a3a44f00f4eb8147ce8a -size 4593908 diff --git a/evolution-data-server-3.1.92.tar.bz2 b/evolution-data-server-3.1.92.tar.bz2 new file mode 100644 index 0000000..94a8a6d --- /dev/null +++ b/evolution-data-server-3.1.92.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:079adb52f34cec6f30f0bee9851f164746ed293e61ffc464e37a636cb86cbc8a +size 4614184 diff --git a/evolution-data-server.changes b/evolution-data-server.changes index 172c8f3..330f1ec 100644 --- a/evolution-data-server.changes +++ b/evolution-data-server.changes @@ -1,3 +1,16 @@ +------------------------------------------------------------------- +Wed Sep 21 18:01:38 UTC 2011 - vuntz@opensuse.org + +- Update to version 3.1.92: + + Handle changes in the goa accounts list at runtime + + imapx: Fix read of uninitialized memory from g_str_has_prefix + + Various other code changes. + + Bugs fixed: bgo#659282, bgo#659184, bgo#659079, bgo#659165, + bgo#655253, bgo#632153, bgo#658911, bgo#655728, bgo#655837, + bgo#654818, + + Updated translations. +- Drop e-d-s-deprecated.patch: fixed upstream. + ------------------------------------------------------------------- Sun Sep 18 17:17:12 UTC 2011 - jengelh@medozas.de diff --git a/evolution-data-server.spec b/evolution-data-server.spec index 8a4ef64..80ac0aa 100644 --- a/evolution-data-server.spec +++ b/evolution-data-server.spec @@ -33,15 +33,12 @@ Name: evolution-data-server %define _evo_version 3.2 License: LGPLv2+ Group: Development/Libraries/GNOME -Version: 3.1.91 +Version: 3.1.92 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 @@ -211,7 +208,6 @@ This package contains developer documentation. %lang_package %prep %setup -q -%patch0 -p1 translation-update-upstream %build @@ -229,7 +225,7 @@ translation-update-upstream --enable-nntp=yes \ --enable-vala-bindings \ --disable-static -make %{?_smp_mflags} +make %{?_smp_mflags} V=1 %install %{makeinstall} From e92cb048deb9fd55440f95723ba4e35d1d9c830262d840d977e06c6c4edec37c Mon Sep 17 00:00:00 2001 From: Vincent Untz Date: Tue, 27 Sep 2011 11:16:14 +0000 Subject: [PATCH 3/3] Accepting request 84765 from home:vuntz:branches:GNOME:Factory Update to 3.2.0 OBS-URL: https://build.opensuse.org/request/show/84765 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/evolution-data-server?expand=0&rev=108 --- evolution-data-server-3.1.92.tar.bz2 | 3 --- evolution-data-server-3.2.0.tar.bz2 | 3 +++ evolution-data-server.changes | 7 +++++++ evolution-data-server.spec | 4 ++-- 4 files changed, 12 insertions(+), 5 deletions(-) delete mode 100644 evolution-data-server-3.1.92.tar.bz2 create mode 100644 evolution-data-server-3.2.0.tar.bz2 diff --git a/evolution-data-server-3.1.92.tar.bz2 b/evolution-data-server-3.1.92.tar.bz2 deleted file mode 100644 index 94a8a6d..0000000 --- a/evolution-data-server-3.1.92.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:079adb52f34cec6f30f0bee9851f164746ed293e61ffc464e37a636cb86cbc8a -size 4614184 diff --git a/evolution-data-server-3.2.0.tar.bz2 b/evolution-data-server-3.2.0.tar.bz2 new file mode 100644 index 0000000..3433e82 --- /dev/null +++ b/evolution-data-server-3.2.0.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:4889211ee740db610a3493202ddd583f1263698cd6cee7ff44ecab619db63000 +size 4605325 diff --git a/evolution-data-server.changes b/evolution-data-server.changes index 330f1ec..cd0d654 100644 --- a/evolution-data-server.changes +++ b/evolution-data-server.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Sun Sep 25 23:03:14 UTC 2011 - vuntz@opensuse.org + +- Update to version 3.2.0: + + google: Handle multivalue custom vcard attributes + + Updated translations. + ------------------------------------------------------------------- Wed Sep 21 18:01:38 UTC 2011 - vuntz@opensuse.org diff --git a/evolution-data-server.spec b/evolution-data-server.spec index 80ac0aa..bbe6e5c 100644 --- a/evolution-data-server.spec +++ b/evolution-data-server.spec @@ -33,11 +33,11 @@ Name: evolution-data-server %define _evo_version 3.2 License: LGPLv2+ Group: Development/Libraries/GNOME -Version: 3.1.92 +Version: 3.2.0 Release: 1 Summary: Evolution Data Server Url: http://www.gnome.org -Source0: http://download.gnome.org/sources/evolution-data-server/3.1/%{name}-%{version}.tar.bz2 +Source0: http://download.gnome.org/sources/evolution-data-server/3.2/%{name}-%{version}.tar.bz2 Source99: baselibs.conf BuildRequires: bison BuildRequires: db-devel