summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemi Collet <fedora@famillecollet.com>2011-12-29 08:11:12 +0100
committerRemi Collet <fedora@famillecollet.com>2011-12-29 08:11:12 +0100
commit794ac435ce14af0e6d7fcbf7ef9e1efd152ecd16 (patch)
treeef3b6830039e66af0049160f586f59a79d2a034e
parent2ca5865e2ce27d7b3f4f300773109fa36d553c64 (diff)
zarafa with php 5.4
-rw-r--r--zarafa-7.0.3-php54.patch123
-rw-r--r--zarafa.spec14
2 files changed, 137 insertions, 0 deletions
diff --git a/zarafa-7.0.3-php54.patch b/zarafa-7.0.3-php54.patch
new file mode 100644
index 0000000..256c456
--- /dev/null
+++ b/zarafa-7.0.3-php54.patch
@@ -0,0 +1,123 @@
+diff -up zarafa-7.0.3/php-ext/ECImportContentsChangesProxy.cpp.php54 zarafa-7.0.3/php-ext/ECImportContentsChangesProxy.cpp
+--- zarafa-7.0.3/php-ext/ECImportContentsChangesProxy.cpp.php54 2011-12-29 07:57:08.047623136 +0100
++++ zarafa-7.0.3/php-ext/ECImportContentsChangesProxy.cpp 2011-12-29 07:58:57.717628057 +0100
+@@ -150,9 +150,9 @@ HRESULT ECImportContentsChangesProxy::Ge
+ 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 @@ exit:
+ 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 @@ exit:
+ }
+
+ 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 @@ exit:
+ 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 @@ exit:
+ 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);
+diff -up zarafa-7.0.3/php-ext/ECImportHierarchyChangesProxy.cpp.php54 zarafa-7.0.3/php-ext/ECImportHierarchyChangesProxy.cpp
+--- zarafa-7.0.3/php-ext/ECImportHierarchyChangesProxy.cpp.php54 2011-12-29 07:59:13.901628896 +0100
++++ zarafa-7.0.3/php-ext/ECImportHierarchyChangesProxy.cpp 2011-12-29 07:59:42.559630070 +0100
+@@ -147,9 +147,9 @@ HRESULT ECImportHierarchyChangesProxy::G
+ 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 @@ exit:
+ 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 @@ exit:
+ }
+
+ 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 @@ exit:
+ 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);
diff --git a/zarafa.spec b/zarafa.spec
index da829f6..7a40e53 100644
--- a/zarafa.spec
+++ b/zarafa.spec
@@ -42,6 +42,7 @@ Source2: %{name}.logrotate
Source3: %{name}-webaccess.conf
Patch0: zarafa-6.40.5-rpath.patch
+Patch1: zarafa-7.0.3-php54.patch
BuildRequires: bison
BuildRequires: gcc-c++
@@ -365,6 +366,7 @@ to interact with Zarafa.
%prep
%setup -q
%patch0 -p1 -b .rpath
+%patch1 -p1 -b .php54
touch -c -r aclocal.m4.rpath aclocal.m4
%build
@@ -523,6 +525,14 @@ rm -rf $RPM_BUILD_ROOT%{_datadir}/%{name}-webaccess/client/widgets/swfupload/
%find_lang %{name}
+%check
+# minimal load test for the PHP extension
+LD_LIBRARY_PATH=%{buildroot}%{_libdir} php -n \
+ -d extension_dir=%{buildroot}%{php_extdir} \
+ -d extension=mapi.so -m \
+ | grep mapi
+
+
%clean
rm -rf $RPM_BUILD_ROOT
@@ -870,6 +880,10 @@ fi
%endif
%changelog
+* Thu Dec 29 2011 Remi Collet <remi@fedoraproject.org> - 7.0.3-1
+- build with php 5.4
+- add minimal load test for PHP extension
+
* Sun Nov 20 2011 Robert Scheck <robert@fedoraproject.org> 7.0.3-1
- Upgrade to 7.0.3