rpms/ice/devel ice-php53.patch,NONE,1.1 ice.spec,1.31,1.32

[Remi Collet]

Author: remi

Update of /cvs/extras/rpms/ice/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7267

Modified Files:
	ice.spec 
Added Files:
	ice-php53.patch 
Log Message:
PHP 5.3.0 build

ice-php53.patch:

--- NEW FILE ice-php53.patch ---
diff -up Ice-3.3.1/php/src/IcePHP/Marshal.cpp.php53 Ice-3.3.1/php/src/IcePHP/Marshal.cpp
--- Ice-3.3.1/php/src/IcePHP/Marshal.cpp.php53	2009-07-13 16:25:34.000000000 +0200
+++ Ice-3.3.1/php/src/IcePHP/Marshal.cpp	2009-07-13 16:26:58.000000000 +0200
@@ -1929,7 +1929,7 @@ IcePHP::ObjectReader::ObjectReader(zval*
     this->TSRMLS_C = TSRMLS_C;
 #endif
 
-    ZVAL_ADDREF(_value);
+    Z_ADDREF_P(_value);
 
     _class = Z_OBJCE_P(_value);
 }


Index: ice.spec
===================================================================
RCS file: /cvs/extras/rpms/ice/devel/ice.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -p -r1.31 -r1.32
--- ice.spec	8 Jul 2009 09:24:48 -0000	1.31
+++ ice.spec	13 Jul 2009 14:45:21 -0000	1.32
@@ -2,9 +2,12 @@
 %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 %{!?ruby_sitearch: %define ruby_sitearch %(ruby -rrbconfig -e 'puts Config::CONFIG["sitearchdir"]')}
 
+%define php_extdir %(php-config --extension-dir 2>/dev/null || echo %{_libdir}/php4)
+%global php_apiver %((echo 0; php -i 2>/dev/null | sed -n 's/^PHP API => //p') | tail -1)
+
 Name: ice
 Version: 3.3.1
-Release: 2%{?dist}
+Release: 3%{?dist}
 Summary: The Ice base runtime and services
 
 Group: System Environment/Libraries
@@ -31,6 +34,8 @@ Patch4:         slice.patch.txt
 # http://www.zeroc.com/forums/patches/4423-patch-3-ice-3-3-1-net-only-fix-random-endpoint-selection.html
 Patch5:         patch-rand.txt
 
+Patch6:         ice-php53.patch
+
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 # Ice doesn't officially support ppc64 at all
@@ -161,7 +166,14 @@ Tools for developing Ice applications in
 %package php
 Summary: The Ice runtime for PHP applications
 Group: System Environment/Libraries
-Requires: ice = %{version}-%{release}, php >= 5.1.4
+Requires: ice = %{version}-%{release}
+%if %{?php_zend_api}0
+Requires:	php(zend-abi) = %{php_zend_api}
+Requires:	php(api) = %{php_core_api}
+%else
+Requires:	php-api = %{php_apiver}
+%endif
+
 %description php
 The Ice runtime for PHP applications.
 
@@ -173,6 +185,7 @@ The Ice runtime for PHP applications.
 %patch3 -p1
 %patch4 -p1
 %patch5 -p1
+%patch6 -p1
 %setup -q -n Ice-rpmbuild-%{version} -T -b 1
 %setup -q -n Ice-3.3.0-man-pages -T -b 2
 
@@ -284,8 +297,8 @@ done
 # Put the PHP stuff into the right place
 mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/php.d
 mv $RPM_BUILD_ROOT/ice.ini $RPM_BUILD_ROOT%{_sysconfdir}/php.d
-mkdir -p ${RPM_BUILD_ROOT}%{_libdir}/php/modules
-mv ${RPM_BUILD_ROOT}%{_libdir}/IcePHP.so ${RPM_BUILD_ROOT}%{_libdir}/php/modules
+mkdir -p ${RPM_BUILD_ROOT}%{php_extdir}
+mv ${RPM_BUILD_ROOT}%{_libdir}/IcePHP.so ${RPM_BUILD_ROOT}%{php_extdir}
 
 # Also Ruby and Python -- remove all shebang lines while we're at it
 for f in $RPM_BUILD_ROOT/python/Ice.py $RPM_BUILD_ROOT/ruby/*.rb;
@@ -530,10 +543,15 @@ fi
 
 %files php
 %defattr(-,root,root,-)
-%{_libdir}/php/modules/IcePHP.so
+%{php_extdir}/IcePHP.so
 %config(noreplace) %{_sysconfdir}/php.d/ice.ini
 
 %changelog
+* Mon Jul 13 2009 Remi Collet <Fedora at FamilleCollet.com> - 3.3.1-3
+- rebuild for new PHP 5.3.0 ABI (20090626) + ice-php53.patch
+- add PHP ABI check
+- use php_extdir
+
 * Wed Jul  8 2009 Mary Ellen Foster <mefoster at gmail.com> - 3.3.1-2
 - Include upstream patches:
   - slice2html creates bad links