diff --git a/evo-core-mapi-changes.diff b/evo-core-mapi-changes.diff new file mode 100644 index 0000000..77efa22 --- /dev/null +++ b/evo-core-mapi-changes.diff @@ -0,0 +1,111 @@ +diff -Nupr 1-evo/calendar/ChangeLog 2-evo/calendar/ChangeLog +--- 1-evo/calendar/ChangeLog 2008-10-22 10:27:20.000000000 +0530 ++++ 2-evo/calendar/ChangeLog 2008-10-22 09:44:22.000000000 +0530 +@@ -534,6 +534,11 @@ License Changes + (gnome_calendar_on_date_navigator_selection_changed): Use a + single model for all the views. + ++2008-08-13 Suman Manjunath ++ ++ * gui/dialogs/comp-editor.c (real_send_comp): Don't replace ++ attachment list if backend can CREATE_MESSAGES ++ + 2008-08-12 Matthew Barnes + + * gui/migration.c: +diff -Nupr 1-evo/calendar/gui/dialogs/comp-editor.c 2-evo/calendar/gui/dialogs/comp-editor.c +--- 1-evo/calendar/gui/dialogs/comp-editor.c 2008-10-22 10:27:20.000000000 +0530 ++++ 2-evo/calendar/gui/dialogs/comp-editor.c 2008-10-22 09:44:22.000000000 +0530 +@@ -3046,7 +3046,8 @@ real_send_comp (CompEditor *editor, ECal + set_attendees_for_delegation (send_comp, address, method); + } + +- if (!e_cal_component_has_attachments (priv->comp)) { ++ if (!e_cal_component_has_attachments (priv->comp) ++ || e_cal_get_static_capability (priv->client, CAL_STATIC_CAPABILITY_CREATE_MESSAGES)) { + if (itip_send_comp (method, send_comp, priv->client, + NULL, NULL, users)) { + g_object_unref (send_comp); +diff -Nupr 1-evo/calendar/gui/itip-utils.c 2-evo/calendar/gui/itip-utils.c +--- 1-evo/calendar/gui/itip-utils.c 2008-10-07 09:00:09.000000000 +0530 ++++ 2-evo/calendar/gui/itip-utils.c 2008-10-20 16:04:33.000000000 +0530 +@@ -1147,7 +1147,7 @@ itip_send_comp (ECalComponentItipMethod + gchar *subject = NULL; + gboolean retval = FALSE; + +- /* check whether backend could handle sending requests/updates */ ++ /* check whether backend could handle auto-saving requests/updates */ + if (method != E_CAL_COMPONENT_METHOD_PUBLISH && e_cal_get_save_schedules (client)) + return TRUE; + +@@ -1157,6 +1157,15 @@ itip_send_comp (ECalComponentItipMethod + goto cleanup; + } + ++ /* check whether backend could handle sending requests/updates */ ++ if (method != E_CAL_COMPONENT_METHOD_PUBLISH && e_cal_get_static_capability (client, CAL_STATIC_CAPABILITY_CREATE_MESSAGES)) { ++ if (users) { ++ g_list_foreach (users, (GFunc) g_free, NULL); ++ g_list_free (users); ++ } ++ return TRUE; ++ } ++ + /* Tidy up the comp */ + comp = comp_compliant (method, send_comp, client, zones); + +diff -Nupr 1-evo/plugins/itip-formatter/ChangeLog 2-evo/plugins/itip-formatter/ChangeLog +--- 1-evo/plugins/itip-formatter/ChangeLog 2008-10-20 09:19:46.000000000 +0530 ++++ 2-evo/plugins/itip-formatter/ChangeLog 2008-10-20 16:04:33.000000000 +0530 +@@ -66,6 +66,12 @@ License Changes + + * itip-view.h: + ++2008-08-14 Suman Manjunath ++ ++ * itip-formatter.c (update_x), (update_attendee_status): Copy ++ required X-* properties . This might be needed for special cases ++ in certain backends. ++ + 2008-08-11 Matthew Barnes + + ** Fixes part of bug #546892 +diff -Nupr 1-evo/plugins/itip-formatter/itip-formatter.c 2-evo/plugins/itip-formatter/itip-formatter.c +--- 1-evo/plugins/itip-formatter/itip-formatter.c 2008-10-20 09:13:02.000000000 +0530 ++++ 2-evo/plugins/itip-formatter/itip-formatter.c 2008-10-20 16:04:33.000000000 +0530 +@@ -1183,6 +1183,26 @@ remove_delegate (struct _itip_puri *piti + + } + ++static void ++update_x (ECalComponent *pitip_comp, ECalComponent *comp) ++{ ++ icalcomponent *itip_icalcomp = e_cal_component_get_icalcomponent (pitip_comp); ++ icalcomponent *icalcomp = e_cal_component_get_icalcomponent (comp); ++ ++ icalproperty *prop = icalcomponent_get_first_property (itip_icalcomp, ICAL_X_PROPERTY); ++ while (prop) { ++ const char *name = icalproperty_get_x_name (prop); ++ if (!g_ascii_strcasecmp (name, "X-EVOLUTION-IS-REPLY")) { ++ icalproperty *new_prop = icalproperty_new_x (icalproperty_get_x (prop)); ++ icalproperty_set_x_name (new_prop, "X-EVOLUTION-IS-REPLY"); ++ icalcomponent_add_property (icalcomp, new_prop); ++ } ++ prop = icalcomponent_get_next_property (itip_icalcomp, ICAL_X_PROPERTY); ++ } ++ ++ e_cal_component_set_icalcomponent (comp, icalcomp); ++} ++ + static void + update_attendee_status (struct _itip_puri *pitip) + { +@@ -1283,6 +1303,8 @@ update_attendee_status (struct _itip_pur + } + } + ++ update_x (pitip->comp, comp); ++ + if (itip_view_get_update (ITIP_VIEW (pitip->view))) { + e_cal_component_commit_sequence (comp); + itip_send_comp (E_CAL_COMPONENT_METHOD_REQUEST, comp, pitip->current_ecal, NULL, NULL, NULL); diff --git a/evolution-2.24.0.tar.bz2 b/evolution-2.24.0.tar.bz2 deleted file mode 100644 index bfe4dae..0000000 --- a/evolution-2.24.0.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:2a1516aa7986528a3b801a17a111051f6669f14cfd456a33437c13393d0aebf9 -size 32495220 diff --git a/evolution-2.24.1.tar.bz2 b/evolution-2.24.1.tar.bz2 new file mode 100644 index 0000000..5ba783d --- /dev/null +++ b/evolution-2.24.1.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:8d9b5989e0c380e2c24efc836b3c12c006c85a55f994608c849c747679509203 +size 32487183 diff --git a/evolution-advanced-search.patch b/evolution-advanced-search.patch deleted file mode 100644 index b721a0f..0000000 --- a/evolution-advanced-search.patch +++ /dev/null @@ -1,17 +0,0 @@ -diff --git a/widgets/misc/e-filter-bar.c b/widgets/misc/e-filter-bar.c -index aee6eca..c3c6509 100644 ---- a/widgets/misc/e-filter-bar.c -+++ b/widgets/misc/e-filter-bar.c -@@ -589,10 +589,11 @@ get_property (GObject *object, guint property_id, GValue *value, GParamSpec *psp - - switch (property_id) { - case PROP_QUERY: { -+ int item_id = e_search_bar_get_item_id ((ESearchBar *) efb); - char *text = e_search_bar_get_text (E_SEARCH_BAR (efb)); - - /* empty search text means searching turned off */ -- if (efb->current_query && text && *text) { -+ if (efb->current_query && ((text && *text) || item_id == E_FILTERBAR_ADVANCED_ID)) { - GString *out = g_string_new (""); - - filter_rule_build_code (efb->current_query, out); diff --git a/evolution.changes b/evolution.changes index 00fa54d..76f142b 100644 --- a/evolution.changes +++ b/evolution.changes @@ -1,3 +1,20 @@ +------------------------------------------------------------------- +Fri Oct 24 10:11:54 IST 2008 - msuman@suse.de + +- Update to version 2.24.1 + + Bugs fixed: bgo#364542, bgo#438155, bgo#497928, bgo#511918, + bgo#511947, bgo#514989, bgo#519491, bgo#528816, bgo#530606, + bgo#530691, bgo#530716, bgo#530872, bgo#535248, bgo#541121, + bgo#550441, bgo#552575, bgo#552583, bgo#553273, bgo#553297, + bgo#553527, bgo#553609, bgo#553715, bgo#554349, bgo#554418, + bgo#554456, bgo#554566, bgo#554664, bgo#555276, bgo#555494, + bgo#555775, bgo#556059, bgo#556284, bnc#424818 + + Updated translations. +- Fix the prefix for NTLM patched OpenLDAP +- Remove evolution-advanced-search.patch. Fixed upstream. +- Add evo-core-mapi-changes.diff: This contains changes in the core + code base for the MAPI provider. + ------------------------------------------------------------------- Thu Oct 16 12:34:00 CDT 2008 - maw@novell.com diff --git a/evolution.spec b/evolution.spec index d3d5348..2d82867 100644 --- a/evolution.spec +++ b/evolution.spec @@ -1,5 +1,5 @@ # -# spec file for package evolution (Version 2.24.0) +# spec file for package evolution (Version 2.24.1) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -51,8 +51,8 @@ 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 2.24 -Version: 2.24.0 -Release: 3 +Version: 2.24.1 +Release: 1 Summary: The Integrated GNOME Mail, Calendar, and Address Book Suite Source0: %{name}-%{version}.tar.bz2 Source1: summerdance-about2.png @@ -76,10 +76,10 @@ Patch7: calendar-sendbutton.patch Patch8: fix-exchange-menuitem.diff Patch9: fix-sendrecv.diff Patch13: pst-import.patch -# PATCH-FIX-UPSTREAM evolution-advanced-search.patch bgo554456 sbrabec@suse.cz -- Fix broken advanced search GUI. -Patch14: evolution-advanced-search.patch # PATCH-FIX-OPENSUSE evolution-custom-openldap-includes.patch maw@novell.com -- look for ldap includes in /usr/lib/evoldap/include Patch15: evolution-custom-openldap-includes.patch +# This patch contains changes in the core code base for the MAPI provider. +Patch100: evo-core-mapi-changes.diff Url: http://gnome.org/projects/evolution/ BuildRoot: %{_tmppath}/%{name}-%{version}-build Requires: yelp @@ -312,8 +312,8 @@ Authors: %patch8 %patch9 %patch13 -%patch14 -p1 %patch15 -p1 +%patch100 -p1 %build autoreconf -f -i @@ -321,14 +321,18 @@ autoreconf -f -i # evolution-2.8.2: --disable-scrollkeeper does not work properly. # needed for evolution-2.8.2: export CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" +export CXXFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" +export FFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" %if %suse_version > 1000 export CFLAGS="$CFLAGS -fstack-protector" +export CXXFLAGS="$CXXFLAGS -fstack-protector" +export FFLAGS="$FFLAGS -fstack-protector" %endif sed -i -e 's/@ENABLE_SK_TRUE@_s/_s/' help/Makefile.in %configure \ --libexecdir=%{_prefix}/lib \ --disable-scrollkeeper \ - --with-openldap=/usr/lib/evoldap \ + --with-openldap=%{_libdir}/evoldap \ --with-pisock \ --enable-pilot-conduits=yes \ --with-krb5=/usr \ @@ -425,6 +429,20 @@ fi %{_libdir}/evolution/*/conduits/*.so %changelog +* Fri Oct 24 2008 msuman@suse.de +- Update to version 2.24.1 + + Bugs fixed: bgo#364542, bgo#438155, bgo#497928, bgo#511918, + bgo#511947, bgo#514989, bgo#519491, bgo#528816, bgo#530606, + bgo#530691, bgo#530716, bgo#530872, bgo#535248, bgo#541121, + bgo#550441, bgo#552575, bgo#552583, bgo#553273, bgo#553297, + bgo#553527, bgo#553609, bgo#553715, bgo#554349, bgo#554418, + bgo#554456, bgo#554566, bgo#554664, bgo#555276, bgo#555494, + bgo#555775, bgo#556059, bgo#556284, bnc#424818 + + Updated translations. +- Fix the prefix for NTLM patched OpenLDAP +- Remove evolution-advanced-search.patch. Fixed upstream. +- Add evo-core-mapi-changes.diff: This contains changes in the core + code base for the MAPI provider. * Thu Oct 16 2008 maw@novell.com - Add evolution-custom-openldap-includes.patch - Drop build-fixes.diff.