diff --git a/evolution-data-server-2.28.3-remove-imap-debug-spew.patch b/evolution-data-server-2.28.3-remove-imap-debug-spew.patch new file mode 100644 index 0000000..5da920c --- /dev/null +++ b/evolution-data-server-2.28.3-remove-imap-debug-spew.patch @@ -0,0 +1,24 @@ +diff -up evolution-data-server-2.28.3/camel/providers/imap/camel-imap-command.c.remove-imap-debug-spew evolution-data-server-2.28.3/camel/providers/imap/camel-imap-command.c +--- evolution-data-server-2.28.3/camel/providers/imap/camel-imap-command.c.remove-imap-debug-spew 2010-03-01 07:59:24.000000000 -0500 ++++ evolution-data-server-2.28.3/camel/providers/imap/camel-imap-command.c 2010-03-02 10:21:52.602889783 -0500 +@@ -205,7 +205,7 @@ imap_command_start (CamelImapStore *stor + } + + /* Send the command */ +- if (TRUE) { ++ if (camel_verbose_debug) { + const gchar *mask; + + if (!strncmp ("LOGIN \"", cmd, 7)) +diff -up evolution-data-server-2.28.3/camel/providers/imap/camel-imap-store.c.remove-imap-debug-spew evolution-data-server-2.28.3/camel/providers/imap/camel-imap-store.c +--- evolution-data-server-2.28.3/camel/providers/imap/camel-imap-store.c.remove-imap-debug-spew 2010-03-01 07:59:24.000000000 -0500 ++++ evolution-data-server-2.28.3/camel/providers/imap/camel-imap-store.c 2010-03-02 10:21:52.605889675 -0500 +@@ -3061,7 +3061,7 @@ camel_imap_store_readline (CamelImapStor + return -1; + } + +- if (TRUE) { ++ if (camel_verbose_debug) { + fprintf (stderr, "received: "); + fwrite (ba->data, 1, ba->len, stderr); + } diff --git a/evolution-data-server.spec b/evolution-data-server.spec index 15381e7..196aac6 100644 --- a/evolution-data-server.spec +++ b/evolution-data-server.spec @@ -28,7 +28,7 @@ Name: evolution-data-server Version: 2.28.3 -Release: 1%{?dist} +Release: 2%{?dist} Group: System Environment/Libraries Summary: Backend data server for Evolution License: LGPLv2+ @@ -50,6 +50,9 @@ Patch11: evolution-data-server-1.10.1-camel-folder-summary-crash.patch # RH bug #243296 Patch12: evolution-data-server-1.11.5-fix-64bit-acinclude.patch +# This makes our 2.28.3 equivalent to upstream's 2.28.3.1. +Patch13: evolution-data-server-2.28.3-remove-imap-debug-spew.patch + ### Build Dependencies ### BuildRequires: GConf2-devel @@ -133,6 +136,7 @@ This package contains developer documentation for %{name}. %patch10 -p1 -b .fix-ldap-query %patch11 -p1 -b .camel-folder-summary-crash %patch12 -p1 -b .fix-64bit-acinclude +%patch13 -p1 -b .remove-imap-debug-spew mkdir -p krb5-fakeprefix/include mkdir -p krb5-fakeprefix/lib @@ -361,6 +365,9 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/gtk-doc/html/libedataserverui %changelog +* Tue Mar 02 2010 Matthew Barnes - 2.28.3-2.fc12 +- Remove debug spew from IMAP provider. + * Mon Mar 01 2010 Matthew Barnes - 2.28.3-1.fc12 - Update to 2.28.3