# HG changeset patch # User Michael Schloh von Bennewitz # Date 1346172610 -7200 # Node ID f65313225f8aea8a5c0f581f9db74309b93e2bf6 # Parent 488716b6db759bf250e22f1dabacc566a9daba38 Resynchronize with upstream maintainer version as it seems to work fine again. diff -r 488716b6db75 -r f65313225f8a yaml/yaml.patch --- a/yaml/yaml.patch Wed Feb 08 20:14:10 2012 +0200 +++ b/yaml/yaml.patch Tue Aug 28 18:50:10 2012 +0200 @@ -1,6 +1,6 @@ Index: YAML-AppConfig-0.16/Makefile.PL ---- YAML-AppConfig-0.16/Makefile.PL.orig 2006-07-02 23:21:51 +0200 -+++ YAML-AppConfig-0.16/Makefile.PL 2009-11-27 13:24:07 +0100 +--- YAML-AppConfig-0.16/Makefile.PL.orig 2006-07-02 23:21:51.000000000 +0200 ++++ YAML-AppConfig-0.16/Makefile.PL 2012-07-31 16:07:20.000000000 +0200 @@ -21,6 +21,7 @@ eval "require $info->[0]; 0;"; push @yamls, @$info unless $@; @@ -11,9 +11,9 @@ } + Index: syck-0.70/lib/bytecode.c ---- syck-0.70/lib/bytecode.c.orig 2009-09-30 19:29:34 +0200 -+++ syck-0.70/lib/bytecode.c 2009-11-27 13:24:07 +0100 -@@ -7,6 +7,10 @@ +--- syck-0.70/lib/bytecode.c.orig 2009-09-30 19:29:34.000000000 +0200 ++++ syck-0.70/lib/bytecode.c 2012-07-31 16:10:17.000000000 +0200 +@@ -7,11 +7,16 @@ * * Copyright (C) 2003 why the lucky stiff */ @@ -24,9 +24,36 @@ #include "syck.h" #if GRAM_FILES_HAVE_TAB_SUFFIX + #include "gram.tab.h" + #else ++#define YYPARSE_PARAM + #include "gram.h" + #endif + +Index: syck-0.70/lib/gram.y +--- syck-0.70/lib/gram.y.orig 2009-09-30 19:29:34.000000000 +0200 ++++ syck-0.70/lib/gram.y 2012-07-31 16:09:51.000000000 +0200 +@@ -19,14 +19,14 @@ + #define YYSTACK_USE_ALLOCA 0 + #endif + ++#define YYPARSE_PARAM parser ++#define YYLEX_PARAM parser ++ + #include "syck.h" + #include "sycklex.h" + + void apply_seq_in_map( SyckParser *parser, SyckNode *n ); + +-#define YYPARSE_PARAM parser +-#define YYLEX_PARAM parser +- + #define NULL_NODE(parser, node) \ + SyckNode *node = syck_new_str( "", scalar_plain ); \ + if ( ((SyckParser *)parser)->taguri_expansion == 1 ) \ Index: syck-0.70/lib/handler.c ---- syck-0.70/lib/handler.c.orig 2009-09-30 19:29:34 +0200 -+++ syck-0.70/lib/handler.c 2009-11-27 13:24:07 +0100 +--- syck-0.70/lib/handler.c.orig 2009-09-30 19:29:34.000000000 +0200 ++++ syck-0.70/lib/handler.c 2012-07-31 16:07:20.000000000 +0200 @@ -7,6 +7,9 @@ * Copyright (C) 2003 why the lucky stiff */ @@ -38,8 +65,8 @@ SYMID Index: syck-0.70/lib/implicit.c ---- syck-0.70/lib/implicit.c.orig 2009-09-30 19:29:34 +0200 -+++ syck-0.70/lib/implicit.c 2009-11-27 13:24:07 +0100 +--- syck-0.70/lib/implicit.c.orig 2009-09-30 19:29:34.000000000 +0200 ++++ syck-0.70/lib/implicit.c 2012-07-31 16:07:20.000000000 +0200 @@ -8,6 +8,7 @@ * Copyright (C) 2003 why the lucky stiff */ @@ -49,8 +76,8 @@ #define YYCTYPE char Index: syck-0.70/lib/node.c ---- syck-0.70/lib/node.c.orig 2009-09-30 19:29:34 +0200 -+++ syck-0.70/lib/node.c 2009-11-27 13:24:07 +0100 +--- syck-0.70/lib/node.c.orig 2009-09-30 19:29:34.000000000 +0200 ++++ syck-0.70/lib/node.c 2012-07-31 16:07:20.000000000 +0200 @@ -7,6 +7,9 @@ * Copyright (C) 2003 why the lucky stiff */ @@ -62,8 +89,8 @@ /* Index: syck-0.70/lib/syck.c ---- syck-0.70/lib/syck.c.orig 2009-09-30 19:29:34 +0200 -+++ syck-0.70/lib/syck.c 2009-11-27 13:24:07 +0100 +--- syck-0.70/lib/syck.c.orig 2009-09-30 19:29:34.000000000 +0200 ++++ syck-0.70/lib/syck.c 2012-07-31 16:07:20.000000000 +0200 @@ -7,6 +7,7 @@ * Copyright (C) 2003 why the lucky stiff */ @@ -89,8 +116,8 @@ { str->ptr = str->end; Index: syck-0.70/lib/syck.h ---- syck-0.70/lib/syck.h.orig 2009-09-30 19:29:34 +0200 -+++ syck-0.70/lib/syck.h 2009-11-27 13:24:07 +0100 +--- syck-0.70/lib/syck.h.orig 2009-09-30 19:29:34.000000000 +0200 ++++ syck-0.70/lib/syck.h 2012-07-31 16:07:20.000000000 +0200 @@ -36,6 +36,8 @@ #include @@ -101,9 +128,9 @@ #ifdef HAVE_ST_H #include Index: syck-0.70/lib/token.c ---- syck-0.70/lib/token.c.orig 2009-09-30 19:29:34 +0200 -+++ syck-0.70/lib/token.c 2009-11-27 13:24:07 +0100 -@@ -7,6 +7,8 @@ +--- syck-0.70/lib/token.c.orig 2009-09-30 19:29:34.000000000 +0200 ++++ syck-0.70/lib/token.c 2012-07-31 16:10:37.000000000 +0200 +@@ -7,11 +7,14 @@ * * Copyright (C) 2003 why the lucky stiff */ @@ -112,9 +139,15 @@ #include "syck.h" #if GRAM_FILES_HAVE_TAB_SUFFIX + #include "gram.tab.h" + #else ++#define YYPARSE_PARAM + #include "gram.h" + #endif + Index: syck-0.70/lib/yaml2byte.c ---- syck-0.70/lib/yaml2byte.c.orig 2009-09-30 19:29:34 +0200 -+++ syck-0.70/lib/yaml2byte.c 2009-11-27 13:24:31 +0100 +--- syck-0.70/lib/yaml2byte.c.orig 2009-09-30 19:29:34.000000000 +0200 ++++ syck-0.70/lib/yaml2byte.c 2012-07-31 16:07:20.000000000 +0200 @@ -11,6 +11,8 @@ */ #include "syck.h" diff -r 488716b6db75 -r f65313225f8a yaml/yaml.spec --- a/yaml/yaml.spec Wed Feb 08 20:14:10 2012 +0200 +++ b/yaml/yaml.spec Tue Aug 28 18:50:10 2012 +0200 @@ -1,6 +1,6 @@ ## ## yaml.spec -- OpenPKG RPM Package Specification -## Copyright (c) 2000-2011 OpenPKG Foundation e.V. +## Copyright (c) 2000-2012 OpenPKG Foundation e.V. ## ## Permission to use, copy, modify, and distribute this software for ## any purpose with or without fee is hereby granted, provided that @@ -24,9 +24,9 @@ # package version %define V_libsyck 0.70 %define V_libyaml 0.1.4 -%define V_perl_yaml 0.80 -%define V_perl_yaml_syck 1.19 -%define V_perl_yaml_tiny 1.50 +%define V_perl_yaml 0.84 +%define V_perl_yaml_syck 1.20 +%define V_perl_yaml_tiny 1.51 %define V_perl_yaml_appconfig 0.16 %define V_perl_yaml_libyaml 0.38 %define V_perl_yaml_active 1.100810 @@ -37,7 +37,8 @@ %define V_java_jvyaml 0.2.1 %define V_java_jyaml 1.3 %define V_php_syck 0.9.3 -%define V_php_yaml 1.0.1 +%define V_php_yaml 1.1.0RC2 +%define V_php_spyc 0.4.5 # package information Name: yaml @@ -50,7 +51,7 @@ Group: Language License: BSD/Artistic Version: 0 -Release: 20120208 +Release: 20120731 # package options %option with_perl no @@ -74,15 +75,14 @@ Source12: http://www.cpan.org/authors/id/E/EI/EIDOLON/YAML-Object-%{V_perl_yaml_object}.tar.gz Source13: http://pecl.php.net/get/syck-%{V_php_syck}.tgz Source14: http://pecl.php.net/get/yaml-%{V_php_yaml}.tgz -Source15: http://yaml.org/spec/history/%{V_yaml_spec}/%{V_yaml_spec}.pdf -Source16: yaml.yml +Source15: http://spyc.googlecode.com/files/spyc-%{V_php_spyc}.zip +Source16: http://yaml.org/spec/history/%{V_yaml_spec}/%{V_yaml_spec}.pdf +Source17: yaml.yml Patch0: yaml.patch # build information -Prefix: %{l_prefix} -BuildRoot: %{l_buildroot} -BuildPreReq: OpenPKG, openpkg >= 20060823, make, bison -PreReq: OpenPKG, openpkg >= 20060823 +BuildPreReq: OpenPKG, openpkg >= 20100101, make, bison +PreReq: OpenPKG, openpkg >= 20100101 %if "%{with_perl}" == "yes" BuildPreReq: perl, perl-openpkg, perl-module PreReq: perl @@ -99,8 +99,6 @@ BuildPreReq: java, JAVA-JDK, ant PreReq: java, JAVA-JDK %endif -AutoReq: no -AutoReqProv: no %description YAML Ain't Markup Language (YAML) is an international collaboration @@ -193,6 +191,11 @@ url = http://pecl.php.net/package/yaml regex = yaml-(__VER__)\.tgz } + prog yaml:PHP-spyc = { + version = %{V_php_spyc} + url = http://spyc.googlecode.com/files/ + regex = spyc-(__VER__)\.zip + } %prep %setup -q -c @@ -210,6 +213,7 @@ %setup -q -T -D -a 12 %setup -q -T -D -a 13 %setup -q -T -D -a 14 + %setup -q -T -D -a 15 %patch -p0 %build @@ -228,8 +232,7 @@ CC="%{l_cc}" \ CFLAGS="%{l_cflags -O}" \ ./configure \ - --prefix=%{l_prefix} \ - --disable-shared + --prefix=%{l_prefix} %{l_make} %{l_mflags} ) || exit $? @@ -289,8 +292,6 @@ %endif %install - # clean build cruft - rm -rf $RPM_BUILD_ROOT # install YAML C API ( cd yaml-%{V_libyaml} @@ -310,6 +311,12 @@ ( cd yaml-%{V_php_yaml} %{l_make} %{l_mflags} install INSTALL_ROOT=$RPM_BUILD_ROOT ) || exit $? + ( cd spyc-%{V_php_spyc} + %{l_shtool} mkdir -f -p -m 755 \ + $RPM_BUILD_ROOT%{l_prefix}/share/yaml + %{l_shtool} install -c -m 644 \ + spyc.php $RPM_BUILD_ROOT%{l_prefix}/share/yaml/ + ) || exit $? %endif # install Ruby API @@ -368,5 +375,4 @@ %files -f files %clean - rm -rf $RPM_BUILD_ROOT