rpms/php-idn/devel idn-php53.patch,NONE,1.1 php-idn.spec,1.8,1.9

[Remi Collet]

Author: remi

Update of /cvs/extras/rpms/php-idn/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23021

Modified Files:
	php-idn.spec 
Added Files:
	idn-php53.patch 
Log Message:
add a php 5.3 patch (don't define function provided by php-intl)

idn-php53.patch:
 idn.c     |    4 ++++
 php_idn.h |    2 ++
 2 files changed, 6 insertions(+)

--- NEW FILE idn-php53.patch ---
diff -up idn-1.2b/idn.c.orig idn-1.2b/idn.c
--- idn-1.2b/idn.c.orig	2009-07-31 08:37:45.000000000 +0200
+++ idn-1.2b/idn.c	2009-07-31 08:41:15.000000000 +0200
@@ -104,8 +104,10 @@ function_entry idn_functions[] = {
 
 	PHP_FE(idn_punycode_encode,				NULL)
 	PHP_FE(idn_punycode_decode,				NULL)
+#if ZEND_MODULE_API_NO < 20090626
 	PHP_FE(idn_to_ascii,					NULL)
 	PHP_FE(idn_to_utf8,						NULL)
+#endif
 	PHP_FE(idn_to_unicode,					NULL)
 
 #ifdef HAVE_IDN_TLD
@@ -676,6 +678,7 @@ PHP_FUNCTION(idn_punycode_decode)
 /*     IDNA wrappers     */
 /* --------------------- */
 
+#if ZEND_MODULE_API_NO < 20090626
 /* {{{ proto string idn_to_ascii(string input [, string charset])
    Convert to ACE according to IDNA
  */
@@ -727,6 +730,7 @@ PHP_FUNCTION(idn_to_utf8)
 	efree(output);
 }
 /* }}} */
+#endif
 
 /* {{{ proto string idn_to_unicode(string input [, string charset])
    Convert from ACE according to IDNA
diff -up idn-1.2b/php_idn.h.orig idn-1.2b/php_idn.h
--- idn-1.2b/php_idn.h.orig	2009-07-31 08:37:40.000000000 +0200
+++ idn-1.2b/php_idn.h	2009-07-31 08:39:29.000000000 +0200
@@ -59,8 +59,10 @@ PHP_FUNCTION(idn_prep_iscsi);
 
 PHP_FUNCTION(idn_punycode_encode);
 PHP_FUNCTION(idn_punycode_decode);
+#if ZEND_MODULE_API_NO < 20090626
 PHP_FUNCTION(idn_to_ascii);
 PHP_FUNCTION(idn_to_utf8);
+#endif
 PHP_FUNCTION(idn_to_unicode);
 
 #ifdef HAVE_IDN_TLD


Index: php-idn.spec
===================================================================
RCS file: /cvs/extras/rpms/php-idn/devel/php-idn.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- php-idn.spec	26 Jul 2009 18:05:09 -0000	1.8
+++ php-idn.spec	31 Jul 2009 06:59:38 -0000	1.9
@@ -1,16 +1,25 @@
-%define default_apiver 20041225
+%global php_apiver	%((echo 0; php -i 2>/dev/null | sed -n 's/^PHP API => //p') | tail -1)
+%{!?php_extdir:		%{expand: %%global php_extdir %(php-config --extension-dir)}}
 
 Summary:	PHP API for GNU LibIDN
 Name:		php-idn
 Version:	1.2
-Release:	6%{?dist}
+Release:	7%{?dist}
 License:	GPLv2+
 Group:		Development/Languages
 Source0:	http://php-idn.bayour.com/idn_%{version}b.tar.gz
 Source1:	idn.ini
+
+Patch0:		idn-php53.patch
+
 URL:		http://php-idn.bayour.com/
 BuildRequires:	php-devel >= 4.3.0, libidn-devel >= 0.4.0, autoconf, automake, libtool
-Requires:	php-api = %((echo %{default_apiver}; php -i 2>/dev/null | sed -n 's/^PHP API => //p') | tail -1)
+%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
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %description
@@ -20,6 +29,9 @@ have international characters in the DNS
 
 %prep
 %setup -q -n idn-%{version}b
+
+%patch0 -p1 -b .php53
+
 export PHP_RPATH=no
 phpize
 %configure
@@ -38,10 +50,16 @@ rm -rf $RPM_BUILD_ROOT
 %files
 %defattr(-,root,root)
 %doc CHANGES CREDITS GPL README.documentation THANX_TO idn.php
-%{_libdir}/php/modules/idn.so
+%{php_extdir}/idn.so
 %config(noreplace) %{_sysconfdir}/php.d/idn.ini
 
 %changelog
+* Fri Jul 31 2009 Remi Collet <Fedora at FamilleCollet.com> 1.2-7
+- rebuild for new PHP 5.3.0 ABI (20090626)
+- better PHP ABI check
+- use php_extdir
+- patch for PHP 5.3.0 provided functions
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.2-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild