[zarafa] Upgrade to 6.40.1

[Robert Scheck]

commit 295fbd2d196beda995f74af866a1b65699cca0db
Author: Robert Scheck <robert at fedoraproject.org>
Date:   Mon Aug 9 21:47:53 2010 +0200

    Upgrade to 6.40.1

 .gitignore                  |    1 +
 sources                     |    2 +-
 zarafa-6.40.0-clucene.patch |   56 ----------------------------------------
 zarafa-6.40.0-krb5.patch    |   20 --------------
 zarafa-6.40.0-openssl.patch |   23 ----------------
 zarafa-6.40.0-pthread.patch |   59 -------------------------------------------
 zarafa.spec                 |   28 ++++++++------------
 7 files changed, 13 insertions(+), 176 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 86578d6..7551c2f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 zarafa-6.40.0.tar.gz
+zarafa-6.40.1.tar.gz
diff --git a/sources b/sources
index 5c51e95..623a5df 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-389d195eb7659ccd05769208686e4b0d  zarafa-6.40.0.tar.gz
+3aea207923cf92800bf07923c36e30f5  zarafa-6.40.1.tar.gz
diff --git a/zarafa.spec b/zarafa.spec
index db3b9f0..d0b02ce 100644
--- a/zarafa.spec
+++ b/zarafa.spec
@@ -116,16 +116,16 @@
 #
 
 %define beta_or_rc      0
-%define actual_release  3
-%define svnrevision     20653
+%define actual_release  1
+%define svnrevision     21780
 %define with_clucene    1
 %define with_ldap       1
 %define with_xmlto      1
 %define php_apiver      %((echo 0; php -i 2>/dev/null | sed -n 's/^PHP API => //p') | tail -1)
 
-Summary:            The Open Source Zarafa Collaboration Platform
+Summary:            Open Source Edition of the Zarafa Collaboration Platform
 Name:               zarafa
-Version:            6.40.0
+Version:            6.40.1
 %if %{beta_or_rc}
 Release:            0.%{actual_release}.svn%{svnrevision}%{?dist}
 %else
@@ -146,12 +146,8 @@ Source2:            %{name}.logrotate
 Source3:            %{name}-webaccess.conf
 
 Patch0:             zarafa-6.40.0-package.patch
-# Patch 1, 2, 3, 4 and 5 were sent to upstream
+# Patch 1 was sent to upstream
 Patch1:             zarafa-6.40.0-undefined-symbol.patch
-Patch2:             zarafa-6.40.0-openssl.patch
-Patch3:             zarafa-6.40.0-krb5.patch
-Patch4:             zarafa-6.40.0-clucene.patch
-Patch5:             zarafa-6.40.0-pthread.patch
 
 BuildRequires:      bison
 BuildRequires:      gcc-c++
@@ -182,7 +178,7 @@ BuildRequires:      openldap-devel
 BuildRequires:      xmlto
 %endif
 
-# The normal zarafa package pulls in all of zarafa except indexer
+# The main package pulls in all of zarafa except indexer and webaccess
 Requires:           zarafa(ical) = %{version}-%{release}
 Requires:           zarafa(dagent) = %{version}-%{release}
 Requires:           zarafa(gateway) = %{version}-%{release}
@@ -515,14 +511,12 @@ PHP projects, using the MAPI functions like a normal MAPI program.
 %setup -q
 %patch0 -p1 -b .package
 %patch1 -p1 -b .undefined-symbol
-%patch2 -p1 -b .openssl
-%patch3 -p1 -b .krb5
-%patch4 -p1 -b .clucene
-%patch5 -p1 -b .pthread
 
 # Needed to get rid of rpath
+%if 0%{?rhel}%{?fedora} > 4
 libtoolize --force
 autoreconf --force --install
+%endif
 
 %build
 export CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing -g -ggdb"
@@ -536,9 +530,6 @@ export CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing -g -ggdb"
 %else
     --with-clucene-lib-prefix= \
 %endif
-%if 0%{?rhel}%{?fedora} < 6
-    --enable-release \
-%endif
     --disable-static \
     --disable-testtools \
     --enable-perl
@@ -997,6 +988,9 @@ fi
 %endif
 
 %changelog
+* Mon Aug 09 2010 Robert Scheck <robert at fedoraproject.org> 6.40.1-1
+- Upgrade to 6.40.1
+
 * Tue Jun 15 2010 Robert Scheck <robert at fedoraproject.org> 6.40.0-3
 - Rebuild for perl 5.12.1