[zarafa] Upgrade to 7.0.1 (#725250, #725909, #727346)
Robert Scheck
robert at fedoraproject.org
Sat Aug 13 23:57:36 UTC 2011
commit 28e9711af63302e012d639ed5909eb5e597d444d
Author: Robert Scheck <robert at fedoraproject.org>
Date: Sun Aug 14 01:57:02 2011 +0200
Upgrade to 7.0.1 (#725250, #725909, #727346)
.gitignore | 2 +-
sources | 2 +-
zarafa-7.0.0-cpp_std.patch | 14 -----
zarafa.logrotate | 10 ++++
zarafa.spec | 130 ++++++++++++++++----------------------------
5 files changed, 60 insertions(+), 98 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 57993fa..32dc724 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-zcp-7.0.0.tar.gz
+zcp-7.0.1.tar.gz
diff --git a/sources b/sources
index 00d7b04..5e18ab7 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-bed709709c175858414aa8965b4aa20f zcp-7.0.0.tar.gz
+2c268b1e5cba538c7d84ec9a742c3347 zcp-7.0.1.tar.gz
diff --git a/zarafa.logrotate b/zarafa.logrotate
index 4daf882..17a12ed 100644
--- a/zarafa.logrotate
+++ b/zarafa.logrotate
@@ -1,3 +1,13 @@
+/var/log/zarafa/archiver.log {
+ weekly
+ missingok
+ rotate 52
+ compress
+ delaycompress
+ notifempty
+ create 0644 zarafa zarafa
+}
+
/var/log/zarafa/dagent.log {
weekly
missingok
diff --git a/zarafa.spec b/zarafa.spec
index 5e3c65d..8f44767 100644
--- a/zarafa.spec
+++ b/zarafa.spec
@@ -1,7 +1,7 @@
%global beta_or_rc 0
%global actual_release 1
-%global svnrevision 27791
-%global with_clucene 0
+%global svnrevision 28479
+%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.0
+Version: 7.0.1
%if %{beta_or_rc}
Release: 0.%{actual_release}.svn%{svnrevision}%{?dist}
%else
@@ -42,7 +42,6 @@ Source2: %{name}.logrotate
Source3: %{name}-webaccess.conf
Patch0: zarafa-6.40.5-rpath.patch
-Patch1: zarafa-7.0.0-cpp_std.patch
BuildRequires: bison
BuildRequires: gcc-c++
@@ -84,7 +83,7 @@ BuildRequires: openldap-devel
BuildRequires: xmlto
%endif
-# The main package pulls in all of zarafa except indexer and webaccess
+# The main package pulls in all of classical zarafa core packages
Requires: zarafa-dagent%{?_isa} = %{version}-%{release}
Requires: zarafa-gateway%{?_isa} = %{version}-%{release}
Requires: zarafa-ical%{?_isa} = %{version}-%{release}
@@ -109,9 +108,17 @@ client library as well as programming interfaces for C++, PHP and Perl. The
other Zarafa related packages need to be installed to gain all the features
and benefits of the Zarafa Collaboration Platform (ZCP).
-##
-## Zarafa Client library
-##
+%package archiver
+Summary: Archive messages to a secondary Zarafa server
+Group: Applications/Archiving
+Requires: zarafa-common = %{version}-%{release}
+
+%description archiver
+The zarafa-archiver package includes the Zarafa Archiver to decrease the
+size of a production Zarafa server by copying or moving the messages to
+a secondary Zarafa server. Clients will still be able to open the message
+from the secondary Zarafa server directly.
+
%package client
Summary: The Zarafa Client library
Group: System Environment/Libraries
@@ -122,9 +129,6 @@ The zarafa-client package provides the Zarafa Client library, which gets
used by the Open Source MAPI (Messaging Application Programming Interface)
implementation of Zarafa as provider between MAPI and Zarafa.
-##
-## Common Zarafa files and directories
-##
%package common
Summary: Common Zarafa files and directories
Group: Applications/Productivity
@@ -138,11 +142,8 @@ The zarafa-common package provides the filesystem structure and includes
common files required by most other Zarafa packages. It also provides the
creation of the zarafa user for the different Zarafa services.
-##
-## Zarafa Delivery Agent
-##
%package dagent
-Summary: The Zarafa Delivery Agent
+Summary: Mail Delivery Agent for Zarafa Collaboration Platform
Group: System Environment/Daemons
Requires: zarafa-common = %{version}-%{release}
Requires(post): /sbin/chkconfig
@@ -150,14 +151,11 @@ Requires(preun): /sbin/service, /sbin/chkconfig
Requires(postun): /sbin/service
%description dagent
-The zarafa-dagent package includes the Zarafa Delivery Agent to import
+The zarafa-dagent package includes the Zarafa Delivery Agent to deliver
e-mail messages from Internet Mail format to Zarafa. The Zarafa Delivery
Agent can be used trigger the local mailer (MDA) or even act as the LMTP
server.
-##
-## Zarafa development files
-##
%package devel
Summary: Development files for several Zarafa libraries
Group: Development/Libraries
@@ -171,11 +169,8 @@ developing own programs which use functions and interfaces from the Zarafa
Collaboration Platform. The Zarafa Open Source Collaboration is using MAPI
objects, provides a MAPI client library and a C++ programming interface.
-##
-## Zarafa POP3/IMAP Gateway service
-##
%package gateway
-Summary: The Zarafa POP3/IMAP Gateway service
+Summary: POP3/IMAP Gateway for the Zarafa Collaboration Platform
Group: System Environment/Daemons
Requires: zarafa-common = %{version}-%{release}
Requires(post): /sbin/chkconfig
@@ -190,11 +185,8 @@ as well to view the contents of shared folders and subfolders. The Zarafa
POP3/IMAP Gateway service can be configured to listen for POP3, POP3S,
IMAP and/or IMAPS.
-##
-## Zarafa iCal/CalDAV gateway
-##
%package ical
-Summary: The Zarafa iCal/CalDAV gateway
+Summary: iCal/CalDAV gateway for the Zarafa Collaboration Platform
Group: System Environment/Daemons
Requires: zarafa-common = %{version}-%{release}
Requires(post): /sbin/chkconfig
@@ -211,11 +203,8 @@ or CalDAV (RFC 4791) compliant clients. The iCal/CalDAV gateway service
can be configured to listen for HTTP and HTTPS requests.
%if %{with_clucene}
-##
-## Zarafa Indexing service
-##
%package indexer
-Summary: The Zarafa Indexing service
+Summary: Indexer search engine for the Zarafa Collaboration Platform
Group: System Environment/Daemons
Requires: zarafa-common = %{version}-%{release}, file
Requires: catdoc, libxslt, w3m, unzip, %{_bindir}/pdftotext
@@ -231,11 +220,8 @@ search queries, the server will use this index to quickly find messages,
items and even in contents of attached documents.
%endif
-##
-## Zarafa Monitoring service
-##
%package monitor
-Summary: The Zarafa Monitoring service
+Summary: Quota Monitor for the Zarafa Collaboration Platform
Group: System Environment/Daemons
Requires: zarafa-common = %{version}-%{release}
Requires(post): /sbin/chkconfig
@@ -247,11 +233,8 @@ The zarafa-monitor package includes the Zarafa Monitoring service which
is responsible for checking the users store (mailbox) size, and sending
them (and administrators) a warning e-mail when limits are exceeded.
-##
-## Zarafa Server service
-##
%package server
-Summary: The main Zarafa Server service
+Summary: Server component for the Zarafa Collaboration Platform
Group: System Environment/Daemons
Requires: zarafa-common = %{version}-%{release}
Requires(post): /sbin/chkconfig
@@ -264,11 +247,8 @@ process. It contacts a database server and provides services to Zarafa
clients. The user base can be either retrieved from an external source
or can be setup with a separate list of users.
-##
-## Zarafa Spooler service
-##
%package spooler
-Summary: The Zarafa Spooler service
+Summary: Mail Spooler for the Zarafa Collaboration Platform
Group: System Environment/Daemons
Requires: zarafa-common = %{version}-%{release}
Requires(post): /sbin/chkconfig
@@ -280,9 +260,6 @@ The zarafa-spooler package includes the Zarafa Spooler service which is
responsible for converting the Zarafa e-mails from outboxes to Internet
Mail and send it using the configured SMTP server to the recipients.
-##
-## Zarafa Utilities
-##
%package utils
Summary: Zarafa Utilities for administration and management
Group: Applications/System
@@ -293,14 +270,16 @@ The zarafa-utils package includes various administration and management
utilities for the Zarafa Open Source Collaboration environment including
reporting, user and password management.
-##
-## Zarafa Webaccess
-##
%package webaccess
Summary: Zarafa Webaccess featuring a 'Look & Feel' similar to Outlook
Group: Applications/Productivity
-Requires: httpd
-Requires: php >= 4.3, php-mapi = %{version}-%{release}
+Requires: httpd, php-mapi = %{version}-%{release}
+# Bug: php53 from RHEL 5 does not provide php (#717158)
+%if 0%{?rhel} == 5
+Requires: mod_php >= 4.3
+%else
+Requires: php >= 4.3
+%endif
%if 0%{?rhel}%{?fedora} > 5
BuildArch: noarch
%endif
@@ -313,9 +292,6 @@ web browser. And opening your colleagues calendar or sending a meeting
request is only a piece of cake. The Zarafa Webaccess is using the ajax
technology to give a more interactive feeling to the users.
-##
-## MAPI library
-##
%package -n libmapi
Summary: MAPI implementation and library by Zarafa
Group: System Environment/Libraries
@@ -334,9 +310,6 @@ service providers, etc. This MAPI implementation by Zarafa is also known
as MAPI4Linux.
%if 0
-##
-## Perl MAPI extension
-##
%package -n perl-MAPI
Summary: The Perl MAPI extension by Zarafa
Group: Development/Libraries
@@ -349,9 +322,6 @@ The perl-MAPI package contains the Perl MAPI extension to provide access
to Microsoft MAPI functions while using Perl.
%endif
-##
-## PHP MAPI extension
-##
%package -n php-mapi
Summary: The PHP MAPI extension by Zarafa
Group: Development/Languages
@@ -376,9 +346,6 @@ e.g. webbased e-mail and calendaring systems and interfaces with existing
PHP projects, using the MAPI functions like a normal MAPI program.
%if 0%{?rhel}%{?fedora} > 4
-##
-## Python MAPI extension
-##
%package -n python-MAPI
Summary: The Python MAPI extension by Zarafa
Group: Development/Languages
@@ -394,10 +361,8 @@ to interact with Zarafa.
%setup -q
%patch0 -p1 -b .rpath
touch -c -r aclocal.m4.rpath aclocal.m4
-%patch1 -p1 -b .cpp_std
%build
-export CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing -ggdb"
%if 0%{?rhel}%{?fedora} < 6
export CPPFLAGS="$CPPFLAGS -I%{_includedir}/boost141"
export LDFLAGS="$LDFLAGS -L%{_libdir}/boost141"
@@ -413,6 +378,7 @@ export LDFLAGS="$LDFLAGS -L%{_libdir}/boost141"
%else
--with-clucene-lib-prefix= \
%endif
+ --enable-release \
--enable-swig \
--disable-perl \
%if 0%{?rhel}%{?fedora} > 4
@@ -438,7 +404,7 @@ make \
# Nuke all overlefts from licensed, managed or other proprietary items
rm -rf $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/{license,licensed.cfg,report-ca}
-rm -f $RPM_BUILD_ROOT%{_mandir}/man?/{zarafa-{backup,restore,report,msr,ldapms.cfg,licensed{,.cfg},archiver{,.cfg}},za-aclsync}.*
+rm -f $RPM_BUILD_ROOT%{_mandir}/man?/{zarafa-{backup,restore,report,msr,ldapms.cfg,licensed{,.cfg}},za-aclsync}.*
# Move all the initscripts to their appropriate place and
# ensure that all services are off by default at boot time
@@ -559,6 +525,10 @@ getent group %{name} > /dev/null || %{_sbindir}/groupadd -r %{name}
getent passwd %{name} > /dev/null || %{_sbindir}/useradd -r -g %{name} -d %{_localstatedir}/lib/%{name} -s /sbin/nologin -c "Zarafa Service Account" %{name}
exit 0
+%post archiver
+# Ensure correct log file ownership after upgrade from official packages
+chown %{name}:%{name} %{_localstatedir}/log/%{name}/archiver.* > /dev/null 2>&1 || :
+
%post dagent
[ $1 -eq 1 ] && /sbin/chkconfig --add %{name}-dagent
# Ensure correct log file ownership after upgrade from official packages
@@ -684,15 +654,21 @@ fi
%files
%defattr(-,root,root,-)
-%doc installer/licenseagreement/AGPL-3
+
+%files archiver
+%defattr(-,root,root,-)
+%{_bindir}/%{name}-archiver
+%config(noreplace) %attr(0640,%{name},%{name}) %{_sysconfdir}/%{name}/archiver.cfg
+%{_mandir}/man1/%{name}-archiver.1*
+%{_mandir}/man5/%{name}-archiver.cfg.5*
%files client -f %{name}.lang
%defattr(-,root,root,-)
-%doc installer/licenseagreement/AGPL-3
%{_libdir}/libzarafaclient.so
%files common
%defattr(-,root,root,-)
+%doc installer/licenseagreement/AGPL-3
%dir %{_sysconfdir}/%{name}/
%config(noreplace) %{_sysconfdir}/logrotate.d/%{name}
%config(noreplace) %{_sysconfdir}/sysconfig/%{name}
@@ -703,7 +679,7 @@ fi
%files dagent
%defattr(-,root,root,-)
-%doc installer/licenseagreement/AGPL-3 installer/linux/createuser.dotforward
+%doc installer/linux/createuser.dotforward
%{_bindir}/%{name}-autorespond
%{_bindir}/%{name}-dagent
%config(noreplace) %attr(0640,%{name},%{name}) %{_sysconfdir}/%{name}/dagent.cfg
@@ -714,7 +690,6 @@ fi
%files devel
%defattr(-,root,root,-)
-%doc installer/licenseagreement/AGPL-3
%{_libdir}/libarchiver.so
%{_libdir}/libicalmapi.so
%{_libdir}/libinetmapi.so
@@ -734,7 +709,6 @@ fi
%files gateway
%defattr(-,root,root,-)
-%doc installer/licenseagreement/AGPL-3
%{_bindir}/%{name}-gateway
%config(noreplace) %attr(0640,%{name},%{name}) %{_sysconfdir}/%{name}/gateway.cfg
%{_sysconfdir}/rc.d/init.d/%{name}-gateway
@@ -744,7 +718,6 @@ fi
%files ical
%defattr(-,root,root,-)
-%doc installer/licenseagreement/AGPL-3
%{_bindir}/%{name}-ical
%config(noreplace) %attr(0640,%{name},%{name}) %{_sysconfdir}/%{name}/ical.cfg
%{_sysconfdir}/rc.d/init.d/%{name}-ical
@@ -754,7 +727,6 @@ fi
%if %{with_clucene}
%files indexer
%defattr(-,root,root,-)
-%doc installer/licenseagreement/AGPL-3
%{_bindir}/%{name}-indexer
%config(noreplace) %attr(0640,%{name},%{name}) %{_sysconfdir}/%{name}/indexer.cfg
%{_sysconfdir}/rc.d/init.d/%{name}-indexer
@@ -773,7 +745,6 @@ fi
%files monitor
%defattr(-,root,root,-)
-%doc installer/licenseagreement/AGPL-3
%{_bindir}/%{name}-monitor
%config(noreplace) %attr(0640,%{name},%{name}) %{_sysconfdir}/%{name}/monitor.cfg
%dir %{_sysconfdir}/%{name}/quotamail/
@@ -789,7 +760,6 @@ fi
%files server
%defattr(-,root,root,-)
-%doc installer/licenseagreement/AGPL-3
%{_bindir}/%{name}-server
%config(noreplace) %attr(0640,%{name},%{name}) %{_sysconfdir}/%{name}/server.cfg
%config(noreplace) %attr(0640,%{name},%{name}) %{_sysconfdir}/%{name}/unix.cfg
@@ -830,7 +800,6 @@ fi
%files spooler
%defattr(-,root,root,-)
-%doc installer/licenseagreement/AGPL-3
%{_bindir}/%{name}-spooler
%config(noreplace) %attr(0640,%{name},%{name}) %{_sysconfdir}/%{name}/spooler.cfg
%{_sysconfdir}/rc.d/init.d/%{name}-spooler
@@ -839,7 +808,6 @@ fi
%files utils
%defattr(-,root,root,-)
-%doc installer/licenseagreement/AGPL-3
%{_bindir}/%{name}-admin
%{_bindir}/%{name}-fsck
%{_bindir}/%{name}-passwd
@@ -856,7 +824,6 @@ fi
%files webaccess
%defattr(-,root,root,-)
-%doc installer/licenseagreement/AGPL-3
%config(noreplace) %{_sysconfdir}/httpd/conf.d/%{name}-webaccess.conf
%dir %{_sysconfdir}/%{name}/
%dir %{_sysconfdir}/%{name}/webaccess/
@@ -867,7 +834,6 @@ fi
%files -n libmapi
%defattr(-,root,root,-)
-%doc installer/licenseagreement/AGPL-3
%{_libdir}/libarchiver.so.*
%{_libdir}/libicalmapi.so.*
%{_libdir}/libinetmapi.so.*
@@ -876,14 +842,12 @@ fi
%if 0
%files -n perl-MAPI
%defattr(-,root,root,-)
-%doc installer/licenseagreement/AGPL-3
%{perl_vendorarch}/MAPI.pm
%{perl_vendorarch}/auto/MAPI/
%endif
%files -n php-mapi
%defattr(-,root,root,-)
-%doc installer/licenseagreement/AGPL-3
%config(noreplace) %{_sysconfdir}/php.d/%{name}.ini
%{_datadir}/php/mapi/
%if 0%{?rhel}%{?fedora} > 4
@@ -895,11 +859,13 @@ fi
%if 0%{?rhel}%{?fedora} > 4
%files -n python-MAPI
%defattr(-,root,root,-)
-%doc installer/licenseagreement/AGPL-3
%{python_sitearch}/*
%endif
%changelog
+* Sun Aug 14 2011 Robert Scheck <robert at fedoraproject.org> 7.0.1-1
+- Upgrade to 7.0.1 (#725250, #725909, #727346)
+
* Mon Jun 27 2011 Robert Scheck <robert at fedoraproject.org> 7.0.0-1
- Upgrade to 7.0.0
More information about the scm-commits
mailing list