[libetpan: 1/2] 1.0.1-0.1.20110312cvs upgrade to cvs to fix imap/gmail issues

[Andreas Bierfert]

commit f3be05204b1f67956905408a38cb0d8a84a1b61a
Author: Andreas Bierfert <andreas.bierfert at lowlatency.de>
Date:   Mon Mar 14 08:48:26 2011 +0100

    1.0.1-0.1.20110312cvs
    upgrade to cvs to fix imap/gmail issues

 .gitignore              |    2 ++
 libetpan-config_h.patch |   17 +++++++++++++++++
 libetpan.spec           |   28 +++++++++++++++++++++++-----
 sources                 |    2 +-
 4 files changed, 43 insertions(+), 6 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 297a63f..aa90b35 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,3 @@
 libetpan-1.0.tar.gz
+/libetpan-svn409.tar.bz2
+/libetpan-20110312cvs.tar.bz2
diff --git a/libetpan-config_h.patch b/libetpan-config_h.patch
new file mode 100644
index 0000000..2bd435d
--- /dev/null
+++ b/libetpan-config_h.patch
@@ -0,0 +1,17 @@
+diff -up libetpan/src/low-level/imap/namespace_parser.c.orig libetpan/src/low-level/imap/namespace_parser.c
+--- libetpan/src/low-level/imap/namespace_parser.c.orig	2011-03-12 09:13:32.000000000 +0100
++++ libetpan/src/low-level/imap/namespace_parser.c	2011-03-12 09:14:01.000000000 +0100
+@@ -29,12 +29,11 @@
+  * SUCH DAMAGE.
+  */
+ 
+-#include "namespace_parser.h"
+-
+ #ifdef HAVE_CONFIG_H
+ #	include <config.h>
+ #endif
+ 
++#include "namespace_parser.h"
+ #include "namespace_types.h"
+ #include "mailimap_keywords.h"
+ #include "mailimap_extension.h"
diff --git a/libetpan.spec b/libetpan.spec
index 9e1186d..5bac4fb 100644
--- a/libetpan.spec
+++ b/libetpan.spec
@@ -1,13 +1,20 @@
+%global cvsdate 20110312
+
 Name:           libetpan
-Version:        1.0
-Release:        1%{?dist}
+Version:        1.0.1
+Release:        0.1.%{cvsdate}cvs%{?dist}
 Summary: Portable, efficient middleware for different kinds of mail access
 
 Group:          System Environment/Libraries
 License:        BSD
 URL:            http://www.etpan.org/
-Source0:        http://dl.sf.net/%{name}/%{name}-%{version}.tar.gz
+# created with
+# cvs -d:pserver:anonymous at libetpan.cvs.sourceforge.net:/cvsroot/libetpan login
+# cvs -z3 -d:pserver:anonymous at libetpan.cvs.sourceforge.net:/cvsroot/libetpan co -P libetpan
+# gtar -cjvf libetpan-%{cvsdate}cvs.tar.bz2 libetpan
+Source0:        libetpan-%{cvsdate}cvs.tar.bz2
 Patch0:         libetpan-multiarch.patch
+Patch1:         libetpan-config_h.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  db4-devel
@@ -15,6 +22,7 @@ BuildRequires:  cyrus-sasl-devel
 BuildRequires:  gnutls-devel
 BuildRequires:  libcurl-devel expat-devel
 BuildRequires:  libtool
+BuildRequires:  autoconf automake
 
 %description
 The purpose of this mail library is to provide a portable, efficient middleware
@@ -35,13 +43,19 @@ The %{name}-devel package contains the files needed for development
 with %{name}.
 
 %prep
-%setup -q
-%patch0
+%setup -q -n %{name}
+%patch0 -b.multi
+%patch1 -p1 -b.config_h
+
+./autogen.sh
 
 %build
 %configure --disable-static --with-gnutls=yes --with-openssl=no
 make LIBTOOL=%{_bindir}/libtool %{?_smp_mflags}
 
+cd doc
+make doc
+
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -72,6 +86,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/*.so
 
 %changelog
+* Sat Mar 12 2011 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+- 1.0.1-0.1.20110312cvs
+- upgrade to cvs to fix imap/gmail issues
+
 * Tue May 11 2010 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
 - 1.0-1
 - version upgrade
diff --git a/sources b/sources
index 39d503e..65cb976 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-5addc766141a0b1d29ee1ca4ba1b6808  libetpan-1.0.tar.gz
+621ccf32992887f3f10f72e218f8eece  libetpan-20110312cvs.tar.bz2