[offlineimap] Update to upstream version 6.5.5-0

[Dodji Seketeli]

commit c33c2d3a4ae83501f09dbfa979bff784db0eb3ae
Author: Dodji Seketeli <dodji at seketeli.org>
Date:   Sun Dec 1 18:40:37 2013 +0100

    Update to upstream version 6.5.5-0

 .gitignore       |    1 +
 offlineimap.spec |   24 +++++++++++++++---------
 sources          |    1 +
 3 files changed, 17 insertions(+), 9 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index b341dda..87655c3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,3 +5,4 @@ offlineimap-6.1.2.tar.gz
 /offlineimap-v6.5.2.1.tar.gz
 /offlineimap-6.5.2.1-dont-sync-folders-with-empty-names.patch
 /OfflineIMAP-offlineimap-v6.5.5-rc3-0-g254e848.tar.gz
+/OfflineIMAP-offlineimap-v6.5.5-0-g8bc2f35.tar.gz
diff --git a/offlineimap.spec b/offlineimap.spec
index 2cc9abe..a94c2b9 100644
--- a/offlineimap.spec
+++ b/offlineimap.spec
@@ -1,21 +1,24 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
-%define rcnum	 rc3
-%define githash  254e848
-%define prereleasetag %{rcnum}0g%{githash}
-%define increment     1
+#Do not remove the following commented defines.  They are useful for
+#rc releases.
+#%define rcnum	 rc3
+#%define prereleasetag %{rcnum}0g%{githash}
+#%define increment     1
+
+%define githash  8bc2f35
 %define packagedirprefix OfflineIMAP-offlineimap
-%define packagedirname %{packagedirprefix}-254e848
+%define packagedirname %{packagedirprefix}-%{githash}
 
 Name:           offlineimap
 Version:        6.5.5
-Release:        0.%{increment}.%{prereleasetag}%{?dist}
+Release:        1%{?dist}
 Summary:        Powerful IMAP/Maildir synchronization and reader support
 
 License:        GPLv2+
 Group:          Applications/Internet
 URL:            http://offlineimap.org
-Source0:        %{packagedirprefix}-v%{version}-%{rcnum}-0-g%{githash}.tar.gz
+Source0:        %{packagedirprefix}-v%{version}-0-g%{githash}.tar.gz
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -39,7 +42,7 @@ reader that does not have IMAP support, has poor IMAP support, or does
 not provide disconnected operation.
 
 %prep
-%setup -q -n OfflineIMAP-offlineimap-254e848
+%setup -q -n %{packagedirname}
 
 %build
 make build
@@ -65,10 +68,13 @@ rm -rf $RPM_BUILD_ROOT
 %doc COPY* offlineimap.conf* docs/html/*.html
 %{_bindir}/offlineimap
 %{python_sitelib}/offlineimap/
-%{python_sitelib}/offlineimap-%{version}_%{rcnum}-py*.egg-info
+%{python_sitelib}/offlineimap-%{version}-py*.egg-info
 %{_mandir}/man1/offlineimap.1.gz
 
 %changelog
+* Sun Dec  1 2013 Dodji Seketeli <dodji at seketeli.org> - 6.5.5-1
+- Update to upstream version 6.5.5-0
+
 * Tue Sep 24 2013 Dodji Seketeli <dodji at seketeli.org> - 6.5.5-rc3-0-g254e848-1
 - Update to pre-release version 6.5.5-rc3-0-g254e848
 - Update Release field accordingly.
diff --git a/sources b/sources
index 1de515f..33f76ab 100644
--- a/sources
+++ b/sources
@@ -1 +1,2 @@
 b8524e33541fbac1d131da42cc440576  OfflineIMAP-offlineimap-v6.5.5-rc3-0-g254e848.tar.gz
+2a0538e43edb4b2a92170d0437937d30  OfflineIMAP-offlineimap-v6.5.5-0-g8bc2f35.tar.gz