[evolution-data-server/f16] Fix typo in imap provider.

[Matthew Barnes]

commit 55a82515222e1bdcee14d68b403e07d578528080
Author: Matthew Barnes <mbarnes at redhat.com>
Date:   Fri Dec 16 14:29:08 2011 -0500

    Fix typo in imap provider.

 evolution-data-server-3.2.2-imap-junk-typo.patch |   12 ++++++++++++
 evolution-data-server.spec                       |    9 ++++++++-
 2 files changed, 20 insertions(+), 1 deletions(-)
---
diff --git a/evolution-data-server-3.2.2-imap-junk-typo.patch b/evolution-data-server-3.2.2-imap-junk-typo.patch
new file mode 100644
index 0000000..43f8e19
--- /dev/null
+++ b/evolution-data-server-3.2.2-imap-junk-typo.patch
@@ -0,0 +1,12 @@
+diff -up evolution-data-server-3.2.2/camel/providers/imap/camel-imap-store.c.imap-junk-typo evolution-data-server-3.2.2/camel/providers/imap/camel-imap-store.c
+--- evolution-data-server-3.2.2/camel/providers/imap/camel-imap-store.c.imap-junk-typo	2011-10-20 06:32:50.000000000 -0400
++++ evolution-data-server-3.2.2/camel/providers/imap/camel-imap-store.c	2011-12-16 14:27:25.236226179 -0500
+@@ -1226,7 +1226,7 @@ imap_store_initable_init (GInitable *ini
+ 		CAMEL_STORE (service)->flags &= ~CAMEL_STORE_VJUNK;
+ 		CAMEL_STORE (service)->flags |= CAMEL_STORE_REAL_JUNK_FOLDER;
+ 	} else {
+-		CAMEL_STORE (service)->flags &= CAMEL_STORE_REAL_JUNK_FOLDER;
++		CAMEL_STORE (service)->flags &= ~CAMEL_STORE_REAL_JUNK_FOLDER;
+ 		CAMEL_STORE (service)->flags |= CAMEL_STORE_VJUNK;
+ 	}
+ 
diff --git a/evolution-data-server.spec b/evolution-data-server.spec
index a142f61..8e55c9b 100644
--- a/evolution-data-server.spec
+++ b/evolution-data-server.spec
@@ -25,7 +25,7 @@
 
 Name: evolution-data-server
 Version: 3.2.2
-Release: 1%{?dist}
+Release: 2%{?dist}
 Group: System Environment/Libraries
 Summary: Backend data server for Evolution
 License: LGPLv2+
@@ -41,6 +41,9 @@ Obsoletes: evolution-webcal < 2.24.0
 # RH bug #243296
 Patch11: evolution-data-server-1.11.5-fix-64bit-acinclude.patch
 
+# GNOME bug #665253
+Patch12: evolution-data-server-3.2.2-imap-junk-typo.patch
+
 ### Build Dependencies ###
 
 BuildRequires: GConf2-devel
@@ -120,6 +123,7 @@ This package contains developer documentation for %{name}.
 %setup -q
 
 %patch11 -p1 -b .fix-64bit-acinclude
+%patch12 -p1 -b .imap-junk-typo
 
 mkdir -p krb5-fakeprefix/include
 mkdir -p krb5-fakeprefix/lib
@@ -343,6 +347,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/gtk-doc/html/libedataserverui
 
 %changelog
+* Fri Dec 16 2011 Matthew Barnes <mbarnes at redhat.com> - 3.2.2-2
+- Add patch for GNOME bug #665253 (IMAP junk flag typo).
+
 * Mon Nov 14 2011 Milan Crha <mcrha at redhat.com> - 3.2.2-1
 - Update to 3.2.2
 - Remove patch for GNOME bug #662643 (fixed upstream)