From 95ce3738bd0817d66dc027c66821b490f1247217 Mon Sep 17 00:00:00 2001 From: Kevin Fenzi Date: Sun, 7 Feb 2010 21:27:28 +0000 Subject: [PATCH 01/12] Initialize branch EL-4 for zarafa --- branch | 1 + 1 file changed, 1 insertion(+) create mode 100644 branch diff --git a/branch b/branch new file mode 100644 index 0000000..6ec5cef --- /dev/null +++ b/branch @@ -0,0 +1 @@ +EL-4 From a94a7b5da96d78375ebd1fb2cdf18b1303767e94 Mon Sep 17 00:00:00 2001 From: Robert Scheck Date: Thu, 18 Mar 2010 23:33:20 +0000 Subject: [PATCH 02/12] Upgrade to 6.30.11 --- .cvsignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.cvsignore b/.cvsignore index e69de29..0e7e07b 100644 --- a/.cvsignore +++ b/.cvsignore @@ -0,0 +1 @@ +zarafa-6.30.10.tar.gz From efd4a03a98212803341ec0a5dede5782a6033b1d Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 29 Jul 2010 16:27:57 +0000 Subject: [PATCH 03/12] dist-git conversion --- .cvsignore => .gitignore | 0 Makefile | 21 --------------------- branch | 1 - 3 files changed, 22 deletions(-) rename .cvsignore => .gitignore (100%) delete mode 100644 Makefile delete mode 100644 branch diff --git a/.cvsignore b/.gitignore similarity index 100% rename from .cvsignore rename to .gitignore diff --git a/Makefile b/Makefile deleted file mode 100644 index e73f362..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: zarafa -# $Id$ -NAME := zarafa -SPECFILE = $(firstword $(wildcard *.spec)) - -define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done -endef - -MAKEFILE_COMMON := $(shell $(find-makefile-common)) - -ifeq ($(MAKEFILE_COMMON),) -# attept a checkout -define checkout-makefile-common -test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 -endef - -MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) -endif - -include $(MAKEFILE_COMMON) diff --git a/branch b/branch deleted file mode 100644 index 6ec5cef..0000000 --- a/branch +++ /dev/null @@ -1 +0,0 @@ -EL-4 From 5e11b60b858f3013d6866a5c06c86cc8748715d4 Mon Sep 17 00:00:00 2001 From: Robert Scheck Date: Mon, 9 Aug 2010 22:53:18 +0200 Subject: [PATCH 04/12] Disable CLucene on EPEL 4 for now (#600992) --- zarafa.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/zarafa.spec b/zarafa.spec index d0b02ce..c3643c6 100644 --- a/zarafa.spec +++ b/zarafa.spec @@ -118,7 +118,7 @@ %define beta_or_rc 0 %define actual_release 1 %define svnrevision 21780 -%define with_clucene 1 +%define with_clucene 0 %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) From c320af84aaf2e4c69e759b1d7d18467109d7428b Mon Sep 17 00:00:00 2001 From: Robert Scheck Date: Fri, 29 Jul 2011 16:08:15 +0200 Subject: [PATCH 05/12] Upgrade to 6.40.10 (#725250, #725909) --- .gitignore | 2 +- sources | 2 +- zarafa.spec | 142 ++++++---------------------------------------------- 3 files changed, 18 insertions(+), 128 deletions(-) diff --git a/.gitignore b/.gitignore index f26cb86..b0d53a5 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -zcp-6.40.9.tar.gz +zcp-6.40.10.tar.gz diff --git a/sources b/sources index feeb516..8b08872 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -744a8c4b39da172717c1dd7ea7d03910 zcp-6.40.9.tar.gz +81b4ddf654b22de39f1d7434fc535a7f zcp-6.40.10.tar.gz diff --git a/zarafa.spec b/zarafa.spec index dfab5f8..c11f9c0 100644 --- a/zarafa.spec +++ b/zarafa.spec @@ -1,125 +1,6 @@ -# -# Releasing with this .spec, for fun and profit; -# -# = Beta Release or Release Candidate = -# -# 1. Set beta_or_rc to 1 -# 2. Set actual_release to the actual_release value of the previous -# build attempt, +1 -# - The release tag in case of a beta_or_rc release is (statically) -# prefixed with "0.", so that the first final release ("1") is always -# newer (in rpm-compver). -# 3. Set the SVN revision to the current SVN revision; -# - This ensures a future SVN revision is always *more* recent in -# rpm-compver -# - Lacking a unique zarafa-.svn.tar.gz source -# tarball, setting the correct SVN revision in the .spec is -# critical in order to be able to determine exactly what was in -# the tarball at the time of this build. You may recover the exact -# SVN revision used from the resulting SRPM and RPMs because it ends -# up in the RPM release tag. -# 4. Update %%changelog, considering the following; -# - Possibly change only the release tag for the most recent changelog -# %%changelog entry, if appropriate -# - Add a message about the changes to either the product or the RPM -# packaging -# 5. Build locally -# 6. Build in mock for; -# a) fedora-rawhide-x86_64, -# b) fedora-14-x86_64, -# c) fedora-13-x86_64, -# d) epel-6-x86_64, -# e) epel-5-x86_64, -# f) epel-4-x86_64 -# -# or scratch build in koji; -# -# for tag in dist-f15 dist-f14-updates-candidate dist-f13-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 -# -# 7. Should builds fail, repeat the process. -# -# = Final Release = -# -# NOTE: A final release of a version, or multiple final releases of the -# same version, of Zarafa 6.40.0 requires one unique tarball, probably -# named similar to zarafa-6.40.0.tar.gz. -# -# Once this tarball is used for an RPM package that is actually released, -# the .tar.gz source should not change anymore. You may, though, include -# patches for the 6.40.0 RPM package in this .spec and bumping the release -# 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-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) -# -# The point behind this has to do with reproducibility, though admittedly, -# the Source RPM corresponding to the binary RPM (comparing the -# -.src.rpm vs. the installed -# -..rpm) does reveal the actual SVN revision number, -# and should thus also build the exact same thing running in production (euh, -# at customers, that is). -# -# 1. Set beta_or_rc to 0 -# 2. Set actual_release to 1, or the value of actual_release of -# the previous stable release, +1 in case have already released -# this SVN revision as a stable product. -# 3. Set the SVN revision to the current SVN revision; -# - Lacking a unique zarafa-.svn.tar.gz source -# tarball, setting the correct SVN revision in the .spec is -# critical in order to be able to determine exactly what was in -# the tarball at the time of this build. You may recover the exact -# SVN revision used from the resulting SRPM, as the .spec in that -# SRPM contains the SVN revision number (but not the resulting RPMs -# just for the sake of appearance). -# 4. Update %%changelog, considering the following; -# - Remove all %%changelog stamps that have a beta_or_rc type of versioning, -# again just for appearances sake, possibly preserving the important -# messages from each beta_or_rc type of changelog entries, e.g.: -# -# * Some Time Your Name - 6.40.0-0.1svn12345 -# - Improve packaging -# -# might, in a final release, become: -# -# * Some Time Zarafa Release Engineering - 6.40.0-1 -# - Release 6.40.0 -# - Improve packaging -# -# - Possibly change only the release tag for the most recent changelog -# %%changelog entry, if appropriate. This is assuming there is no -# important or significant changes between the beta_or_rc and the final -# product. -# - Add a message about the changes to either the product or the RPM -# packaging if appropriate. -# 5. Build locally -# 6. Build in mock for; -# a) fedora-rawhide-x86_64, -# b) fedora-14-x86_64, -# c) fedora-13-x86_64, -# d) epel-6-x86_64, -# e) epel-5-x86_64, -# f) epel-4-x86_64 -# -# or scratch build in koji; -# -# for tag in dist-f15 dist-f14-updates-candidate dist-f13-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 -# -# 7. When mock or koji scratch builds fail, repeat the process. -# - %global beta_or_rc 0 %global actual_release 1 -%global svnrevision 27553 +%global svnrevision 28214 %global with_clucene 1 %global with_ldap 1 %global with_xmlto 1 @@ -137,7 +18,7 @@ Summary: Open Source Edition of the Zarafa Collaboration Platform Name: zarafa -Version: 6.40.9 +Version: 6.40.10 %if %{beta_or_rc} Release: 0.%{actual_release}.svn%{svnrevision}%{?dist} %else @@ -335,7 +216,7 @@ can be configured to listen for HTTP and HTTPS requests. Summary: The Zarafa Indexing service Group: System Environment/Daemons Requires: zarafa-common = %{version}-%{release}, file -Requires: catdoc, libxslt, lynx, unzip, %{_bindir}/pdftotext +Requires: catdoc, libxslt, w3m, unzip, %{_bindir}/pdftotext Requires(post): /sbin/chkconfig Requires(preun): /sbin/service, /sbin/chkconfig Requires(postun): /sbin/service @@ -416,8 +297,13 @@ reporting, user and password management. %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 @@ -513,7 +399,6 @@ to interact with Zarafa. touch -c -r aclocal.m4.rpath aclocal.m4 %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" @@ -529,7 +414,9 @@ export LDFLAGS="$LDFLAGS -L%{_libdir}/boost141" %else --with-clucene-lib-prefix= \ %endif + --enable-release \ --enable-swig \ + --disable-perl \ %if 0%{?rhel}%{?fedora} > 4 --enable-python \ %else @@ -553,7 +440,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}}.* +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%{_bindir}/%{name}-msr # Move all the initscripts to their appropriate place and @@ -1015,6 +902,9 @@ fi %endif %changelog +* Fri Jul 29 2011 Robert Scheck 6.40.10-1 +- Upgrade to 6.40.10 (#725250, #725909) + * Tue Jun 14 2011 Robert Scheck 6.40.9-1 - Upgrade to 6.40.9 From 56212ba6d5a6ed012af61c730f39f4ac9d13346a Mon Sep 17 00:00:00 2001 From: Robert Scheck Date: Sun, 14 Aug 2011 02:21:28 +0200 Subject: [PATCH 06/12] Backported relevant spec file changes from 7.0.x branches --- zarafa.spec | 87 ++++++++--------------------------------------------- 1 file changed, 13 insertions(+), 74 deletions(-) diff --git a/zarafa.spec b/zarafa.spec index c11f9c0..361a473 100644 --- a/zarafa.spec +++ b/zarafa.spec @@ -82,7 +82,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} @@ -107,9 +107,6 @@ 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 client Summary: The Zarafa Client library Group: System Environment/Libraries @@ -120,9 +117,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 @@ -136,11 +130,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 @@ -148,14 +139,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 @@ -169,11 +157,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 @@ -188,11 +173,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 @@ -209,11 +191,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 @@ -229,11 +208,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 @@ -245,11 +221,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 @@ -262,11 +235,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 @@ -278,9 +248,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 @@ -291,9 +258,6 @@ 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 @@ -316,9 +280,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 @@ -337,9 +298,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 @@ -352,9 +310,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 @@ -379,9 +334,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 @@ -485,7 +437,7 @@ done # Create the data directory and install some files into mkdir -p $RPM_BUILD_ROOT%{_datadir}/%{name}/ install -p -m 644 installer/linux/db-{calc-storesize,convert-attachments-to-files} $RPM_BUILD_ROOT%{_datadir}/%{name}/ -install -p -m 644 installer/linux/ssl-certificates.sh $RPM_BUILD_ROOT%{_datadir}/%{name}/ +install -p -m 644 installer/linux/{ssl-certificates.sh,audit-parse.pl} $RPM_BUILD_ROOT%{_datadir}/%{name}/ %if %{with_ldap} install -p -m 644 installer/linux/{db-upgrade-objectsid-to-objectguid,ldap-switch-sendas}.pl $RPM_BUILD_ROOT%{_datadir}/%{name}/ install -p -m 644 installer/ldap/%{name}.schema $RPM_BUILD_ROOT%{_datadir}/%{name}/ @@ -687,15 +639,14 @@ fi %files %defattr(-,root,root,-) -%doc installer/licenseagreement/AGPL-3 %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} @@ -706,7 +657,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 @@ -717,7 +668,6 @@ fi %files devel %defattr(-,root,root,-) -%doc installer/licenseagreement/AGPL-3 %{_libdir}/libarchiver.so %{_libdir}/libicalmapi.so %{_libdir}/libinetmapi.so @@ -737,7 +687,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 @@ -746,7 +695,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 @@ -756,7 +704,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 @@ -775,7 +722,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/ @@ -791,7 +737,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 @@ -832,7 +777,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 @@ -841,12 +785,12 @@ fi %files utils %defattr(-,root,root,-) -%doc installer/licenseagreement/AGPL-3 %{_bindir}/%{name}-admin %{_bindir}/%{name}-cfgchecker %{_bindir}/%{name}-fsck %{_bindir}/%{name}-passwd %{_bindir}/%{name}-stats +%{_datadir}/%{name}/audit-parse.pl %{_datadir}/%{name}/db-calc-storesize %{_datadir}/%{name}/db-convert-attachments-to-files %{_datadir}/%{name}/ssl-certificates.sh @@ -858,7 +802,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/ @@ -869,7 +812,6 @@ fi %files -n libmapi %defattr(-,root,root,-) -%doc installer/licenseagreement/AGPL-3 %{_libdir}/libarchiver.so.* %{_libdir}/libicalmapi.so.* %{_libdir}/libinetmapi.so.* @@ -878,14 +820,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 @@ -897,7 +837,6 @@ fi %if 0%{?rhel}%{?fedora} > 4 %files -n python-MAPI %defattr(-,root,root,-) -%doc installer/licenseagreement/AGPL-3 %{python_sitearch}/* %endif From fa21ad37fc76d6aabdb7a0ea835c2828eddcf216 Mon Sep 17 00:00:00 2001 From: Robert Scheck Date: Sun, 11 Sep 2011 18:58:34 +0200 Subject: [PATCH 07/12] Upgrade to 6.40.11 --- .gitignore | 2 +- sources | 2 +- zarafa.spec | 33 +++++++++++++++++++++++++++++---- 3 files changed, 31 insertions(+), 6 deletions(-) diff --git a/.gitignore b/.gitignore index b0d53a5..6269c53 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -zcp-6.40.10.tar.gz +zcp-6.40.11.tar.gz diff --git a/sources b/sources index 8b08872..bd04a9a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -81b4ddf654b22de39f1d7434fc535a7f zcp-6.40.10.tar.gz +8778600b44b06b9433e71760b84d282a zcp-6.40.11.tar.gz diff --git a/zarafa.spec b/zarafa.spec index 361a473..6273b1e 100644 --- a/zarafa.spec +++ b/zarafa.spec @@ -1,6 +1,6 @@ %global beta_or_rc 0 %global actual_release 1 -%global svnrevision 28214 +%global svnrevision 28965 %global with_clucene 1 %global with_ldap 1 %global with_xmlto 1 @@ -18,7 +18,7 @@ Summary: Open Source Edition of the Zarafa Collaboration Platform Name: zarafa -Version: 6.40.10 +Version: 6.40.11 %if %{beta_or_rc} Release: 0.%{actual_release}.svn%{svnrevision}%{?dist} %else @@ -107,6 +107,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). +%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 @@ -392,7 +403,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}.* rm -f $RPM_BUILD_ROOT%{_bindir}/%{name}-msr # Move all the initscripts to their appropriate place and @@ -453,7 +464,7 @@ mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/{log,lib}/%{name}/ rm -f $RPM_BUILD_ROOT{%{_libdir}/{,php/modules,php4,%{name}},%{perl_vendorarch}/auto/MAPI,%{python_sitearch}}/*.la # Remove files that are anyway in %doc or %{_datadir}/%{name}/ -rm -rf $RPM_BUILD_ROOT%{_datadir}/doc/%{name}{,-indexer}/ +rm -rf $RPM_BUILD_ROOT%{_datadir}/doc/%{name}{,-archiver,-indexer}/ # Remove unwanted/unused files that shouldn't exist anyway... rm -f $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/%{name}-indexer @@ -514,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 @@ -640,6 +655,13 @@ fi %files %defattr(-,root,root,-) +%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,-) %{_libdir}/libzarafaclient.so @@ -841,6 +863,9 @@ fi %endif %changelog +* Sun Sep 11 2011 Robert Scheck 6.40.11-1 +- Upgrade to 6.40.11 + * Fri Jul 29 2011 Robert Scheck 6.40.10-1 - Upgrade to 6.40.10 (#725250, #725909) From 079e83fe1f9c2b0173147900f60d6f4a4f740256 Mon Sep 17 00:00:00 2001 From: Robert Scheck Date: Sun, 20 Nov 2011 02:19:45 +0100 Subject: [PATCH 08/12] Upgrade to 6.40.12 --- .gitignore | 2 +- sources | 2 +- zarafa.spec | 20 ++++++++++++++++++-- 3 files changed, 20 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 6269c53..45562c7 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -zcp-6.40.11.tar.gz +zcp-6.40.12.tar.gz diff --git a/sources b/sources index bd04a9a..9228b8c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -8778600b44b06b9433e71760b84d282a zcp-6.40.11.tar.gz +054c51daffe63189790a80bbf04ca6a0 zcp-6.40.12.tar.gz diff --git a/zarafa.spec b/zarafa.spec index 6273b1e..d30e26c 100644 --- a/zarafa.spec +++ b/zarafa.spec @@ -1,6 +1,6 @@ %global beta_or_rc 0 %global actual_release 1 -%global svnrevision 28965 +%global svnrevision 29942 %global with_clucene 1 %global with_ldap 1 %global with_xmlto 1 @@ -18,7 +18,7 @@ Summary: Open Source Edition of the Zarafa Collaboration Platform Name: zarafa -Version: 6.40.11 +Version: 6.40.12 %if %{beta_or_rc} Release: 0.%{actual_release}.svn%{svnrevision}%{?dist} %else @@ -71,8 +71,12 @@ BuildRequires: python-devel >= 2.4 %endif %if %{with_clucene} +%if 0%{?fedora} > 15 +BuildRequires: clucene09-core-devel >= 0.9.21b-1 +%else BuildRequires: clucene-core-devel >= 0.9.21b-1 %endif +%endif %if %{with_ldap} BuildRequires: openldap-devel @@ -367,13 +371,22 @@ export CPPFLAGS="$CPPFLAGS -I%{_includedir}/boost141" export LDFLAGS="$LDFLAGS -L%{_libdir}/boost141" %endif +%if 0%{?fedora} > 15 +export LDFLAGS="$LDFLAGS -L%{_libdir}/clucene09" +%endif + %configure \ --with-userscript-prefix=%{_sysconfdir}/%{name}/userscripts \ --with-quotatemplate-prefix=%{_sysconfdir}/%{name}/quotamail \ --with-indexerscripts-prefix=%{_datadir}/%{name}/indexerscripts \ %if %{with_clucene} +%if 0%{?fedora} > 15 + --with-clucene-lib-prefix=%{_libdir}/clucene09 \ + --with-clucene-include-prefix=%{_includedir}/clucene09 \ +%else --with-clucene-lib-prefix=%{_libdir} \ --with-clucene-include-prefix=%{_includedir} \ +%endif %else --with-clucene-lib-prefix= \ %endif @@ -863,6 +876,9 @@ fi %endif %changelog +* Sun Nov 20 2011 Robert Scheck 6.40.12-1 +- Upgrade to 6.40.12 + * Sun Sep 11 2011 Robert Scheck 6.40.11-1 - Upgrade to 6.40.11 From 5f3193675dd3261b55273ce555245833192c50ea Mon Sep 17 00:00:00 2001 From: Robert Scheck Date: Sat, 17 Dec 2011 16:54:41 +0100 Subject: [PATCH 09/12] Upgrade to 6.40.13 --- .gitignore | 2 +- sources | 2 +- zarafa.spec | 7 +++++-- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 45562c7..63530ac 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -zcp-6.40.12.tar.gz +zcp-6.40.13.tar.gz diff --git a/sources b/sources index 9228b8c..e6001bd 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -054c51daffe63189790a80bbf04ca6a0 zcp-6.40.12.tar.gz +659002020bac02e17503907cbe4b41b9 zcp-6.40.13.tar.gz diff --git a/zarafa.spec b/zarafa.spec index d30e26c..d831444 100644 --- a/zarafa.spec +++ b/zarafa.spec @@ -1,6 +1,6 @@ %global beta_or_rc 0 %global actual_release 1 -%global svnrevision 29942 +%global svnrevision 30778 %global with_clucene 1 %global with_ldap 1 %global with_xmlto 1 @@ -18,7 +18,7 @@ Summary: Open Source Edition of the Zarafa Collaboration Platform Name: zarafa -Version: 6.40.12 +Version: 6.40.13 %if %{beta_or_rc} Release: 0.%{actual_release}.svn%{svnrevision}%{?dist} %else @@ -876,6 +876,9 @@ fi %endif %changelog +* Sat Dec 17 2011 Robert Scheck 6.40.13-1 +- Upgrade to 6.40.13 + * Sun Nov 20 2011 Robert Scheck 6.40.12-1 - Upgrade to 6.40.12 From 6075ec2940dbdab3bb06fca6aa030eb49325ebe4 Mon Sep 17 00:00:00 2001 From: Robert Scheck Date: Sat, 17 Dec 2011 17:05:58 +0100 Subject: [PATCH 10/12] Remove the correct part of the multi-upload --- zarafa.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/zarafa.spec b/zarafa.spec index d831444..a71b2ad 100644 --- a/zarafa.spec +++ b/zarafa.spec @@ -521,7 +521,7 @@ 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 > \ +sed '122,129d' $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,} From 122760234d51f4db81c3f8187c60709a140c52f2 Mon Sep 17 00:00:00 2001 From: Robert Scheck Date: Sun, 18 Dec 2011 02:53:06 +0100 Subject: [PATCH 11/12] Added forgotten manual merges/backports from Zarafa 7.0.3 --- zarafa.spec | 2 ++ 1 file changed, 2 insertions(+) diff --git a/zarafa.spec b/zarafa.spec index a71b2ad..c4c3c4d 100644 --- a/zarafa.spec +++ b/zarafa.spec @@ -149,6 +149,7 @@ creation of the zarafa user for the different Zarafa services. Summary: Mail Delivery Agent for Zarafa Collaboration Platform Group: System Environment/Daemons Requires: zarafa-common = %{version}-%{release} +Requires: php-mapi%{?_isa} = %{version}-%{release} Requires(post): /sbin/chkconfig Requires(preun): /sbin/service, /sbin/chkconfig Requires(postun): /sbin/service @@ -695,6 +696,7 @@ fi %doc installer/linux/createuser.dotforward %{_bindir}/%{name}-autorespond %{_bindir}/%{name}-dagent +%{_bindir}/%{name}-mr-accept %config(noreplace) %attr(0640,%{name},%{name}) %{_sysconfdir}/%{name}/dagent.cfg %config(noreplace) %{_sysconfdir}/%{name}/autorespond %{_sysconfdir}/rc.d/init.d/%{name}-dagent From e4d21d15a635e0d63ff7b5622fb4bc7af20d4ead Mon Sep 17 00:00:00 2001 From: Robert Scheck Date: Wed, 8 Feb 2012 00:51:24 +0100 Subject: [PATCH 12/12] Upgrade to 6.40.14 --- .gitignore | 2 +- sources | 2 +- zarafa.spec | 15 +++++---------- 3 files changed, 7 insertions(+), 12 deletions(-) diff --git a/.gitignore b/.gitignore index 63530ac..fa5ceb8 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -zcp-6.40.13.tar.gz +zcp-6.40.14.tar.gz diff --git a/sources b/sources index e6001bd..b66e54b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -659002020bac02e17503907cbe4b41b9 zcp-6.40.13.tar.gz +2a98ac28bf254757e467cbf35660dc20 zcp-6.40.14.tar.gz diff --git a/zarafa.spec b/zarafa.spec index c4c3c4d..f856cb1 100644 --- a/zarafa.spec +++ b/zarafa.spec @@ -1,6 +1,6 @@ %global beta_or_rc 0 %global actual_release 1 -%global svnrevision 30778 +%global svnrevision 31537 %global with_clucene 1 %global with_ldap 1 %global with_xmlto 1 @@ -18,7 +18,7 @@ Summary: Open Source Edition of the Zarafa Collaboration Platform Name: zarafa -Version: 6.40.13 +Version: 6.40.14 %if %{beta_or_rc} Release: 0.%{actual_release}.svn%{svnrevision}%{?dist} %else @@ -512,14 +512,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 > \ @@ -878,6 +870,9 @@ fi %endif %changelog +* Wed Feb 08 2012 Robert Scheck 6.40.14-1 +- Upgrade to 6.40.14 + * Sat Dec 17 2011 Robert Scheck 6.40.13-1 - Upgrade to 6.40.13