[zarafa] Upgrade to 6.40.2

[Robert Scheck]

commit 64f29bf5140870ad75f43b12fc40461abc8811ad
Author: Robert Scheck <robert at fedoraproject.org>
Date:   Tue Aug 31 21:18:10 2010 +0200

    Upgrade to 6.40.2

 .gitignore                           |    3 +-
 sources                              |    2 +-
 zarafa-6.40.0-undefined-symbol.patch |   42 ----------------------------------
 zarafa.spec                          |   42 ++++++++++++++++++---------------
 4 files changed, 25 insertions(+), 64 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 7551c2f..d1c4875 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1 @@
-zarafa-6.40.0.tar.gz
-zarafa-6.40.1.tar.gz
+zarafa-6.40.2.tar.gz
diff --git a/sources b/sources
index 623a5df..038cd44 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-3aea207923cf92800bf07923c36e30f5  zarafa-6.40.1.tar.gz
+0e297c5b7d4a476806bcc60a86901838  zarafa-6.40.2.tar.gz
diff --git a/zarafa.spec b/zarafa.spec
index d0b02ce..827ff4d 100644
--- a/zarafa.spec
+++ b/zarafa.spec
@@ -26,15 +26,17 @@
 # 5. Build locally
 # 6. Build in mock for;
 #    a) fedora-rawhide-x86_64,
-#    b) fedora-13-x86_64,
-#    c) fedora-12-x86_64,
-#    d) epel-6-x86_64,
-#    e) epel-5-x86_64
+#    b) fedora-14-x86_64,
+#    c) fedora-13-x86_64,
+#    d) fedora-12-x86_64,
+#    e) epel-6-x86_64,
+#    f) epel-5-x86_64,
+#    g) epel-4-x86_64
 #
 #    or scratch build in koji;
 #
-#    for tag in dist-f14 dist-f13-updates-candidate dist-f12-updates-candidate \
-#               dist-6E-epel dist-5E-epel; do
+#    for tag in dist-f15 dist-f14-updates-candidate dist-f13-updates-candidate \
+#               dist-f12-updates-candidate dist-6E-epel dist-5E-epel dist-4E-epel; do
 #        echo "- $tag: `koji build --scratch --nowait $tag $srpm 2>&1 | grep \"Task info\" | awk '{print $3}'`"
 #    done
 #
@@ -52,8 +54,8 @@
 # number.
 #
 # When you do so, however, you will need to take into account upgrade paths
-# between distribution versions. E.g., when releasing 6.40.0-2 to F-12, you
-# would also need to release 6.40.0-2 to F-13.
+# between distribution versions. E.g., when releasing 6.40.0-2 to F-13, you
+# would also need to release 6.40.0-2 to F-14.
 #
 # An alternative is to release 6.40.1 with a zarafa-6.40.1.tar.gz (yet
 # again ensuring there is an upgrade path to later distribution versions)
@@ -100,15 +102,17 @@
 # 5. Build locally
 # 6. Build in mock for;
 #    a) fedora-rawhide-x86_64,
-#    b) fedora-13-x86_64,
-#    c) fedora-12-x86_64,
-#    d) epel-6-x86_64,
-#    e) epel-5-x86_64
+#    b) fedora-14-x86_64,
+#    c) fedora-13-x86_64,
+#    d) fedora-12-x86_64,
+#    e) epel-6-x86_64,
+#    f) epel-5-x86_64,
+#    g) epel-4-x86_64
 #
 #    or scratch build in koji;
 #
-#    for tag in dist-f14 dist-f13-updates-candidate dist-f12-updates-candidate \
-#               dist-6E-epel dist-5E-epel; do
+#    for tag in dist-f15 dist-f14-updates-candidate dist-f13-updates-candidate \
+#               dist-f12-updates-candidate dist-6E-epel dist-5E-epel dist-4E-epel; do
 #        echo "- $tag: `koji build --scratch --nowait $tag $srpm 2>&1 | grep \"Task info\" | awk '{print $3}'`"
 #    done
 #
@@ -117,7 +121,7 @@
 
 %define beta_or_rc      0
 %define actual_release  1
-%define svnrevision     21780
+%define svnrevision     22452
 %define with_clucene    1
 %define with_ldap       1
 %define with_xmlto      1
@@ -125,7 +129,7 @@
 
 Summary:            Open Source Edition of the Zarafa Collaboration Platform
 Name:               zarafa
-Version:            6.40.1
+Version:            6.40.2
 %if %{beta_or_rc}
 Release:            0.%{actual_release}.svn%{svnrevision}%{?dist}
 %else
@@ -146,8 +150,6 @@ Source2:            %{name}.logrotate
 Source3:            %{name}-webaccess.conf
 
 Patch0:             zarafa-6.40.0-package.patch
-# Patch 1 was sent to upstream
-Patch1:             zarafa-6.40.0-undefined-symbol.patch
 
 BuildRequires:      bison
 BuildRequires:      gcc-c++
@@ -510,7 +512,6 @@ PHP projects, using the MAPI functions like a normal MAPI program.
 %prep
 %setup -q
 %patch0 -p1 -b .package
-%patch1 -p1 -b .undefined-symbol
 
 # Needed to get rid of rpath
 %if 0%{?rhel}%{?fedora} > 4
@@ -988,6 +989,9 @@ fi
 %endif
 
 %changelog
+* Tue Aug 31 2010 Robert Scheck <robert at fedoraproject.org> 6.40.2-1
+- Upgrade to 6.40.2
+
 * Mon Aug 09 2010 Robert Scheck <robert at fedoraproject.org> 6.40.1-1
 - Upgrade to 6.40.1