Hi Hao, As this is a major version upgrade, are you sure all the fixes/patches has been integrated in this new upstream release? Are there some fixes for MeeGo enterprise build specifically? We're quite nearby the 1.2 feature freeze/code freeze date, please make sure this kind of major upgrade has been fully tested, thanks.
Regards, Yin, Yan > -----Original Message----- > From: [email protected] [mailto:meego-commits- > [email protected]] On Behalf Of Han Dai > Sent: Monday, January 17, 2011 12:56 PM > To: [email protected] > Subject: [meego-commits] 12042: Changes to Trunk:Netbook/evolution > > Hi, > I have made the following changes to evolution in project Trunk:Netbook. > Please review and accept ASAP. > > Thank You, > Han Dai > > [This message was auto-generated] > > --- > > Request #12042: > > submit: home:daihan:branches:Trunk:Netbook/evolution(r16)(cleanup) > -> Trunk:Netbook/evolution > > > Message: > Upgrade to 2.32.1 from gnome to fix bmc #12020 and add evolution- > 1701.patch to fix bmc #1701 > > State: new 2011-01-16T20:55:37 daihan > Comment: None > > > > changes files: > -------------- > --- evolution.changes > +++ evolution.changes > @@ -0,0 +1,3 @@ > +* Thu Jan 13 2011 Hao Li <[email protected]> - 2.32.1 > +- Upgrade to 2.32.1 from gnome to fix bmc #12020 and add evolution- > 1701.patch to fix bmc #1701 > + > > old: > ---- > evo-meego-detect.diff > evolution-2.30.1~20100423.tar.bz2 > evolution-2.9.1-im-context-reset.patch > evolution-add-calendar-bug-1465.patch > evolution-addressbook-crash-bug-3442.patch > evolution-advance-search-bug-2868.patch > evolution-alarm-default-alarm-bug-367.patch > evolution-alarm-race-bug-367.patch > evolution-alarm-systray-bug-367.patch > evolution-allow-edit-accounts-bug-3286.patch > evolution-bmo2329-make-contact-list-editor-translatable.patch > evolution-bmo6498-use-camel-provider-defaults.patch > evolution-calendar-meeting-bug-1901.patch > evolution-calendar-preferences-bug-1495.patch > evolution-camel-socks-proxy-bmo-182.patch > evolution-capplet-account-bug-858.patch > evolution-capplet-account-label-8976.patch > evolution-capplet-l10n-bug-1104.patch > evolution-capplet-password-bug-1631.patch > evolution-composer-bug-2160.patch > evolution-composer-cleanup-bug-1703.patch > evolution-composer-reply-hidden-2117.patch > evolution-composer-transience-bug-1704.patch > evolution-composor-on-same-workspace-bug-1311.patch > evolution-connman-status-fix-bug-1890.patch > evolution-create-folder-transience-bug-2393.patch > evolution-fix-gmail-smtp-port-bug-2545.diff > evolution-free-busy-no-attendees-bug-1713.patch > evolution-help-disable-bug-1289.patch > evolution-menubar-close-bug-1857.patch > evolution-no-mail-alerts-in-calendar-bug-1427.patch > evolution-open-appt-bug-9637.patch > evolution-password-string-account-wizard-bug-1631.diff > evolution-search-bar-theme-bug-1856.patch > evolution-set-size-for-fix-long-string-8974.patch > evolution-small-screen-bug-1176.patch > evolution-system-nssdb-bug-1510.patch > evolution-translation-9004.patch > evolution-view-switch-fix-bug-1393.patch > evolution-yahoo-calendars-bug-999.patch > po-updates.tar.bz2 > rename-onlyshowin-desktopfile.patch > sm-flags.patch > > new: > ---- > evolution-1701.patch > evolution-2.32.1.tar.bz2 > > spec files: > ----------- > --- evolution.spec > +++ evolution.spec > @@ -13,7 +13,7 @@ > %define scrollkeeper_version 0.1.4 > %define soup_version 2.2.2 > > -%define evo_major 2.30.1 > +%define evo_major 2.32 > > %define exchange_support 1 > %define inline_audio_support 1 > @@ -31,7 +31,7 @@ > ### Abstract ### > > Name: evolution > -Version: 2.30.1~20100423 > +Version: 2.32.1 > Release: 1%{?dist} > Group: Applications/Productivity > Summary: Mail and calendar client for GNOME > @@ -42,60 +42,13 @@ > Source1: autogen.sh > Source2: dates.desktop > Source3: contacts.desktop > -Source4: po-updates.tar.bz2 > > ### Patches ### > > -# RH bug #176400 > -Patch1: evolution-2.9.1-im-context-reset.patch > # rename .desktop files etc. > -Patch2: evolution-desktop.patch > -# turn off systray support comprehensively > -Patch3: evolution-alarm-systray-bug-367.patch > -# turn on alarms 15mins before appointments by default > -Patch4: evolution-alarm-default-alarm-bug-367.patch > - > -# back-ports from express2 > -Patch10: evolution-alarm-race-bug-367.patch > -Patch11: evolution-small-screen-bug-1176.patch > -Patch12: evolution-yahoo-calendars-bug-999.patch > -Patch13: evolution-add-calendar-bug-1465.patch > -Patch14: evolution-capplet-account-bug-858.patch > -Patch15: evolution-view-switch-fix-bug-1393.patch > -Patch16: sm-flags.patch > -Patch17: evolution-no-mail-alerts-in-calendar-bug-1427.patch > -Patch18: evolution-composor-on-same-workspace-bug-1311.patch > -Patch19: evolution-calendar-preferences-bug-1495.patch > -Patch20: evolution-capplet-password-bug-1631.patch > -Patch21: evolution-search-bar-theme-bug-1856.patch > -Patch22: evolution-free-busy-no-attendees-bug-1713.patch > -Patch23: evolution-composer-cleanup-bug-1703.patch > -Patch24: evolution-help-disable-bug-1289.patch > -Patch25: evolution-connman-status-fix-bug-1890.patch > -Patch26: evolution-composer-reply-hidden-2117.patch > -Patch27: evolution-menubar-close-bug-1857.patch > -Patch28: evolution-password-string-account-wizard-bug-1631.diff > -Patch29: evolution-fix-gmail-smtp-port-bug-2545.diff > -Patch30: evolution-calendar-meeting-bug-1901.patch > -Patch31: evolution-capplet-l10n-bug-1104.patch > -Patch32: evolution-create-folder-transience-bug-2393.patch > -Patch33: evolution-system-nssdb-bug-1510.patch > -Patch34: evolution-composer-transience-bug-1704.patch > -Patch35: evolution-allow-edit-accounts-bug-3286.patch > -Patch36: evolution-camel-socks-proxy-bmo-182.patch > -Patch37: evolution-addressbook-crash-bug-3442.patch > -Patch38: evolution-composer-bug-2160.patch > -Patch39: evolution-advance-search-bug-2868.patch > - > -Patch40: evolution-bmo2329-make-contact-list-editor-translatable.patch > - > -Patch41: rename-onlyshowin-desktopfile.patch > -Patch42: evo-meego-detect.diff > -Patch43: evolution-translation-9004.patch > -Patch44: evolution-open-appt-bug-9637.patch > -Patch45: evolution-set-size-for-fix-long-string-8974.patch > -Patch46: evolution-capplet-account-label-8976.patch > -Patch47: evolution-bmo6498-use-camel-provider-defaults.patch > +Patch1: evolution-desktop.patch > +Patch2: evolution-1701.patch > + > ## Dependencies ### > > Requires(post): GConf2 > @@ -141,6 +94,7 @@ > BuildRequires: unique-devel > BuildRequires: shared-mime-info > BuildRequires: pkgconfig(sm) > +BuildRequires: libgdata-devel > > %if %{use_mozilla_nss} > BuildRequires: nspr-devel > @@ -201,56 +155,10 @@ > %setup -q -n evolution-%{version} > cp %SOURCE1 . > chmod +x autogen.sh > -%patch1 -p1 -b .im-context-reset > -%patch2 -p1 -b .desktop > -%patch3 -p1 -b .systray-fix > -%patch4 -p1 -b .default-alarm > - > -# Misc. updated translations > -tar xf %SOURCE4 > -mv po-updates/* po > - > -# back-ports from express2 branch > -%patch10 -p1 -b .alarm-race-bug-367 > -%patch11 -p1 -b .small-screen-bug-1176 > -%patch12 -p1 -b .yahoo-calendars-bug-999 > -%patch13 -p1 -b .add-calendar-bug-1465 > -%patch14 -p1 -b .capplet-account-bug-858 > -%patch15 -p1 -b .view-switch-fix-bug-1393 > -%patch16 -p1 -b .sm-flags > -%patch17 -p1 -b .evolution-no-mail-alerts-in-calendar-bug-1427 > -%patch18 -p1 -b .evolution-composor-on-same-workspace-bug-1311 > -%patch19 -p1 -b .evolution-calendar-preferences-bug-1495 > -%patch20 -p1 -b .evolution-capplet-password-bug-1631 > -%patch21 -p1 -b .evolution-search-bar-theme-bug-1856 > -%patch22 -p1 -b .evolution-free-busy-no-attendees-bug-1713 > -%patch23 -p1 -b .evolution-composer-cleanup-bug-1703 > -%patch24 -p1 -b .evolution-help-disable-bug-1289 > -%patch25 -p1 -b .evolution-connman-status-fix-bug-1890 > -%patch26 -p1 -b .evolution-composer-reply-hidden-2117 > -%patch27 -p1 -b .evolution-menubar-close-bug-1857 > -%patch28 -p1 -b .evolution-password-string-account-wizard-bug-1631 > -%patch29 -p1 -b .evolution-fix-gmail-smtp-port-bug-2545 > -%patch30 -p1 -b .evolution-calendar-meeting-bug-1901 > -%patch31 -p1 -b .evolution-capplet-l10n-bug-1104 > -%patch32 -p1 -b .evolution-create-folder-transience-bug-2393 > -%patch33 -p1 -b .evolution-system-nssdb-bug-1510 > -%patch34 -p1 -b .evolution-composer-transience-bug-1704 > -%patch35 -p1 -b .evolution-allow-edit-accounts-bug-3286 > -%patch36 -p1 -b .evolution-camel-socks-proxy-bmo-182 > -%patch37 -p1 -b .evolution-addressbook-crash-bug-3442 > -%patch38 -p1 -b .evolution-composer-bug-2160 > -%patch39 -p1 -b .evolution-advance-search-bug-2868 > - > -%patch40 -p1 -b .evolution-bmo2329-make-contact-list-editor- > translatable > - > -%patch41 -p1 -b .rename-onlyshowin-desktopfile > -%patch42 -p1 -b .evo-meego-detect > -%patch43 -p1 -b .evolution-translation-9004 > -%patch44 -p1 -b .evolution-open-appt-bug-9637 > -%patch45 -p1 -b .evolution-set-size-for-fix-long-string-8974 > -%patch46 -p1 -b .evolution-capplet-account-label-8976 > -%patch47 -p1 -b .evolution-bmo6498-use-camel-provider-defaults > + > +%patch1 -p1 -b .desktop > +%patch2 -p1 -b .evolution-1701 > + > mkdir -p krb5-fakeprefix/include > mkdir -p krb5-fakeprefix/lib > mkdir -p krb5-fakeprefix/%{_lib} > @@ -411,7 +319,6 @@ > %doc AUTHORS COPYING ChangeLog NEWS README > > %{_bindir}/evolution > -%{_bindir}/evolution-alarm-notify > %{_bindir}/evolution-settings > %{_datadir}/applications/evolution.desktop > %{_datadir}/applications/evolution-settings.desktop > @@ -433,6 +340,7 @@ > %{_libexecdir}/evolution/%{evo_major}/evolution-addressbook-clean > %{_libexecdir}/evolution/%{evo_major}/evolution-addressbook-export > %{_libexecdir}/evolution/%{evo_major}/evolution-backup > +%{_libexecdir}/evolution/%{evo_major}/evolution-alarm-notify > %dir %{evo_plugin_dir} > %{evo_plugin_dir}/*-addressbook-file.* > %{evo_plugin_dir}/*-gnome-audio-inline.* > @@ -442,13 +350,11 @@ > %{evo_plugin_dir}/*-calendar-http.* > %{evo_plugin_dir}/*-calendar-weather.* > %{evo_plugin_dir}/*-default-source.* > -%{evo_plugin_dir}/*-default-mailer.* > %{evo_plugin_dir}/*-email-custom-header.* > %{evo_plugin_dir}/*-evolution-attachment-reminder.* > %{evo_plugin_dir}/*-evolution-bbdb.* > %{evo_plugin_dir}/*-evolution-caldav.* > %{evo_plugin_dir}/*-evolution-google.* > -%{evo_plugin_dir}/*-evolution-startup-wizard.* > %{evo_plugin_dir}/*-evolution-webdav.* > %{evo_plugin_dir}/*-groupwise-features.* > %{evo_plugin_dir}/*-imap-features.* > @@ -465,6 +371,8 @@ > %{evo_plugin_dir}/*-subject-thread.* > %{evo_plugin_dir}/*-templates.* > %{evo_plugin_dir}/*-gnome-vcard-inline.* > +%{evo_plugin_dir}/liborg-gnome-dbx-import.so > +%{evo_plugin_dir}/org-gnome-dbx-import.eplug > # %{evo_plugin_dir}/*-gnome-image-inline.* > # %{evo_plugin_dir}/*-pst-import.* > %{evo_plugin_dir}/*-compose-send-options.xml > @@ -475,7 +383,6 @@ > > %config(noreplace) %{_sysconfdir}/gconf/schemas/*.schemas > %{_libdir}/evolution/%{evo_major}/libcomposer.so.* > -%{_libdir}/evolution/%{evo_major}/libeconduit.so.* > %{_libdir}/evolution/%{evo_major}/libeabutil.so.* > %{_libdir}/evolution/%{evo_major}/libecontacteditor.so.* > %{_libdir}/evolution/%{evo_major}/libecontactlisteditor.so.* > @@ -498,6 +405,13 @@ > %{_libdir}/evolution/%{evo_major}/libessmime.so.* > %{_libdir}/evolution/%{evo_major}/libevolution-smime.so.* > %{_libdir}/evolution/%{evo_major}/modules/libevolution-module-plugin- > lib.so > +%{_libdir}/evolution/%{evo_major}/modules/libevolution-module- > composer-autosave.so > +%{_libdir}/evolution/%{evo_major}/modules/libevolution-module-mailto- > handler.so > +%{_libdir}/evolution/%{evo_major}/modules/libevolution-module-startup- > wizard.so > +%{_libdir}/evolution/%{evo_major}/libart_lgpl.so.0 > +%{_libdir}/evolution/%{evo_major}/libart_lgpl.so.0.0.0 > +%{_libdir}/evolution/%{evo_major}/libgnomecanvas.so.0 > +%{_libdir}/evolution/%{evo_major}/libgnomecanvas.so.0.0.0 > # This bad boy needs to be split up > %dir %{_datadir}/evolution > %{_datadir}/evolution/%{evo_major} > @@ -511,7 +425,6 @@ > %{_libdir}/pkgconfig/evolution-mail.pc > %{_libdir}/pkgconfig/evolution-plugin.pc > %{_libdir}/evolution/%{evo_major}/libcomposer.so > -%{_libdir}/evolution/%{evo_major}/libeconduit.so > %{_libdir}/evolution/%{evo_major}/libeabutil.so > %{_libdir}/evolution/%{evo_major}/libecontacteditor.so > %{_libdir}/evolution/%{evo_major}/libecontactlisteditor.so > @@ -533,3 +446,7 @@ > %{_libdir}/evolution/%{evo_major}/libmenus.so > %{_libdir}/evolution/%{evo_major}/libessmime.so > %{_libdir}/evolution/%{evo_major}/libevolution-smime.so > +%{_libdir}/evolution/%{evo_major}/libart_lgpl.so > +%{_libdir}/evolution/%{evo_major}/libgnomecanvas.so > + > +%{_datadir}/gtk-doc > > other changes: > -------------- > > ++++++ evolution-2.9.1-im-context-reset.patch -> evolution-1701.patch > --- evolution-2.9.1-im-context-reset.patch > +++ evolution-1701.patch > @@ -1,12 +1,13 @@ > ---- evolution-2.9.1/calendar/gui/e-day-view.c.im-context-reset 2006- > 11-06 10:14:26.000000000 -0500 > -+++ evolution-2.9.1/calendar/gui/e-day-view.c 2006-11-06 > 10:15:39.000000000 -0500 > -@@ -6928,6 +6928,9 @@ > - if (!event->canvas_item) > - return; > +diff --git a/po/zh_TW.po b/po/zh_TW.po > +index c952115..d14aa85 100644 > +--- a/po/zh_TW.po > ++++ b/po/zh_TW.po > +@@ -4709,7 +4709,7 @@ msgstr "顯示第二時區" > + #: ../calendar/gui/e-week-view-main-item.c:218 > + #: ../calendar/gui/print.c:1744 > + msgid "%A %d %B" > +-msgstr "%A %d %B" > ++msgstr "%B%d日%A" > > -+ /* Reset IM context. */ > -+ gtk_im_context_reset (E_TEXT (event->canvas_item)->im_context); > -+ > - /* We must grab the focus before setting the initial text, since > - grabbing the focus will result in a call to > - e_day_view_on_editing_started(), which will reset the text to > get > + #. strftime format %a = abbreviated weekday name, %d = day of month, > + #. %b = abbreviated month name. Don't use any other specifiers. > > ++++++ evolution-2.30.1~20100423.tar.bz2 -> evolution-2.32.1.tar.bz2 > 1945080 lines of diff (skipped) > > ++++++ deleted files: > --- evo-meego-detect.diff > --- evolution-add-calendar-bug-1465.patch > --- evolution-addressbook-crash-bug-3442.patch > --- evolution-advance-search-bug-2868.patch > --- evolution-alarm-default-alarm-bug-367.patch > --- evolution-alarm-race-bug-367.patch > --- evolution-alarm-systray-bug-367.patch > --- evolution-allow-edit-accounts-bug-3286.patch > --- evolution-bmo2329-make-contact-list-editor-translatable.patch > --- evolution-bmo6498-use-camel-provider-defaults.patch > --- evolution-calendar-meeting-bug-1901.patch > --- evolution-calendar-preferences-bug-1495.patch > --- evolution-camel-socks-proxy-bmo-182.patch > --- evolution-capplet-account-bug-858.patch > --- evolution-capplet-account-label-8976.patch > --- evolution-capplet-l10n-bug-1104.patch > --- evolution-capplet-password-bug-1631.patch > --- evolution-composer-bug-2160.patch > --- evolution-composer-cleanup-bug-1703.patch > --- evolution-composer-reply-hidden-2117.patch > --- evolution-composer-transience-bug-1704.patch > --- evolution-composor-on-same-workspace-bug-1311.patch > --- evolution-connman-status-fix-bug-1890.patch > --- evolution-create-folder-transience-bug-2393.patch > --- evolution-fix-gmail-smtp-port-bug-2545.diff > --- evolution-free-busy-no-attendees-bug-1713.patch > --- evolution-help-disable-bug-1289.patch > --- evolution-menubar-close-bug-1857.patch > --- evolution-no-mail-alerts-in-calendar-bug-1427.patch > --- evolution-open-appt-bug-9637.patch > --- evolution-password-string-account-wizard-bug-1631.diff > --- evolution-search-bar-theme-bug-1856.patch > --- evolution-set-size-for-fix-long-string-8974.patch > --- evolution-small-screen-bug-1176.patch > --- evolution-system-nssdb-bug-1510.patch > --- evolution-translation-9004.patch > --- evolution-view-switch-fix-bug-1393.patch > --- evolution-yahoo-calendars-bug-999.patch > --- po-updates.tar.bz2 > --- rename-onlyshowin-desktopfile.patch > --- sm-flags.patch > > _______________________________________________ > MeeGo-commits mailing list > [email protected] > http://lists.meego.com/listinfo/meego-commits _______________________________________________ MeeGo-packaging mailing list [email protected] http://lists.meego.com/listinfo/meego-packaging
