rpms/zarafa
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge remote branch 'origin/master' into f15

Browse source
This commit is contained in:
Robert Scheck 2012-04-22 05:49:32 +02:00
commit c03b00aab2
5 changed files with 47 additions and 197 deletions
Download patch file Download diff file Expand all files Collapse all files

2
.gitignore vendored
View file

@ -1 +1 @@
zcp-7.0.4.tar.gz
/zcp-?.?.?.tar.gz

2
sources
View file

@ -1 +1 @@
4c9774c7f07e8eaeb8fd62cc1dd7c0fd zcp-7.0.4.tar.gz
9cd644262663cf2cce7bfc963cfbaef2 zcp-7.0.6.tar.gz

28
zarafa-7.0.3-boost149.patch
View file

@ -1,28 +0,0 @@
Patch by Robert Scheck <robert@fedoraproject.org> for zarafa >= 7.0.3, which allows
to compile Zarafa 7.0.3 using Boost 1.49. This is neccessary, because Zarafa uses
Boost filesystem version 2 while it got deprecated with Boost 1.48. However, Boost
1.49 is still shipping filesystem version 2. For the time being, this allows us to
compile Zarafa still with newer Boost versions.
--- zarafa-7.0.3/configure 2011-12-17 14:47:32.000000000 +0100
+++ zarafa-7.0.3/configure.boost149 2011-12-17 14:48:34.000000000 +0100
@@ -30975,7 +30975,7 @@
{ echo "$as_me:$LINENO: checking boost version compatibility" >&5
echo $ECHO_N "checking boost version compatibility... $ECHO_C" >&6; }
if test -n "$boost_major_version" -a $boost_major_version -ge 146; then
- if test $boost_major_version -ge 148; then
+ if test $boost_major_version -ge 149; then
{ { echo "$as_me:$LINENO: error: boost version is too new" >&5
echo "$as_me: error: boost version is too new" >&2;}
{ (exit 1); exit 1; }; }
--- zarafa-7.0.3/configure.ac 2011-11-16 23:00:21.000000000 +0100
+++ zarafa-7.0.3/configure.ac.boost149 2011-12-17 14:48:20.000000000 +0100
@@ -657,7 +657,7 @@
BOOST_DATE_TIME([mt])
AC_MSG_CHECKING([boost version compatibility])
if test -n "$boost_major_version" -a $boost_major_version -ge 146; then
- if test $boost_major_version -ge 148; then
+ if test $boost_major_version -ge 149; then
AC_MSG_ERROR([boost version is too new])
fi
AC_MSG_RESULT([adding backward compatible flags])

130
zarafa-7.0.4-php54.patch
View file

@ -1,130 +0,0 @@
Patch by Robert Scheck <robert@fedoraproject.org> for Zarafa >= 7.0.4, which fixes building of the PHP
extension of Zarafa with PHP >= 5.4.0. It is heavily based on the work of Remi Collet. Fedora 17+ will
ship PHP >= 5.4.0, so the changes are here mandatory. According to /usr/include/php/main/php3_compat.h
the "typedef zval pval;" definition exists for ages and I wasn't able to figure out any build issue in
Red Hat Enterprise Linux 5 (as oldest supported version of Zarafa 7.0.x) during my tests. References:
- https://github.com/remicollet/remirepo/blob/1e741d6002a34add940c15711cf061c35d4c9e91/zarafa/zarafa-7.0.3-php54.patch
- http://forums.zarafa.com/viewtopic.php?f=22&t=7826
--- zarafa-7.0.4/php-ext/ECImportContentsChangesProxy.cpp 2011-12-22 01:02:33.000000000 +0100
+++ zarafa-7.0.4/php-ext/ECImportContentsChangesProxy.cpp.php54 2012-01-08 23:58:33.000000000 +0100
@@ -150,9 +150,9 @@
HRESULT ECImportContentsChangesProxy::Config(LPSTREAM lpStream, ULONG ulFlags) {
HRESULT hr = hrSuccess;
- pval *pvalFuncName;
- pval *pvalReturn;
- pval *pvalArgs[2];
+ zval *pvalFuncName;
+ zval *pvalReturn;
+ zval *pvalArgs[2];
MAKE_STD_ZVAL(pvalFuncName);
MAKE_STD_ZVAL(pvalReturn);
@@ -192,9 +192,9 @@
HRESULT ECImportContentsChangesProxy::UpdateState(LPSTREAM lpStream) {
HRESULT hr = hrSuccess;
- pval *pvalFuncName;
- pval *pvalReturn;
- pval *pvalArgs[1];
+ zval *pvalFuncName;
+ zval *pvalReturn;
+ zval *pvalArgs[1];
MAKE_STD_ZVAL(pvalFuncName);
MAKE_STD_ZVAL(pvalReturn);
@@ -228,9 +228,9 @@
}
HRESULT ECImportContentsChangesProxy::ImportMessageChange(ULONG cValues, LPSPropValue lpPropArray, ULONG ulFlags, LPMESSAGE * lppMessage) {
- pval *pvalFuncName;
- pval *pvalReturn;
- pval *pvalArgs[3];
+ zval *pvalFuncName;
+ zval *pvalReturn;
+ zval *pvalArgs[3];
IMessage *lpMessage = NULL;
HRESULT hr = hrSuccess;
@@ -287,9 +287,9 @@
HRESULT ECImportContentsChangesProxy::ImportMessageDeletion(ULONG ulFlags, LPENTRYLIST lpSourceEntryList) {
HRESULT hr = hrSuccess;
- pval *pvalFuncName;
- pval *pvalReturn;
- pval *pvalArgs[2];
+ zval *pvalFuncName;
+ zval *pvalReturn;
+ zval *pvalArgs[2];
MAKE_STD_ZVAL(pvalFuncName);
MAKE_STD_ZVAL(pvalReturn);
@@ -323,9 +323,9 @@
HRESULT ECImportContentsChangesProxy::ImportPerUserReadStateChange(ULONG cElements, LPREADSTATE lpReadState) {
HRESULT hr = hrSuccess;
- pval *pvalFuncName;
- pval *pvalReturn;
- pval *pvalArgs[1];
+ zval *pvalFuncName;
+ zval *pvalReturn;
+ zval *pvalArgs[1];
MAKE_STD_ZVAL(pvalFuncName);
MAKE_STD_ZVAL(pvalReturn);
--- zarafa-7.0.4/php-ext/ECImportHierarchyChangesProxy.cpp 2011-12-22 01:02:33.000000000 +0100
+++ zarafa-7.0.4/php-ext/ECImportHierarchyChangesProxy.cpp.php54 2012-01-08 23:58:33.000000000 +0100
@@ -147,9 +147,9 @@
HRESULT ECImportHierarchyChangesProxy::Config(LPSTREAM lpStream, ULONG ulFlags) {
HRESULT hr = hrSuccess;
- pval *pvalFuncName;
- pval *pvalReturn;
- pval *pvalArgs[2];
+ zval *pvalFuncName;
+ zval *pvalReturn;
+ zval *pvalArgs[2];
MAKE_STD_ZVAL(pvalFuncName);
MAKE_STD_ZVAL(pvalReturn);
@@ -189,9 +189,9 @@
HRESULT ECImportHierarchyChangesProxy::UpdateState(LPSTREAM lpStream) {
HRESULT hr = hrSuccess;
- pval *pvalFuncName;
- pval *pvalReturn;
- pval *pvalArgs[1];
+ zval *pvalFuncName;
+ zval *pvalReturn;
+ zval *pvalArgs[1];
MAKE_STD_ZVAL(pvalFuncName);
MAKE_STD_ZVAL(pvalReturn);
@@ -225,9 +225,9 @@
}
HRESULT ECImportHierarchyChangesProxy::ImportFolderChange(ULONG cValues, LPSPropValue lpPropArray) {
- pval *pvalFuncName;
- pval *pvalReturn;
- pval *pvalArgs[1];
+ zval *pvalFuncName;
+ zval *pvalReturn;
+ zval *pvalArgs[1];
HRESULT hr = hrSuccess;
MAKE_STD_ZVAL(pvalFuncName);
@@ -265,9 +265,9 @@
HRESULT ECImportHierarchyChangesProxy::ImportFolderDeletion(ULONG ulFlags, LPENTRYLIST lpSourceEntryList) {
HRESULT hr = hrSuccess;
- pval *pvalFuncName;
- pval *pvalReturn;
- pval *pvalArgs[2];
+ zval *pvalFuncName;
+ zval *pvalReturn;
+ zval *pvalArgs[2];
MAKE_STD_ZVAL(pvalFuncName);
MAKE_STD_ZVAL(pvalReturn);

82
zarafa.spec
View file

@ -1,6 +1,6 @@
%global beta_or_rc 0
%global actual_release 1
%global svnrevision 31235
%global svnrevision 32752
%global with_clucene 1
%global with_ldap 1
%global with_xmlto 1
@ -9,17 +9,17 @@
%global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")
# Private libraries are not be exposed globally by RPM
%if 0%{?rhel}%{?fedora} > 4
%{?filter_setup:
%filter_provides_in %{_libdir}/%{name}/.*\.so$
%filter_provides_in %{_libdir}/php/modules/.*\.so$
%filter_setup
}
%endif
# RPM 4.8
%{?filter_provides_in: %filter_provides_in %{_libdir}/%{name}/modules/.*\.so$}
%{?filter_provides_in: %filter_provides_in %{_libdir}/php/modules/.*\.so$}
%{?filter_setup}
# RPM 4.9
%global __provides_exclude_from %{?__provides_exclude_from:%__provides_exclude_from|}%{_libdir}/%{name}/modules/.*\\.so$
%global __provides_exclude_from %{__provides_exclude_from}|%{_libdir}/php/modules/.*\\.so$
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
%else
@ -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,26 @@ 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@fedoraproject.org> 7.0.6-1
- Upgrade to 7.0.6
* Sat Mar 10 2012 Robert Scheck <robert@fedoraproject.org> 7.0.5-1
- Upgrade to 7.0.5
* Tue Feb 28 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 7.0.4-2
- Rebuilt for c++ ABI breakage
* Thu Jan 19 2012 Remi Collet <remi@fedoraproject.org> - 7.0.4-2
- build against php 5.4.0
- fix so filters
* Fri Jan 13 2012 Robert Scheck <robert@fedoraproject.org> 7.0.4-1
- Upgrade to 7.0.4
- Added patch for rebuilding with PHP 5.4 (thanks to Remi Collet)