Hello community, here is the log from the commit of package beagle checked in at Mon Jun 30 15:31:51 CEST 2008. -------- --- GNOME/beagle/beagle.changes 2008-05-26 15:29:58.000000000 +0200 +++ beagle/beagle.changes 2008-06-27 22:50:13.309016000 +0200 @@ -1,0 +2,6 @@ +Fri Jun 27 22:57:30 CEST 2008 - maw@suse.de + +- Add beagle-new-camel-bindings.patch to deal with changes + in evolution-sharp's API. + +------------------------------------------------------------------- New: ---- beagle-new-camel-bindings.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ beagle.spec ++++++ --- /var/tmp/diff_new_pack.H31236/_old 2008-06-30 15:30:26.000000000 +0200 +++ /var/tmp/diff_new_pack.H31236/_new 2008-06-30 15:30:26.000000000 +0200 @@ -19,7 +19,7 @@ Group: Productivity/Other AutoReqProv: on Version: 0.3.7 -Release: 17 +Release: 26 Summary: Desktop Search Application Url: http://beagle-project.org Source: %{name}-%{version}.tar.bz2 @@ -36,6 +36,8 @@ Patch10: beagle-scale-results.patch # PATCH-FIX-UPSTREAM beagle-firefox-error.patch bnc385513 jpr@novell.com Patch11: beagle-firefox-error.patch +# PATCH-FIX-UPSTREAM beagle-new-camel-bindings.patch maw@novell.com -- See http://mail.gnome.org/archives/svn-commits-list/2008-April/msg06080.html; this will go away in a future release +Patch12: beagle-new-camel-bindings.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build PreReq: /usr/sbin/groupadd /usr/sbin/useradd /bin/rm Requires: mono-core >= 1.1.13.5 @@ -421,6 +423,7 @@ %patch9 %patch10 %patch11 +%patch12 %build intltoolize --copy --force --automake @@ -585,6 +588,9 @@ %{prefix}/lib/monodoc/sources/beagle-docs.* %changelog +* Sat Jun 28 2008 maw@suse.de +- Add beagle-new-camel-bindings.patch to deal with changes + in evolution-sharp's API. * Mon May 26 2008 jpr@suse.de - Take patch from upstream to have less intrusive error on LiveCD (bnc #385513) ++++++ beagle-new-camel-bindings.patch ++++++ === modified file 'beagled/EvolutionMailQueryable/EvolutionMailIndexableGenerator.cs' --- beagled/EvolutionMailQueryable/EvolutionMailIndexableGenerator.cs 2008-06-27 20:30:20 +0000 +++ beagled/EvolutionMailQueryable/EvolutionMailIndexableGenerator.cs 2008-06-27 20:47:41 +0000 @@ -36,7 +36,7 @@ using Beagle.Util; using Beagle.Daemon; -using Camel = Beagle.Util.Camel; +using B_U_Camel = Beagle.Util.Camel; namespace Beagle.Daemon.EvolutionMailQueryable { @@ -309,7 +309,7 @@ } } - private static bool CheckFlags (uint flags, Camel.CamelFlags test) + private static bool CheckFlags (uint flags, B_U_Camel.CamelFlags test) { return (flags & (uint) test) == (uint) test; } @@ -317,7 +317,7 @@ private Indexable GMimeMessageToIndexable (string uid, GMime.Message message, uint flags) { // Don't index messages flagged as junk - if (CheckFlags (flags, Camel.CamelFlags.Junk)) + if (CheckFlags (flags, B_U_Camel.CamelFlags.Junk)) return null; System.Uri uri = EvolutionMailQueryable.EmailUri (this.account_name, this.folder_name, uid); @@ -362,22 +362,22 @@ flag_prop.IsMutable = true; indexable.AddProperty (flag_prop); - if (CheckFlags (flags, Camel.CamelFlags.Answered)) + if (CheckFlags (flags, B_U_Camel.CamelFlags.Answered)) indexable.AddProperty (Property.NewFlag ("fixme:isAnswered")); - if (CheckFlags (flags, Camel.CamelFlags.Deleted)) + if (CheckFlags (flags, B_U_Camel.CamelFlags.Deleted)) indexable.AddProperty (Property.NewFlag ("fixme:isDeleted")); - if (CheckFlags (flags, Camel.CamelFlags.Draft)) + if (CheckFlags (flags, B_U_Camel.CamelFlags.Draft)) indexable.AddProperty (Property.NewFlag ("fixme:isDraft")); - if (CheckFlags (flags, Camel.CamelFlags.Flagged)) + if (CheckFlags (flags, B_U_Camel.CamelFlags.Flagged)) indexable.AddProperty (Property.NewFlag ("fixme:isFlagged")); - if (CheckFlags (flags, Camel.CamelFlags.Seen)) + if (CheckFlags (flags, B_U_Camel.CamelFlags.Seen)) indexable.AddProperty (Property.NewFlag ("fixme:isSeen")); - if (CheckFlags (flags, Camel.CamelFlags.AnsweredAll)) + if (CheckFlags (flags, B_U_Camel.CamelFlags.AnsweredAll)) indexable.AddProperty (Property.NewFlag ("fixme:isAnsweredAll")); indexable.SetBinaryStream (message.Stream); @@ -427,7 +427,7 @@ private FileInfo summary_info; private string imap_name; private ImapBackendType backend_type; - private Camel.Summary summary; + private B_U_Camel.Summary summary; private IEnumerator summary_enumerator; private EvolutionSummaryTracker tracker; private DateTime start_crawl_time; @@ -593,9 +593,9 @@ if (this.summary == null) { try { if (this.backend_type == ImapBackendType.Imap) - this.summary = Camel.Summary.LoadImapSummary (this.summary_info.FullName); + this.summary = B_U_Camel.Summary.LoadImapSummary (this.summary_info.FullName); else - this.summary = Camel.Summary.LoadImap4Summary (this.summary_info.FullName); + this.summary = B_U_Camel.Summary.LoadImap4Summary (this.summary_info.FullName); } catch (Exception e) { Logger.Log.Warn (e, "Unable to index {0}:", this.folder_name); this.queryable.RemoveGenerator (this); @@ -660,7 +660,7 @@ return indexable; } - Camel.MessageInfo mi = (Camel.MessageInfo) this.summary_enumerator.Current; + B_U_Camel.MessageInfo mi = (B_U_Camel.MessageInfo) this.summary_enumerator.Current; ++this.count; @@ -717,12 +717,12 @@ return indexable; } - private Uri CamelMessageUri (Camel.MessageInfo message_info) + private Uri CamelMessageUri (B_U_Camel.MessageInfo message_info) { return EvolutionMailQueryable.EmailUri (this.account_name, this.folder_name, message_info.uid); } - private Indexable CamelMessageToIndexable (Camel.MessageInfo messageInfo, string msg_file) + private Indexable CamelMessageToIndexable (B_U_Camel.MessageInfo messageInfo, string msg_file) { // Don't index messages flagged as junk if (messageInfo.IsJunk) === modified file 'beagled/EvolutionMailQueryable/EvolutionMailQueryable.cs' --- beagled/EvolutionMailQueryable/EvolutionMailQueryable.cs 2008-06-27 20:30:20 +0000 +++ beagled/EvolutionMailQueryable/EvolutionMailQueryable.cs 2008-06-27 20:47:46 +0000 @@ -31,7 +31,6 @@ using System.Threading; using Beagle.Util; -using Camel = Beagle.Util.Camel; namespace Beagle.Daemon.EvolutionMailQueryable { ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org
participants (1)
-
root@Hilbert.suse.de