rpms/beagle/devel beagle-0.3.7-evo-sharp-buildfix.patch, NONE, 1.1 beagle.spec, 1.136, 1.137
Adel Gadllah (drago01)
fedora-extras-commits at redhat.com
Sat May 17 12:14:46 UTC 2008
Author: drago01
Update of /cvs/pkgs/rpms/beagle/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14909
Modified Files:
beagle.spec
Added Files:
beagle-0.3.7-evo-sharp-buildfix.patch
Log Message:
Backport buildfix from trunk (r4737)
beagle-0.3.7-evo-sharp-buildfix.patch:
--- NEW FILE beagle-0.3.7-evo-sharp-buildfix.patch ---
diff -upNr beagle-0.3.7.orign/beagled/EvolutionMailQueryable/EvolutionMailIndexableGenerator.cs beagle-0.3.7/beagled/EvolutionMailQueryable/EvolutionMailIndexableGenerator.cs
--- beagle-0.3.7.orign/beagled/EvolutionMailQueryable/EvolutionMailIndexableGenerator.cs 2008-01-02 04:00:23.000000000 +0100
+++ beagle-0.3.7/beagled/EvolutionMailQueryable/EvolutionMailIndexableGenerator.cs 2008-05-17 14:05:21.000000000 +0200
@@ -36,7 +36,7 @@ using System.Xml;
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 @@ namespace Beagle.Daemon.EvolutionMailQue
}
}
- 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 @@ namespace Beagle.Daemon.EvolutionMailQue
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 @@ namespace Beagle.Daemon.EvolutionMailQue
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 @@ namespace Beagle.Daemon.EvolutionMailQue
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 @@ namespace Beagle.Daemon.EvolutionMailQue
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 @@ namespace Beagle.Daemon.EvolutionMailQue
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 @@ namespace Beagle.Daemon.EvolutionMailQue
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)
diff -upNr beagle-0.3.7.orign/beagled/EvolutionMailQueryable/EvolutionMailQueryable.cs beagle-0.3.7/beagled/EvolutionMailQueryable/EvolutionMailQueryable.cs
--- beagle-0.3.7.orign/beagled/EvolutionMailQueryable/EvolutionMailQueryable.cs 2008-02-11 13:07:01.000000000 +0100
+++ beagle-0.3.7/beagled/EvolutionMailQueryable/EvolutionMailQueryable.cs 2008-05-17 14:04:24.000000000 +0200
@@ -31,7 +31,6 @@ using System.IO;
using System.Threading;
using Beagle.Util;
-using Camel = Beagle.Util.Camel;
namespace Beagle.Daemon.EvolutionMailQueryable {
Index: beagle.spec
===================================================================
RCS file: /cvs/pkgs/rpms/beagle/devel/beagle.spec,v
retrieving revision 1.136
retrieving revision 1.137
diff -u -r1.136 -r1.137
--- beagle.spec 17 May 2008 09:52:47 -0000 1.136
+++ beagle.spec 17 May 2008 12:13:58 -0000 1.137
@@ -1,6 +1,6 @@
Name: beagle
Version: 0.3.7
-Release: 3%{?dist}
+Release: 4%{?dist}
Summary: The Beagle Search Infrastructure
Group: User Interface/Desktops
# see COPYING for details
@@ -55,6 +55,7 @@
Patch5: beagle-0.2.15.1-libdir.patch
Patch6: beagle-monodoc.patch
Patch7: beagle-0.3.3-buildfix.patch
+Patch8: beagle-0.3.7-evo-sharp-buildfix.patch
# Mono is not available on these arches
ExcludeArch: s390 s390x sparc64 ppc64
@@ -144,6 +145,7 @@
%patch5 -p1 -b .libdir
%patch6 -p1 -b .monodoc
#%patch7 -p1 -b .buildfix
+%patch8 -p1 -b .buildfix
%build
autoconf
@@ -274,6 +276,9 @@
%{_libdir}/pkgconfig/beagle*.pc
%changelog
+* Sat May 17 2008 Adel Gadllah <adel.gadllah at gmail.com> - 0.3.7-4
+- Backport buildfix from trunk (r4737)
+
* Sat May 17 2008 Adel Gadllah <adel.gadllah at gmail.com> - 0.3.7-3
- Fix firefox extension installation
More information about the fedora-extras-commits
mailing list