From aad085b8b4ada439474639d37595b81fa6a5b8394a06acb704e45b1758d2d945 Mon Sep 17 00:00:00 2001 From: OBS User buildservice-autocommit Date: Mon, 6 Jun 2011 08:38:37 +0000 Subject: [PATCH 1/5] Updating link to change in openSUSE:Factory/evolution-data-server revision 89.0 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/evolution-data-server?expand=0&rev=a29e0cbb36ebad99a53dd68445922357 --- evolution-data-server.spec | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/evolution-data-server.spec b/evolution-data-server.spec index 88a1f76..6aa25c6 100644 --- a/evolution-data-server.spec +++ b/evolution-data-server.spec @@ -34,8 +34,8 @@ Name: evolution-data-server License: LGPLv2+ Group: Development/Libraries/GNOME Version: 3.1.1 -# FIXME: Re-enable translation-update-upstream if possible. Release: 1 +# FIXME: Re-enable translation-update-upstream if possible. Summary: Evolution Data Server Url: http://www.gnome.org Source0: ftp://ftp.gnome.org/pub/gnome/sources/evolution-data-server/2.25/%{name}-%{version}.tar.bz2 @@ -89,6 +89,7 @@ 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 @@ -99,6 +100,7 @@ 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 @@ -109,6 +111,7 @@ 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 @@ -119,6 +122,7 @@ 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 @@ -129,6 +133,7 @@ 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 @@ -139,6 +144,7 @@ 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 @@ -149,6 +155,7 @@ 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 @@ -159,6 +166,7 @@ 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 From b75d841b4af06901b2a8e8f9a981dda502139821958423bf18cf8bf712994e27 Mon Sep 17 00:00:00 2001 From: Vincent Untz Date: Thu, 16 Jun 2011 13:44:05 +0000 Subject: [PATCH 2/5] Accepting request 73619 from home:dimstar:branches:GNOME:Factory Update to 3.1.2 OBS-URL: https://build.opensuse.org/request/show/73619 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/evolution-data-server?expand=0&rev=95 --- baselibs.conf | 10 +++---- evolution-data-server-3.1.1.tar.bz2 | 3 --- evolution-data-server-3.1.2.tar.bz2 | 3 +++ evolution-data-server.changes | 41 +++++++++++++++++++++++++++++ evolution-data-server.spec | 13 ++++----- 5 files changed, 56 insertions(+), 14 deletions(-) delete mode 100644 evolution-data-server-3.1.1.tar.bz2 create mode 100644 evolution-data-server-3.1.2.tar.bz2 diff --git a/baselibs.conf b/baselibs.conf index a1e6e23..0ec408c 100644 --- a/baselibs.conf +++ b/baselibs.conf @@ -1,8 +1,8 @@ -libcamel-1_2-25 +libcamel-1_2-26 libebackend-1_2-1 -libebook-1_2-10 -libecal-1_2-8 -libedata-book-1_2-9 -libedata-cal-1_2-11 +libebook-1_2-11 +libecal-1_2-9 +libedata-book-1_2-10 +libedata-cal-1_2-12 libedataserver-1_2-14 libedataserverui-3_0-0 diff --git a/evolution-data-server-3.1.1.tar.bz2 b/evolution-data-server-3.1.1.tar.bz2 deleted file mode 100644 index 5f81d38..0000000 --- a/evolution-data-server-3.1.1.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:7efe13c8fd803eefc5f5f45c21f0d1295cc6eb34aa818f91308fd6976c56fa43 -size 4334208 diff --git a/evolution-data-server-3.1.2.tar.bz2 b/evolution-data-server-3.1.2.tar.bz2 new file mode 100644 index 0000000..d28eda3 --- /dev/null +++ b/evolution-data-server-3.1.2.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:fd3bc8dd3d24c2256074cfae016de67db629838715fba5c3e8eab05805413bd9 +size 4458271 diff --git a/evolution-data-server.changes b/evolution-data-server.changes index f22f9c3..b25ea4e 100644 --- a/evolution-data-server.changes +++ b/evolution-data-server.changes @@ -1,3 +1,44 @@ +------------------------------------------------------------------- +Tue Jun 14 09:22:34 CEST 2011 - dimstar@opensuse.org + +- Update to version 3.1.2: + + New asynchronous APIs to replace EBook/ECal + + Improved introspection annotations + + Improved Vala bindings + + Various calendar file backend improvements + + Camel: Fetch quota information asynchronously. + + addressbook file backend: libdb must be initialized for + concurrent read/write + + CamelService: Add async query_auth_types() functions + + IMAPX: optionally download the messages in descending order + + Handle SIGTERM instead of SIGQUIT. + + CamelDB: use a RW lock to prevent reads while write is in + progress + + CamelVeeFolder: Fix a deadlock. + + Replace deprecated g_atomic_int_exchange_and_add() + + Limit libgdata to 0.7 or 0.8. + + e_name_western_reorder_asshole: Fix possible memory leak + + e_dbhash_new: Close and reopen db handle to avoid memory leak + + e_contact_name_from_string(): Fix possible memory leak + + e_book_backend_file_get_contact_list: Fix memory leak + + CamelVeeFolder: Fix a hang in folder_change_change. + + Use the right free function in the boxed type for + EVCardAttributeParam + + CamelIMAPXFolder: Fix handling of "filter_junk" option. + + EBookBackendSqliteDB: Add sqlitedb cache for addressbook + + Bugs fixed: bgo#550414, bgo#589495, bgo#633948, bgo#640054, + bgo#640083, bgo#646898, bgo#648454, bgo#648736, bgo#649433, + bgo#649757, bgo#649757, bgo#649761, bgo#649762, bgo#650105, + bgo#650524, bgo#650950, bgo#650952, bgo#651054, bgo#651113, + bgo#651147, bgo#651226, bgo#651446, bgo#651458. + + Updated translations. +- Bump soversion according their changes (spec and baselibs.conf): + + so_camel to 26 + + so_ebook to 11 + + so_ecal to 9 + + so_edata_book to 10 + + so_edata_cal to 12 + ------------------------------------------------------------------- Sun May 29 17:26:08 UTC 2011 - dimstar@opensuse.org diff --git a/evolution-data-server.spec b/evolution-data-server.spec index 6aa25c6..23b602a 100644 --- a/evolution-data-server.spec +++ b/evolution-data-server.spec @@ -20,12 +20,12 @@ # Shared Library soNUMs, to make it easier for updates # When updating the sonums, do not forget to also update baselibs.conf -%define so_camel 25 +%define so_camel 26 %define so_ebackend 1 -%define so_ebook 10 -%define so_ecal 8 -%define so_edata_book 9 -%define so_edata_cal 11 +%define so_ebook 11 +%define so_ecal 9 +%define so_edata_book 10 +%define so_edata_cal 12 %define so_edataserver 14 %define so_edataserverui 0 @@ -33,7 +33,7 @@ Name: evolution-data-server %define _evo_version 3.2 License: LGPLv2+ Group: Development/Libraries/GNOME -Version: 3.1.1 +Version: 3.1.2 Release: 1 # FIXME: Re-enable translation-update-upstream if possible. Summary: Evolution Data Server @@ -321,6 +321,7 @@ find %{buildroot} -name '*.la' -type f -delete -print %files -n libedata-book-1_2-%{so_edata_book} %defattr(-, root, root) %{_libdir}/libedata-book-1.2.so.%{so_edata_book}* +%{_libdir}/girepository-1.0/EBook-1.2.typelib %files -n libedata-cal-1_2-%{so_edata_cal} %defattr(-, root, root) From 532b45ea553cc80f4fa4d7617f58ddcbe891238aaa3355323b4410ebd1b8453f Mon Sep 17 00:00:00 2001 From: Vincent Untz Date: Fri, 17 Jun 2011 02:33:10 +0000 Subject: [PATCH 3/5] Accepting request 73926 from home:vuntz:branches:GNOME:Factory .changes cleanup OBS-URL: https://build.opensuse.org/request/show/73926 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/evolution-data-server?expand=0&rev=96 --- evolution-data-server.changes | 24 +++++------------------- 1 file changed, 5 insertions(+), 19 deletions(-) diff --git a/evolution-data-server.changes b/evolution-data-server.changes index b25ea4e..3e17ec9 100644 --- a/evolution-data-server.changes +++ b/evolution-data-server.changes @@ -2,30 +2,16 @@ Tue Jun 14 09:22:34 CEST 2011 - dimstar@opensuse.org - Update to version 3.1.2: - + New asynchronous APIs to replace EBook/ECal + + New asynchronous APIs to replace EBook/ECal, and additional + asynchronous work in Camel + Improved introspection annotations + Improved Vala bindings + Various calendar file backend improvements - + Camel: Fetch quota information asynchronously. - + addressbook file backend: libdb must be initialized for - concurrent read/write - + CamelService: Add async query_auth_types() functions + IMAPX: optionally download the messages in descending order + Handle SIGTERM instead of SIGQUIT. - + CamelDB: use a RW lock to prevent reads while write is in - progress - + CamelVeeFolder: Fix a deadlock. - + Replace deprecated g_atomic_int_exchange_and_add() - + Limit libgdata to 0.7 or 0.8. - + e_name_western_reorder_asshole: Fix possible memory leak - + e_dbhash_new: Close and reopen db handle to avoid memory leak - + e_contact_name_from_string(): Fix possible memory leak - + e_book_backend_file_get_contact_list: Fix memory leak - + CamelVeeFolder: Fix a hang in folder_change_change. - + Use the right free function in the boxed type for - EVCardAttributeParam - + CamelIMAPXFolder: Fix handling of "filter_junk" option. - + EBookBackendSqliteDB: Add sqlitedb cache for addressbook + + Add sqlitedb cache for addressbook + + Fix some memory leaks. + + Various other code changes. + Bugs fixed: bgo#550414, bgo#589495, bgo#633948, bgo#640054, bgo#640083, bgo#646898, bgo#648454, bgo#648736, bgo#649433, bgo#649757, bgo#649757, bgo#649761, bgo#649762, bgo#650105, From f6409d1a5e55463aa656fb0515399a96b934182993e0a3ca8c7405fbb14d3a32 Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Fri, 1 Jul 2011 10:29:02 +0000 Subject: [PATCH 4/5] Accepting request 74973 from home:vuntz:branches:GNOME:Factory Drop dice patch + enable vala bindings OBS-URL: https://build.opensuse.org/request/show/74973 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/evolution-data-server?expand=0&rev=97 --- dice-eds-changes.patch | 317 --------------------------- evolution-data-server-fix-vala.patch | 13 ++ evolution-data-server.changes | 12 + evolution-data-server.spec | 10 +- 4 files changed, 33 insertions(+), 319 deletions(-) delete mode 100644 dice-eds-changes.patch create mode 100644 evolution-data-server-fix-vala.patch diff --git a/dice-eds-changes.patch b/dice-eds-changes.patch deleted file mode 100644 index ae1add9..0000000 --- a/dice-eds-changes.patch +++ /dev/null @@ -1,317 +0,0 @@ -Index: evolution-data-server-2.91.90/calendar/libecal/e-cal-component.c -=================================================================== ---- evolution-data-server-2.91.90.orig/calendar/libecal/e-cal-component.c -+++ evolution-data-server-2.91.90/calendar/libecal/e-cal-component.c -@@ -169,6 +169,8 @@ struct _ECalComponentPrivate { - * object over the wire. - */ - guint need_sequence_inc : 1; -+ -+ GSList *x_list; /* list of X icalproperty objects */ - }; - - /* Private structure for alarms */ -@@ -355,6 +357,9 @@ free_icalcomponent (ECalComponent *comp, - /* Free the subcomponents */ - - g_hash_table_foreach_remove (priv->alarm_uid_hash, free_alarm_cb, NULL); -+ -+ g_slist_free (priv->x_list); -+ priv->x_list = NULL; - - /* Free the icalcomponent */ - -@@ -517,6 +522,13 @@ e_cal_component_clone (ECalComponent *co - return new_comp; - } - -+static void -+scan_x_prop (GSList **list, icalproperty *prop) -+{ -+ *list = g_slist_append (*list, prop); -+} -+ -+ - /* Scans an attachment property */ - static void - scan_attachment (GSList **attachment_list, icalproperty *prop) -@@ -779,7 +791,8 @@ scan_property (ECalComponent *comp, ical - case ICAL_LOCATION_PROPERTY : - priv->location = prop; - break; -- -+ case ICAL_X_PROPERTY: -+ scan_x_prop (&priv->x_list ,prop); - default: - break; - } -@@ -932,6 +945,9 @@ scan_icalcomponent (ECalComponent *comp) - - g_return_if_fail (priv->icalcomp != NULL); - -+ if (e_cal_component_get_vtype (comp) == E_CAL_COMPONENT_VCALENDAR) -+ return; -+ - /* Scan properties */ - - for (prop = icalcomponent_get_first_property (priv->icalcomp, ICAL_ANY_PROPERTY); -@@ -1030,7 +1046,9 @@ e_cal_component_set_new_vtype (ECalCompo - case E_CAL_COMPONENT_TIMEZONE: - kind = ICAL_VTIMEZONE_COMPONENT; - break; -- -+ case E_CAL_COMPONENT_VCALENDAR: -+ kind = ICAL_VCALENDAR_COMPONENT; -+ break; - default: - g_warn_if_reached (); - kind = ICAL_NO_COMPONENT; -@@ -1048,8 +1066,8 @@ e_cal_component_set_new_vtype (ECalCompo - scan_icalcomponent (comp); - - /* Add missing stuff */ -- -- ensure_mandatory_properties (comp); -+ if (type != E_CAL_COMPONENT_VCALENDAR && type != E_CAL_COMPONENT_TIMEZONE && type != E_CAL_COMPONENT_FREEBUSY); -+ ensure_mandatory_properties (comp); - } - - /** -@@ -1072,6 +1090,7 @@ e_cal_component_set_icalcomponent (ECalC - { - ECalComponentPrivate *priv; - icalcomponent_kind kind; -+ ECalComponentVType vtype; - - g_return_val_if_fail (comp != NULL, FALSE); - g_return_val_if_fail (E_IS_CAL_COMPONENT (comp), FALSE); -@@ -1094,13 +1113,17 @@ e_cal_component_set_icalcomponent (ECalC - || kind == ICAL_VTODO_COMPONENT - || kind == ICAL_VJOURNAL_COMPONENT - || kind == ICAL_VFREEBUSY_COMPONENT -- || kind == ICAL_VTIMEZONE_COMPONENT)) -+ || kind == ICAL_VTIMEZONE_COMPONENT -+ || kind == ICAL_VCALENDAR_COMPONENT)) - return FALSE; - - priv->icalcomp = icalcomp; - - scan_icalcomponent (comp); -- ensure_mandatory_properties (comp); -+ -+ vtype = e_cal_component_get_vtype (comp); -+ if (vtype != E_CAL_COMPONENT_VCALENDAR && vtype != E_CAL_COMPONENT_TIMEZONE && vtype != E_CAL_COMPONENT_FREEBUSY); -+ ensure_mandatory_properties (comp); - - return TRUE; - } -@@ -1138,6 +1161,7 @@ e_cal_component_get_icalcomponent (ECalC - void - e_cal_component_rescan (ECalComponent *comp) - { -+ ECalComponentVType vtype; - g_return_if_fail (comp != NULL); - g_return_if_fail (E_IS_CAL_COMPONENT (comp)); - -@@ -1146,7 +1170,9 @@ e_cal_component_rescan (ECalComponent *c - - /* Rescan */ - scan_icalcomponent (comp); -- ensure_mandatory_properties (comp); -+ vtype = e_cal_component_get_vtype (comp); -+ if (vtype != E_CAL_COMPONENT_VCALENDAR && vtype != E_CAL_COMPONENT_TIMEZONE && vtype != E_CAL_COMPONENT_FREEBUSY); -+ ensure_mandatory_properties (comp); - } - - /** -@@ -1161,6 +1187,7 @@ void - e_cal_component_strip_errors (ECalComponent *comp) - { - ECalComponentPrivate *priv; -+ ECalComponentVType vtype; - - g_return_if_fail (comp != NULL); - g_return_if_fail (E_IS_CAL_COMPONENT (comp)); -@@ -1207,6 +1234,9 @@ e_cal_component_get_vtype (ECalComponent - case ICAL_VTIMEZONE_COMPONENT: - return E_CAL_COMPONENT_TIMEZONE; - -+ case ICAL_VCALENDAR_COMPONENT: -+ return E_CAL_COMPONENT_VCALENDAR; -+ - default: - /* We should have been loaded with a supported type! */ - g_warn_if_reached (); -@@ -2685,6 +2715,27 @@ e_cal_component_set_dtstart (ECalCompone - priv->need_sequence_inc = TRUE; - } - -+gboolean -+e_cal_component_is_allday (ECalComponent *comp) -+{ -+ ECalComponentPrivate *priv; -+ ECalComponentDateTime dtstart, dtend; -+ gboolean ret = FALSE; -+ -+ priv = comp->priv; -+ -+ e_cal_component_get_dtstart (comp, &dtstart); -+ e_cal_component_get_dtend (comp, &dtend); -+ -+ if (dtstart.value->is_date && dtend.value->is_date) -+ ret = TRUE; -+ -+ e_cal_component_free_datetime (&dtstart); -+ e_cal_component_free_datetime (&dtend); -+ -+ return ret; -+} -+ - /** - * e_cal_component_get_due: - * @comp: A calendar component object. -@@ -4138,6 +4189,24 @@ e_cal_component_get_sequence (ECalCompon - **sequence = icalproperty_get_sequence (priv->sequence); - } - -+int -+e_cal_component_get_sequence_as_int (ECalComponent *comp) -+{ -+ ECalComponentPrivate *priv; -+ -+ g_return_val_if_fail ((comp != NULL), -1); -+ g_return_val_if_fail (E_IS_CAL_COMPONENT (comp), -1); -+ -+ priv = comp->priv; -+ g_return_val_if_fail ((priv->icalcomp != NULL), -1); -+ -+ if (!priv->sequence) { -+ return 0; -+ } -+ -+ return icalproperty_get_sequence (priv->sequence); -+} -+ - /** - * e_cal_component_set_sequence: - * @comp: A calendar component object. -@@ -6063,3 +6132,77 @@ e_cal_component_event_dates_match (ECalC - return retval; - } - -+void -+e_cal_component_set_x_prop (ECalComponent *comp, const char *x_name, const char *x_value) -+{ -+ GSList *l; -+ ECalComponentPrivate *priv; -+ icalproperty *prop; -+ -+ priv = comp->priv; -+ -+ for (l = priv->x_list; l != NULL; l = g_slist_next (l)) -+ { -+ prop = l->data; -+ const char *name = icalproperty_get_x_name (prop); -+ -+ if (!strcmp (x_name, name)) { -+ break; -+ } -+ prop = NULL; -+ } -+ -+ if (prop) { -+ icalcomponent_remove_property (priv->icalcomp, prop); -+ priv->x_list = g_slist_remove (priv->x_list, prop); -+ icalproperty_free (prop); -+ prop = NULL; -+ } -+ -+ if (!x_value || !*x_value) -+ return; -+ -+ prop = icalproperty_new_x (x_value); -+ icalproperty_set_x_name (prop, x_name); -+ icalcomponent_add_property (priv->icalcomp, prop); -+ -+ priv->x_list = g_slist_prepend (priv->x_list, prop); -+} -+ -+char * -+e_cal_component_get_x_prop (ECalComponent *comp, const char *x_name) -+{ -+ GSList *l; -+ ECalComponentPrivate *priv; -+ -+ priv = comp->priv; -+ -+ for (l = priv->x_list; l != NULL; l = g_slist_next (l)) -+ { -+ icalproperty *prop = l->data; -+ const char *name = icalproperty_get_x_name (prop); -+ -+ if (!strcmp (x_name, name)) { -+ const char *val = icalproperty_get_x (prop); -+ -+ return g_strdup (val); -+ } -+ } -+ -+ return NULL; -+} -+ -+int -+e_cal_component_get_x_prop_as_int (ECalComponent *comp, const char *x_name) -+{ -+ char *x_val = e_cal_component_get_x_prop (comp, x_name); -+ -+ if (x_val) { -+ int val = atoi (x_val); -+ g_free (x_val); -+ -+ return val; -+ } -+ -+ return -1; -+} -Index: evolution-data-server-2.91.90/calendar/libecal/e-cal-component.h -=================================================================== ---- evolution-data-server-2.91.90.orig/calendar/libecal/e-cal-component.h -+++ evolution-data-server-2.91.90/calendar/libecal/e-cal-component.h -@@ -51,7 +51,8 @@ typedef enum { - E_CAL_COMPONENT_TODO, - E_CAL_COMPONENT_JOURNAL, - E_CAL_COMPONENT_FREEBUSY, -- E_CAL_COMPONENT_TIMEZONE -+ E_CAL_COMPONENT_TIMEZONE, -+ E_CAL_COMPONENT_VCALENDAR - } ECalComponentVType; - - /* Field identifiers for a calendar component; these are used by the data model -@@ -256,6 +257,7 @@ void e_cal_component_set_dtend (ECalComp - void e_cal_component_get_dtstamp (ECalComponent *comp, struct icaltimetype *t); - void e_cal_component_set_dtstamp (ECalComponent *comp, struct icaltimetype *t); - -+gboolean e_cal_component_is_allday (ECalComponent *comp); - void e_cal_component_get_dtstart (ECalComponent *comp, ECalComponentDateTime *dt); - void e_cal_component_set_dtstart (ECalComponent *comp, ECalComponentDateTime *dt); - -@@ -312,6 +314,8 @@ gboolean e_cal_component_is_instance (EC - void e_cal_component_get_sequence (ECalComponent *comp, gint **sequence); - void e_cal_component_set_sequence (ECalComponent *comp, gint *sequence); - -+int e_cal_component_get_sequence_as_int (ECalComponent *comp); -+ - void e_cal_component_get_status (ECalComponent *comp, icalproperty_status *status); - void e_cal_component_set_status (ECalComponent *comp, icalproperty_status status); - -@@ -457,6 +461,10 @@ gboolean e_cal_component_alarm_has_atten - - icalcomponent *e_cal_component_alarm_get_icalcomponent (ECalComponentAlarm *alarm); - -+char *e_cal_component_get_x_prop (ECalComponent *comp, const char *x_name); -+int e_cal_component_get_x_prop_as_int (ECalComponent *comp, const char *x_name); -+void e_cal_component_set_x_prop (ECalComponent *comp, const char *x_name, const char *x_value); -+ - - - G_END_DECLS diff --git a/evolution-data-server-fix-vala.patch b/evolution-data-server-fix-vala.patch new file mode 100644 index 0000000..d680e7c --- /dev/null +++ b/evolution-data-server-fix-vala.patch @@ -0,0 +1,13 @@ +commit be8827d105122c00b0f23d513b36a24e185adcdb +Author: Raul Gutierrez Segales +Date: Tue Jun 28 08:05:47 2011 +0100 + + Vala bindings: we depend on gio-2.0 + +diff --git a/vala/libebook-1.2.deps b/vala/libebook-1.2.deps +index 1899619..4478fb0 100644 +--- a/vala/libebook-1.2.deps ++++ b/vala/libebook-1.2.deps +@@ -1 +1,2 @@ + libxml-2.0 ++gio-2.0 diff --git a/evolution-data-server.changes b/evolution-data-server.changes index 3e17ec9..60d361c 100644 --- a/evolution-data-server.changes +++ b/evolution-data-server.changes @@ -1,3 +1,15 @@ +------------------------------------------------------------------- +Fri Jul 1 11:33:33 CEST 2011 - vuntz@opensuse.org + +- Drop dice-eds-changes.patch: the dice features are not getting + maintained by anyone, and we do not want to support them in that + case. +- Build vala bindings: + + add evolution-data-server-fix-vala.patch to fix build; taken + from git + + add vala BuildRequires + + pass --enable-vala-bindings to configure + ------------------------------------------------------------------- Tue Jun 14 09:22:34 CEST 2011 - dimstar@opensuse.org diff --git a/evolution-data-server.spec b/evolution-data-server.spec index 23b602a..2cd0712 100644 --- a/evolution-data-server.spec +++ b/evolution-data-server.spec @@ -40,8 +40,8 @@ Summary: Evolution Data Server Url: http://www.gnome.org Source0: ftp://ftp.gnome.org/pub/gnome/sources/evolution-data-server/2.25/%{name}-%{version}.tar.bz2 Source99: baselibs.conf -# PATCH-FEATURE-OPENSUSE dice-eds-changes.patch pchenthill@novell.com -- Patch yet to be pushed upstream -Patch0: dice-eds-changes.patch +# PATCH-FIX-UPSTREAM evolution-data-server-fix-vala.patch vuntz@opensuse.org -- Fix build, taken from git +Patch0: evolution-data-server-fix-vala.patch BuildRequires: bison BuildRequires: db-devel %if %USE_EVOLDAP @@ -68,6 +68,7 @@ BuildRequires: python-devel BuildRequires: pkgconfig(gtk+-3.0) BuildRequires: sqlite3-devel BuildRequires: translation-update-upstream +BuildRequires: vala %if %USE_EVOLDAP Requires: libevoldap-2_4-2 %endif @@ -232,6 +233,7 @@ This package contains developer documentation. --enable-ipv6=yes \ --enable-smime=yes \ --enable-nntp=yes \ + --enable-vala-bindings \ --disable-static %{__make} %{?_smp_mflags} V=1 @@ -342,6 +344,10 @@ find %{buildroot} -name '*.la' -type f -delete -print %{_libdir}/*.so %{_libdir}/pkgconfig/*.pc %{_datadir}/gir-1.0/*.gir +%dir %{_datadir}/vala +%dir %{_datadir}/vala/vapi +%{_datadir}/vala/vapi/*.deps +%{_datadir}/vala/vapi/*.vapi %files doc %defattr(-, root, root) From d199cea33584444d9f303936f34782b7281a6185f24acb58b9fd6da5254ba2a8 Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Wed, 6 Jul 2011 09:19:49 +0000 Subject: [PATCH 5/5] Accepting request 75446 from home:vuntz:branches:GNOME:Factory Update to 3.1.3 OBS-URL: https://build.opensuse.org/request/show/75446 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/evolution-data-server?expand=0&rev=98 --- baselibs.conf | 4 ++-- evolution-data-server-3.1.2.tar.bz2 | 3 --- evolution-data-server-3.1.3.tar.bz2 | 3 +++ evolution-data-server-fix-vala.patch | 13 ------------- evolution-data-server.changes | 29 ++++++++++++++++++++++++++++ evolution-data-server.spec | 20 +++++++++---------- 6 files changed, 44 insertions(+), 28 deletions(-) delete mode 100644 evolution-data-server-3.1.2.tar.bz2 create mode 100644 evolution-data-server-3.1.3.tar.bz2 delete mode 100644 evolution-data-server-fix-vala.patch diff --git a/baselibs.conf b/baselibs.conf index 0ec408c..9b91790 100644 --- a/baselibs.conf +++ b/baselibs.conf @@ -1,8 +1,8 @@ -libcamel-1_2-26 +libcamel-1_2-27 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 -libedataserverui-3_0-0 +libedataserverui-3_0-1 diff --git a/evolution-data-server-3.1.2.tar.bz2 b/evolution-data-server-3.1.2.tar.bz2 deleted file mode 100644 index d28eda3..0000000 --- a/evolution-data-server-3.1.2.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:fd3bc8dd3d24c2256074cfae016de67db629838715fba5c3e8eab05805413bd9 -size 4458271 diff --git a/evolution-data-server-3.1.3.tar.bz2 b/evolution-data-server-3.1.3.tar.bz2 new file mode 100644 index 0000000..b95887a --- /dev/null +++ b/evolution-data-server-3.1.3.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:3d290ae08c974c842c9cb6b0f365f32726138448f912fb42bd1a90b5f7cd35a2 +size 4473533 diff --git a/evolution-data-server-fix-vala.patch b/evolution-data-server-fix-vala.patch deleted file mode 100644 index d680e7c..0000000 --- a/evolution-data-server-fix-vala.patch +++ /dev/null @@ -1,13 +0,0 @@ -commit be8827d105122c00b0f23d513b36a24e185adcdb -Author: Raul Gutierrez Segales -Date: Tue Jun 28 08:05:47 2011 +0100 - - Vala bindings: we depend on gio-2.0 - -diff --git a/vala/libebook-1.2.deps b/vala/libebook-1.2.deps -index 1899619..4478fb0 100644 ---- a/vala/libebook-1.2.deps -+++ b/vala/libebook-1.2.deps -@@ -1 +1,2 @@ - libxml-2.0 -+gio-2.0 diff --git a/evolution-data-server.changes b/evolution-data-server.changes index 60d361c..5ac6930 100644 --- a/evolution-data-server.changes +++ b/evolution-data-server.changes @@ -1,3 +1,32 @@ +------------------------------------------------------------------- +Mon Jul 4 12:48:12 CEST 2011 - vuntz@opensuse.org + +- Update to version 3.1.3: + + Add support for GNOME Online Accounts. + + Add OAuth support to Google Contacts backend. + + Fix LDAP authentication and process authentication requests on + idle + + SMTP: Handle 235 code after initial AUTH command. + + Make Camel's SASL framework more extensible. + + Fix few memory leaks + + Various other code changes. + + Code cleanups. + + Build fixes. + + Bugs fixed: bgo#650671, bgo#653476, bgo#650126, bgo#653385, + bgo#224687, bgo#224687, bgo#652173, bgo#648468, bgo#269413, + bgo#565961, bgo#652530. + + Updated translations. +- Add pkgconfig(goa-1.0) and pkgconfig(oauth) for the new GNOME + Online Accounts and OAuth support features. +- Drop evolution-data-server-fix-vala.patch: fixed upstream. +- Bump so_camel define to 27 to follow library soversion change. + This results in libcamel-1_2-26 being renamed to libcamel-1_2-27. +- Bump so_edataserverui define to 1 to follow library soversion + change. This results in libedataserverui-3_0-0 being renamed to + libedataserverui-3_0-1. +- Re-enable translation-update-upstream support. +- Disable parallel build as it is broken in this release. + ------------------------------------------------------------------- Fri Jul 1 11:33:33 CEST 2011 - vuntz@opensuse.org diff --git a/evolution-data-server.spec b/evolution-data-server.spec index 2cd0712..c5c0347 100644 --- a/evolution-data-server.spec +++ b/evolution-data-server.spec @@ -20,28 +20,26 @@ # Shared Library soNUMs, to make it easier for updates # When updating the sonums, do not forget to also update baselibs.conf -%define so_camel 26 +%define so_camel 27 %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_edataserverui 0 +%define so_edataserverui 1 Name: evolution-data-server %define _evo_version 3.2 License: LGPLv2+ Group: Development/Libraries/GNOME -Version: 3.1.2 +Version: 3.1.3 Release: 1 -# FIXME: Re-enable translation-update-upstream if possible. +# 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: ftp://ftp.gnome.org/pub/gnome/sources/evolution-data-server/2.25/%{name}-%{version}.tar.bz2 +Source0: http://download.gnome.org/sources/evolution-data-server/3.1/%{name}-%{version}.tar.bz2 Source99: baselibs.conf -# PATCH-FIX-UPSTREAM evolution-data-server-fix-vala.patch vuntz@opensuse.org -- Fix build, taken from git -Patch0: evolution-data-server-fix-vala.patch BuildRequires: bison BuildRequires: db-devel %if %USE_EVOLDAP @@ -65,7 +63,9 @@ BuildRequires: libsoup-devel BuildRequires: mozilla-nss-devel BuildRequires: nss-shared-helper-devel BuildRequires: python-devel +BuildRequires: pkgconfig(goa-1.0) BuildRequires: pkgconfig(gtk+-3.0) +BuildRequires: pkgconfig(oauth) BuildRequires: sqlite3-devel BuildRequires: translation-update-upstream BuildRequires: vala @@ -217,8 +217,7 @@ This package contains developer documentation. %lang_package %prep %setup -q -#translation-update-upstream -%patch0 -p1 +translation-update-upstream %build %{configure} \ @@ -235,7 +234,8 @@ This package contains developer documentation. --enable-nntp=yes \ --enable-vala-bindings \ --disable-static -%{__make} %{?_smp_mflags} V=1 +#make %{?_smp_mflags} V=1 +make %install %{makeinstall}