diff --git a/syck-nan.patch b/syck-nan.patch new file mode 100644 index 0000000..c27dce8 --- /dev/null +++ b/syck-nan.patch @@ -0,0 +1,22 @@ +diff -up ext/php/phpext.c.php53 ext/php/phpext.c +--- ext/php/phpext.c.php53 2009-07-14 08:03:44.000000000 +0200 ++++ ext/php/phpext.c 2009-07-14 08:08:36.000000000 +0200 +@@ -21,7 +21,7 @@ + static double zero() { return 0.0; } + static double one() { return 1.0; } + static double inf() { return one() / zero(); } +-static double nan() { return zero() / zero(); } ++static double mynan() { return zero() / zero(); } + + /* {{{ syck_functions[] + * +@@ -220,7 +220,7 @@ php_syck_handler(p, n) + } + else if ( strcmp( n->type_id, "float#nan" ) == 0 ) + { +- ZVAL_DOUBLE( o, nan() ); ++ ZVAL_DOUBLE( o, mynan() ); + } + else if ( strcmp( n->type_id, "float#inf" ) == 0 ) + { +diff -up ext/php/php_syck.h.php53 ext/php/php_syck.h diff --git a/syck.spec b/syck.spec index f6a94bb..9ddc86e 100644 --- a/syck.spec +++ b/syck.spec @@ -6,7 +6,7 @@ Name: syck Summary: YAML for C, Python, and PHP Version: 0.61 -Release: 8.2%{?dist} +Release: 8.3%{?dist} License: BSD Group: System Environment/Libraries @@ -16,6 +16,7 @@ Source0: http://pyyaml.org/download/pysyck/syck-%{version}+svn231+patches.tar.gz Source1: syck.ini Patch0: syck-0.55-libtool.patch +Patch1: syck-nan.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: gawk bison flex libtool @@ -108,6 +109,7 @@ Syck. %prep %setup -q -n syck-0.61+svn231+patches %patch0 -p1 +%patch1 -p0 %build libtoolize --force --copy && aclocal && automake --add-missing && autoconf @@ -192,6 +194,10 @@ rm -rf $RPM_BUILD_ROOT %config(noreplace) %{_sysconfdir}/php.d/syck.ini %changelog +* Tue Jul 14 2009 Remi Collet - 0.61-8.3 +- rebuild for new PHP 5.3.0 ABI (20090626) +- add syck-nan.patch + * Wed Feb 25 2009 Fedora Release Engineering - 0.61-8.2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild