From 2878aa7ffa643ac551730eb58db906d4713ba852 Mon Sep 17 00:00:00 2001
From: Robert Scheck <robert@fedoraproject.org>
Date: Apr 05 2011 23:03:45 +0000
Subject: Merge remote branch 'origin/master' into f13


---

diff --git a/.gitignore b/.gitignore
index 0f7389c..e6bc12c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-zcp-6.40.6.tar.gz
+zcp-6.40.7.tar.gz
diff --git a/sources b/sources
index 1406b1a..4a83986 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-34eb188e7fe5a7ca19f2de3580855b10  zcp-6.40.6.tar.gz
+2be6100d73e2d4e7756cca7c871849ac  zcp-6.40.7.tar.gz
diff --git a/zarafa.logrotate b/zarafa.logrotate
index f2a0b80..4daf882 100644
--- a/zarafa.logrotate
+++ b/zarafa.logrotate
@@ -1,4 +1,4 @@
-/var/log/zarafa/SERVICE.log {
+/var/log/zarafa/dagent.log {
 	weekly
 	missingok
 	rotate 52
@@ -6,8 +6,85 @@
 	delaycompress
 	notifempty
 	postrotate
-			killall -HUP zarafa-SERVICE 2> /dev/null || true
+			killall -HUP zarafa-dagent 2> /dev/null || true
 	endscript
 	create 0644 zarafa zarafa
 }
 
+/var/log/zarafa/gateway.log {
+	weekly
+	missingok
+	rotate 52
+	compress
+	delaycompress
+	notifempty
+	postrotate
+			killall -HUP zarafa-gateway 2> /dev/null || true
+	endscript
+	create 0644 zarafa zarafa
+}
+
+/var/log/zarafa/ical.log {
+	weekly
+	missingok
+	rotate 52
+	compress
+	delaycompress
+	notifempty
+	postrotate
+			killall -HUP zarafa-ical 2> /dev/null || true
+	endscript
+	create 0644 zarafa zarafa
+}
+
+/var/log/zarafa/indexer.log {
+	weekly
+	missingok
+	rotate 52
+	compress
+	delaycompress
+	notifempty
+	postrotate
+			killall -HUP zarafa-indexer 2> /dev/null || true
+	endscript
+	create 0644 zarafa zarafa
+}
+
+/var/log/zarafa/monitor.log {
+	weekly
+	missingok
+	rotate 52
+	compress
+	delaycompress
+	notifempty
+	postrotate
+			killall -HUP zarafa-monitor 2> /dev/null || true
+	endscript
+	create 0644 zarafa zarafa
+}
+
+/var/log/zarafa/server.log /var/log/zarafa/audit.log {
+	weekly
+	missingok
+	rotate 52
+	compress
+	delaycompress
+	notifempty
+	postrotate
+			killall -HUP zarafa-server 2> /dev/null || true
+	endscript
+	create 0644 zarafa zarafa
+}
+
+/var/log/zarafa/spooler.log {
+	weekly
+	missingok
+	rotate 52
+	compress
+	delaycompress
+	notifempty
+	postrotate
+			killall -HUP zarafa-spooler 2> /dev/null || true
+	endscript
+	create 0644 zarafa zarafa
+}
diff --git a/zarafa.spec b/zarafa.spec
index a9ab0be..442dc0e 100644
--- a/zarafa.spec
+++ b/zarafa.spec
@@ -119,7 +119,7 @@
 
 %global beta_or_rc      0
 %global actual_release  1
-%global svnrevision     25584
+%global svnrevision     26119
 %global with_clucene    1
 %global with_ldap       1
 %global with_xmlto      1
@@ -137,7 +137,7 @@
 
 Summary:            Open Source Edition of the Zarafa Collaboration Platform
 Name:               zarafa
-Version:            6.40.6
+Version:            6.40.7
 %if %{beta_or_rc}
 Release:            0.%{actual_release}.svn%{svnrevision}%{?dist}
 %else
@@ -585,10 +585,7 @@ done
 
 # Move the logrotate configuration file to its correct place
 rm -f $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d/*
-for service in dagent gateway ical indexer monitor server spooler; do
-    sed -e "s@SERVICE@$service@" %{SOURCE2} >> $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d/%{name}
-done
-touch -c -r %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d/%{name}
+install -p -m 644 %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d/%{name}
 
 # Move the userscripts to their correct place and symlink them
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/%{name}/userscripts/
@@ -651,6 +648,14 @@ 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 '119,126d' $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/webaccess/config.php > \
@@ -701,6 +706,7 @@ chown %{name}:%{name} %{_localstatedir}/log/%{name}/monitor.* > /dev/null 2>&1 |
 [ $1 -eq 1 ] && /sbin/chkconfig --add %{name}-server
 # Ensure correct log file ownership after upgrade from official packages
 chown %{name}:%{name} %{_localstatedir}/log/%{name}/server.* > /dev/null 2>&1 || :
+chown %{name}:%{name} %{_localstatedir}/log/%{name}/audit.* > /dev/null 2>&1 || :
 
 %post spooler
 [ $1 -eq 1 ] && /sbin/chkconfig --add %{name}-spooler
@@ -1009,6 +1015,12 @@ fi
 %endif
 
 %changelog
+* Wed Apr 06 2011 Robert Scheck <robert@fedoraproject.org> 6.40.7-1
+- Upgrade to 6.40.7
+
+* Thu Mar 24 2011 Robert Scheck <robert@fedoraproject.org> 6.40.6-2
+- Rebuilt for mysql 5.5.10 (soname bump in libmysqlclient)
+
 * Mon Mar 21 2011 Robert Scheck <robert@fedoraproject.org> 6.40.6-1
 - Upgrade to 6.40.6