[zarafa] Upgrade to 7.0.6
Robert Scheck
robert at fedoraproject.org
Sun Apr 22 03:47:42 UTC 2012
commit 2d71de1ca5f66062ee292afbe940ba5f60306e00
Author: Robert Scheck <robert at fedoraproject.org>
Date: Sun Apr 22 05:47:32 2012 +0200
Upgrade to 7.0.6
.gitignore | 2 +-
sources | 2 +-
zarafa-7.0.3-boost149.patch | 28 ---------
zarafa-7.0.4-php54.patch | 130 -------------------------------------------
zarafa.spec | 65 +++++++++++-----------
5 files changed, 35 insertions(+), 192 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 1f1e1f9..56f9780 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-zcp-7.0.4.tar.gz
+/zcp-?.?.?.tar.gz
diff --git a/sources b/sources
index a168457..6c03f3e 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-4c9774c7f07e8eaeb8fd62cc1dd7c0fd zcp-7.0.4.tar.gz
+9cd644262663cf2cce7bfc963cfbaef2 zcp-7.0.6.tar.gz
diff --git a/zarafa.spec b/zarafa.spec
index a4d36ab..a9518e8 100644
--- a/zarafa.spec
+++ b/zarafa.spec
@@ -1,6 +1,6 @@
%global beta_or_rc 0
-%global actual_release 2
-%global svnrevision 31235
+%global actual_release 1
+%global svnrevision 32752
%global with_clucene 1
%global with_ldap 1
%global with_xmlto 1
@@ -19,9 +19,9 @@
Summary: Open Source Edition of the Zarafa Collaboration Platform
Name: zarafa
-Version: 7.0.4
+Version: 7.0.6
%if %{beta_or_rc}
-Release: 0.%{actual_release}.svn%{svnrevision}%{?dist}.1
+Release: 0.%{actual_release}.svn%{svnrevision}%{?dist}
%else
Release: %{actual_release}%{?dist}
%endif
@@ -43,9 +43,7 @@ Source2: %{name}.logrotate
Source3: %{name}-webaccess.conf
Patch0: zarafa-6.40.5-rpath.patch
-Patch1: zarafa-7.0.3-boost149.patch
-Patch2: zarafa-7.0.4-php54.patch
-Patch3: zarafa-7.0.4-fd_setsize.patch
+Patch1: zarafa-7.0.4-fd_setsize.patch
BuildRequires: bison
BuildRequires: gcc-c++
@@ -71,9 +69,7 @@ BuildRequires: swig
%if 0
BuildRequires: %{_bindir}/xsubpp
%endif
-%if 0%{?rhel}%{?fedora} > 4
BuildRequires: python-devel >= 2.4
-%endif
%if %{with_clucene}
%if 0%{?fedora} > 15
@@ -112,8 +108,8 @@ Source Collaboration can combine the usability with the stability and the
flexibility of a Linux server.
The proven Zarafa groupware solution is using MAPI objects, provides a MAPI
-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
+client library as well as programming interfaces for C++, PHP and Python.
+The other Zarafa related packages need to be installed to gain all features
and benefits of the Zarafa Collaboration Platform (ZCP).
%package archiver
@@ -150,6 +146,17 @@ 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.
+%package contacts
+Summary: MAPI provider adding contact folders to the address book
+Group: System Environment/Libraries
+Requires: zarafa-common = %{version}-%{release}
+
+%description contacts
+The zarafa-contacts package contains an additional MAPI provider to find
+all contact folders of a user and add the contents transparently into the
+MAPI address book. The MAPI provider allows Zarafa WebApp users to select
+which contact folders will be listed in the WebApp address book.
+
%package dagent
Summary: Mail Delivery Agent for Zarafa Collaboration Platform
Group: System Environment/Daemons
@@ -336,15 +343,11 @@ Summary: The PHP MAPI extension by Zarafa
Group: Development/Languages
# Bug: Without mod_ssl, reloading httpd causes core dump
Requires: mod_ssl
-%if 0%{?rhel}%{?fedora} > 4
%if 0%{?php_zend_api:1}
Requires: php(zend-abi) = %{php_zend_api}, php(api) = %{php_core_api}
%else
Requires: php-api = %{php_apiver}
%endif
-%else
-Requires: php >= 4.3
-%endif
%description -n php-mapi
The php-mapi package contains the PHP MAPI extension to provide access to
@@ -354,7 +357,6 @@ in this extension. Using this PHP MAPI extension, developers can create
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
%package -n python-MAPI
Summary: The Python MAPI extension by Zarafa
Group: Development/Languages
@@ -364,16 +366,12 @@ The python-MAPI package contains the Python MAPI extension to provide the
access to Microsoft MAPI functions while using Python. Using this Python
MAPI extension, developers can create Python programs which use MAPI calls
to interact with Zarafa.
-%endif
%prep
%setup -q
%patch0 -p1 -b .rpath
touch -c -r aclocal.m4.rpath aclocal.m4
-%patch1 -p1 -b .boost149
-touch -c -r configure.ac.boost149 configure.ac
-%patch2 -p1 -b .php54
-%patch3 -p1 -b .fd_setsize
+%patch1 -p1 -b .fd_setsize
%build
%if 0%{?rhel}%{?fedora} < 6
@@ -404,11 +402,7 @@ export LDFLAGS="$RPM_LD_FLAGS -L%{_libdir}/clucene09"
--enable-epoll \
--enable-swig \
--disable-perl \
-%if 0%{?rhel}%{?fedora} > 4
--enable-python \
-%else
- --disable-python \
-%endif
--disable-static \
--disable-testtools
make %{?_smp_mflags}
@@ -427,7 +421,7 @@ make \
# Nuke all overlefts from licensed, managed or other proprietary items
rm -rf $RPM_BUILD_ROOT%{_sysconfdir}/{%{name}/{license,licensed.cfg,report-ca},cron.daily/%{name}-client-update}
-rm -f $RPM_BUILD_ROOT%{_mandir}/man?/{zarafa-{backup,restore,report,msr,ldapms.cfg,licensed{,.cfg}},za-aclsync}.*
+rm -f $RPM_BUILD_ROOT%{_mandir}/man?/{zarafa-{backup,restore,report,msr,msr-verify,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
@@ -679,6 +673,7 @@ fi
%files client -f %{name}.lang
%defattr(-,root,root,-)
+%config(noreplace) %{_sysconfdir}/mapi/%{name}.inf
%{_libdir}/libzarafaclient.so
%{_libdir}/libzarafasync.so.*
@@ -693,6 +688,11 @@ fi
%dir %attr(0755,%{name},%{name}) %{_localstatedir}/lib/%{name}/
%dir %attr(0755,%{name},%{name}) %{_localstatedir}/log/%{name}/
+%files contacts
+%defattr(-,root,root,-)
+%config(noreplace) %{_sysconfdir}/mapi/zcontacts.inf
+%{_libdir}/libzarafacontacts.so
+
%files dagent
%defattr(-,root,root,-)
%doc installer/linux/createuser.dotforward
@@ -851,6 +851,7 @@ fi
%files -n libmapi
%defattr(-,root,root,-)
+%dir %{_sysconfdir}/%{name}/
%{_libdir}/libarchiver.so.*
%{_libdir}/libicalmapi.so.*
%{_libdir}/libinetmapi.so.*
@@ -867,19 +868,19 @@ fi
%defattr(-,root,root,-)
%config(noreplace) %{_sysconfdir}/php.d/%{name}.ini
%{_datadir}/php/mapi/
-%if 0%{?rhel}%{?fedora} > 4
%{_libdir}/php/modules/mapi.so
-%else
-%{_libdir}/php4/mapi.so
-%endif
-%if 0%{?rhel}%{?fedora} > 4
%files -n python-MAPI
%defattr(-,root,root,-)
%{python_sitearch}/*
-%endif
%changelog
+* Sun Apr 22 2012 Robert Scheck <robert at fedoraproject.org> 7.0.6-1
+- Upgrade to 7.0.6
+
+* Sat Mar 10 2012 Robert Scheck <robert at fedoraproject.org> 7.0.5-1
+- Upgrade to 7.0.5
+
* Tue Feb 28 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 7.0.4-2
- Rebuilt for c++ ABI breakage
More information about the scm-commits
mailing list