rpms/syck/devel syck-nan.patch,NONE,1.1 syck.spec,1.29,1.30

[Remi Collet]

Author: remi

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

Modified Files:
	syck.spec 
Added Files:
	syck-nan.patch 
Log Message:
PHP 5.3.0 build - Bug #511018

syck-nan.patch:

--- NEW FILE syck-nan.patch ---
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


Index: syck.spec
===================================================================
RCS file: /cvs/extras/rpms/syck/devel/syck.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -p -r1.29 -r1.30
--- syck.spec	26 Feb 2009 04:34:41 -0000	1.29
+++ syck.spec	14 Jul 2009 06:21:37 -0000	1.30
@@ -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/pysy
 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 <Fedora at FamilleCollet.com> - 0.61-8.3
+- rebuild for new PHP 5.3.0 ABI (20090626)
+- add syck-nan.patch
+
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.61-8.2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild