[zarafa: 1/2] Upgrade to 7.0.2 (#717968)

[Robert Scheck]

commit 9d719ee444b159200f62e4163488c4fba0d951d3
Author: Robert Scheck <robert at fedoraproject.org>
Date:   Sat Oct 1 12:54:29 2011 +0200

    Upgrade to 7.0.2 (#717968)

 .gitignore  |    2 +-
 sources     |    2 +-
 zarafa.spec |   17 ++++++-----------
 3 files changed, 8 insertions(+), 13 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 32dc724..5ad4ea6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-zcp-7.0.1.tar.gz
+zcp-7.0.2.tar.gz
diff --git a/sources b/sources
index 5e18ab7..3ba76ec 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-2c268b1e5cba538c7d84ec9a742c3347  zcp-7.0.1.tar.gz
+9a0604a9b769057941a1e83781134176  zcp-7.0.2.tar.gz
diff --git a/zarafa.spec b/zarafa.spec
index 1ce5518..93c8d75 100644
--- a/zarafa.spec
+++ b/zarafa.spec
@@ -1,7 +1,7 @@
 %global beta_or_rc      0
 %global actual_release  1
-%global svnrevision     28479
-%global with_clucene    0
+%global svnrevision     29470
+%global with_clucene    1
 %global with_ldap       1
 %global with_xmlto      1
 %global no_multiupload  1
@@ -18,7 +18,7 @@
 
 Summary:            Open Source Edition of the Zarafa Collaboration Platform
 Name:               zarafa
-Version:            7.0.1
+Version:            7.0.2
 %if %{beta_or_rc}
 Release:            0.%{actual_release}.svn%{svnrevision}%{?dist}
 %else
@@ -498,14 +498,6 @@ mkdir -p $RPM_BUILD_ROOT%{_datadir}/%{name}-webaccess/plugins/
 rm -f $RPM_BUILD_ROOT%{_datadir}/%{name}-webaccess/client/widgets/fckeditor/editor/dialog/fck_spellerpages/spellerpages/server-scripts/spellchecker.{cfm,pl}
 rm -f $RPM_BUILD_ROOT%{_datadir}/%{name}-webaccess/{.htaccess,%{name}-webaccess.conf}
 
-# Replace example timezone by default from PHP configuration
-sed -e 's@"Europe/London"@date_default_timezone_get()@' \
-    -e 's@\(Defines the default time zone\)@\1, change e.g. to "Europe/Amsterdam" when needed@' \
-    $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/webaccess/config.php > \
-    $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/webaccess/config.php.new
-touch -c -r $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/webaccess/config.php{,.new}
-mv -f $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/webaccess/config.php{.new,}
-
 # Remove flash-based multi-attachment upload (missing source)
 %if %{no_multiupload}
 sed '122,129d' $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/webaccess/config.php > \
@@ -863,6 +855,9 @@ fi
 %endif
 
 %changelog
+* Sat Oct 01 2011 Robert Scheck <robert at fedoraproject.org> 7.0.2-1
+- Upgrade to 7.0.2 (#717968)
+
 * Sun Aug 14 2011 Robert Scheck <robert at fedoraproject.org> 7.0.1-1
 - Upgrade to 7.0.1 (#725250, #725909, #727346)