[offlineimap] Fix #835688 - offline fails to sync with 'new' folder in tree created by dovecot

[Dodji Seketeli]

commit 44daa1322d47217a5b99c8a67a9bf9878e8edf49
Author: Dodji Seketeli <dodji at seketeli.org>
Date:   Mon Aug 27 10:45:38 2012 +0200

    Fix #835688 - offline fails to sync with 'new' folder in tree created by dovecot

 .gitignore       |    1 +
 offlineimap.spec |   19 +++++++++----------
 sources          |    2 +-
 3 files changed, 11 insertions(+), 11 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index f9cf70e..90971a9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,4 @@ offlineimap-6.1.2.tar.gz
 /offlineimap-6.3.3.tar.gz
 /offlineimap-v6.3.4.tar.gz
 /offlineimap-v6.5.2.1.tar.gz
+/offlineimap-6.5.2.1-dont-sync-folders-with-empty-names.patch
diff --git a/offlineimap.spec b/offlineimap.spec
index ed48a2f..062afa8 100644
--- a/offlineimap.spec
+++ b/offlineimap.spec
@@ -2,13 +2,14 @@
 
 Name:           offlineimap
 Version:        6.5.2.1
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Powerful IMAP/Maildir synchronization and reader support
 
 License:        GPLv2+
 Group:          Applications/Internet
 URL:            http://software.complete.org/offlineimap/
 Source0:        %{name}-v%{version}.tar.gz
+Patch1:		offlineimap-6.5.2.1-dont-sync-folders-with-empty-names.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -33,15 +34,7 @@ not provide disconnected operation.
 
 %prep
 %setup -q -n %name
-# Create a git repo within the expanded tarball.
-# Credits to: 
-git init
-git config user.email "offlineimap-owner at fedoraproject.org"
-git config user.name "Offlineimap Maintainer"
-git add .
-git commit -a -q -m "%{version} baseline."
-# Apply all the patches on top.
-git am %{patches} < /dev/null
+%patch1 -p1
 
 %build
 make build
@@ -71,6 +64,12 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man1/offlineimap.1.gz
 
 %changelog
+* Sat Aug 25 2012 Dodji Seketeli <dodji at seketeli.org> - 6.5.2.1-3
+- Do away with the (too heavy) use of git to apply patches
+- Apply 35bccdc7dfab8 - Avoid trying to synchronize folders that have empty names
+  This is from git://github.com/OfflineIMAP/offlineimap, in the 'pu' branch.
+  Fixes #835688 - offline fails to sync with 'new' folder in tree created by dovecot
+
 * Fri Jul 20 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 6.5.2.1-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
 
diff --git a/sources b/sources
index e2837dd..61b840b 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-fd87752605eb8d98d7addc70a8e96576  offlineimap-v6.5.2.1.tar.gz
+443c3e421bbe9beea294bb3651a6625c  offlineimap-6.5.2.1-dont-sync-folders-with-empty-names.patch