[zarafa] Upgrade to 7.0.0
Robert Scheck
robert at fedoraproject.org
Mon Jun 27 13:06:53 UTC 2011
commit bd187d113adbfe596314c315d0c40eee3d570bdc
Author: Robert Scheck <robert at fedoraproject.org>
Date: Mon Jun 27 15:06:35 2011 +0200
Upgrade to 7.0.0
.gitignore | 2 +-
sources | 2 +-
zarafa-7.0.0-cpp_std.patch | 14 ++++
zarafa.spec | 160 +++++++-------------------------------------
4 files changed, 40 insertions(+), 138 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index f26cb86..57993fa 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-zcp-6.40.9.tar.gz
+zcp-7.0.0.tar.gz
diff --git a/sources b/sources
index feeb516..00d7b04 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-744a8c4b39da172717c1dd7ea7d03910 zcp-6.40.9.tar.gz
+bed709709c175858414aa8965b4aa20f zcp-7.0.0.tar.gz
diff --git a/zarafa-7.0.0-cpp_std.patch b/zarafa-7.0.0-cpp_std.patch
new file mode 100644
index 0000000..f4640d7
--- /dev/null
+++ b/zarafa-7.0.0-cpp_std.patch
@@ -0,0 +1,14 @@
+Patch by Robert Scheck <robert at fedoraproject.org> for zarafa >= 7.0.0, which solves the make failure
+"error: 'string' was not declared in this scope" on Fedora 16 (Rawhide) using GCC 4.6.0.
+
+--- zarafa-7.0.0/ECtools/zarafa-indexer/ECSearcherRequest.cpp 2011-06-10 03:37:37.000000000 +0200
++++ zarafa-7.0.0/ECtools/zarafa-indexer/ECSearcherRequest.cpp.cpp_std 2011-06-26 19:42:15.000000000 +0200
+@@ -153,7 +153,7 @@
+ }
+
+ while (!m_lpThreadData->bShutdown) {
+- string strLine;
++ std::string strLine;
+ command_t ulCommand;
+ std::vector<std::string> listArgs;
+ std::string strResponse;
diff --git a/zarafa.spec b/zarafa.spec
index dfab5f8..03a6303 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-<version>.svn<revision>.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
-# <version>-<release>.src.rpm vs. the installed
-# <version>-<release>.<arch>.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-<version>.svn<revision>.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 <your at email> - 6.40.0-0.1svn12345
-# - Improve packaging
-#
-# might, in a final release, become:
-#
-# * Some Time Zarafa Release Engineering <releng at zarafa.com> - 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 27791
%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: 7.0.0
%if %{beta_or_rc}
Release: 0.%{actual_release}.svn%{svnrevision}%{?dist}
%else
@@ -152,15 +33,16 @@ License: AGPLv3 with exceptions
Group: Applications/Productivity
URL: http://www.zarafa.com/
%if %{beta_or_rc}
-Source0: http://download.zarafa.com/community/beta/6.40/%{version}-%{svnrevision}/sourcecode/zcp-%{version}.tar.gz
+Source0: http://download.zarafa.com/community/beta/7.0/%{version}-%{svnrevision}/sourcecode/zcp-%{version}.tar.gz
%else
-Source0: http://download.zarafa.com/community/final/6.40/%{version}-%{svnrevision}/sourcecode/zcp-%{version}.tar.gz
+Source0: http://download.zarafa.com/community/final/7.0/%{version}-%{svnrevision}/sourcecode/zcp-%{version}.tar.gz
%endif
Source1: %{name}.ini
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++
@@ -168,7 +50,7 @@ BuildRequires: byacc
BuildRequires: flex
BuildRequires: gettext
BuildRequires: libical-devel >= 0.42
-BuildRequires: libvmime07-devel
+BuildRequires: libvmime-devel >= 0.9.0
BuildRequires: libxml2-devel
BuildRequires: mysql-devel >= 4.1
BuildRequires: ncurses-devel
@@ -176,6 +58,7 @@ BuildRequires: pam-devel
BuildRequires: php-devel >= 4.3
BuildRequires: %{_includedir}/uuid/uuid.h
BuildRequires: %{_includedir}/curl/curl.h
+BuildRequires: libicu-devel >= 3.4
%if 0%{?rhel}%{?fedora} > 5
BuildRequires: boost-devel >= 1.35.0
%else
@@ -335,7 +218,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
@@ -511,6 +394,7 @@ 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"
@@ -530,6 +414,7 @@ export LDFLAGS="$LDFLAGS -L%{_libdir}/boost141"
--with-clucene-lib-prefix= \
%endif
--enable-swig \
+ --disable-perl \
%if 0%{?rhel}%{?fedora} > 4
--enable-python \
%else
@@ -553,8 +438,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%{_bindir}/%{name}-msr
+rm -f $RPM_BUILD_ROOT%{_mandir}/man?/{zarafa-{backup,restore,report,msr,ldapms.cfg,licensed{,.cfg},archiver{,.cfg}},za-aclsync}.*
# Move all the initscripts to their appropriate place and
# ensure that all services are off by default at boot time
@@ -584,7 +468,6 @@ for config in $RPM_BUILD_ROOT%{_datadir}/doc/%{name}/example-config/*.cfg; do
done
# Move the logrotate configuration file to its correct place
-rm -f $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d/*
install -p -m 644 %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d/%{name}
# Move the userscripts to their correct place and symlink them
@@ -598,7 +481,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,zarafa7-upgrade} $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}/
@@ -607,6 +490,10 @@ rm -f $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/ldap.{active-directory,openldap,prop
rm -f $RPM_BUILD_ROOT%{_mandir}/man5/%{name}-ldap.cfg.5*
%endif
+# Install the script to optimize IMAP headers for new gateway
+mkdir -p $RPM_BUILD_ROOT%{_datadir}/%{name}-gateway/
+install -p -m 644 tools/python-scripts/optimize-imap.py $RPM_BUILD_ROOT%{_datadir}/%{name}-gateway/
+
# Create the default log and lib directory for packaging
mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/{log,lib}/%{name}/
@@ -614,10 +501,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}/
-
-# Remove unwanted/unused files that shouldn't exist anyway...
-rm -f $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/%{name}-indexer
+rm -rf $RPM_BUILD_ROOT%{_datadir}/doc/%{name}{,-gateway}/
# Move Indexer/CLucene related files to its correct places
%if %{with_clucene}
@@ -658,7 +542,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,}
@@ -854,6 +738,7 @@ fi
%{_bindir}/%{name}-gateway
%config(noreplace) %attr(0640,%{name},%{name}) %{_sysconfdir}/%{name}/gateway.cfg
%{_sysconfdir}/rc.d/init.d/%{name}-gateway
+%{_datadir}/%{name}-gateway/
%{_mandir}/man1/%{name}-gateway.1*
%{_mandir}/man5/%{name}-gateway.cfg.5*
@@ -956,15 +841,15 @@ fi
%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
+%{_datadir}/%{name}/zarafa7-upgrade
%{_mandir}/man1/%{name}-admin.1*
-%{_mandir}/man1/%{name}-cfgchecker.1*
%{_mandir}/man1/%{name}-fsck.1*
%{_mandir}/man1/%{name}-passwd.1*
%{_mandir}/man1/%{name}-stats.1*
@@ -1015,6 +900,9 @@ fi
%endif
%changelog
+* Mon Jun 27 2011 Robert Scheck <robert at fedoraproject.org> 7.0.0-1
+- Upgrade to 7.0.0
+
* Tue Jun 14 2011 Robert Scheck <robert at fedoraproject.org> 6.40.9-1
- Upgrade to 6.40.9
More information about the scm-commits
mailing list