[zarafa/el4] Upgrade to 6.40.10 (#725250, #725909)
Robert Scheck
robert at fedoraproject.org
Fri Jul 29 14:08:32 UTC 2011
commit c320af84aaf2e4c69e759b1d7d18467109d7428b
Author: Robert Scheck <robert at fedoraproject.org>
Date: Fri Jul 29 16:08:15 2011 +0200
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-<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 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 <robert at fedoraproject.org> 6.40.10-1
+- Upgrade to 6.40.10 (#725250, #725909)
+
* 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