From a1a462dee3e8b83a4c288e5bbbb2b35a16d803c1 Mon Sep 17 00:00:00 2001 From: "Ralf S. Engelschall" Date: Wed, 18 Nov 2009 19:08:25 +0000 Subject: [PATCH] modifying package: json-20090929 20091115 -> 20091118 --- json/json.patch | 11 +++++++++++ json/json.spec | 8 +++++--- 2 files changed, 16 insertions(+), 3 deletions(-) create mode 100644 json/json.patch diff --git a/json/json.patch b/json/json.patch new file mode 100644 index 0000000000..bd019b0c6e --- /dev/null +++ b/json/json.patch @@ -0,0 +1,11 @@ +Index: zzjson-1.1.0/src/zzjson_parse.c +--- zzjson-1.1.0/src/zzjson_parse.c.orig 2009-08-16 02:49:38 +0200 ++++ zzjson-1.1.0/src/zzjson_parse.c 2009-11-18 19:49:55 +0100 +@@ -9,6 +9,7 @@ + #include + #include + ++#undef getchar + #define GETC() config->getchar(config->ihandle) + #define UNGETC(c) config->ungetchar(c, config->ihandle) + #define SKIPWS() skipws(config) diff --git a/json/json.spec b/json/json.spec index 12eb0cd458..fd60030320 100644 --- a/json/json.spec +++ b/json/json.spec @@ -23,8 +23,8 @@ # package version %define V_api_c 0.9 -%define V_api_c2 1.0.1 -%define V_api_c3 0.2 +%define V_api_c2 1.1.0 +%define V_api_c3 0.3 %define V_api_pl1 2.16 %define V_api_pl2 0.03 %define V_api_pl3 0.39 @@ -44,7 +44,7 @@ Class: PLUS Group: Language License: Open Source Version: %{V_api_js2} -Release: 20091115 +Release: 20091118 # list of sources Source0: http://oss.metaparadigm.com/json-c/json-c-%{V_api_c}.tar.gz @@ -58,6 +58,7 @@ Source7: http://www.cpan.org/authors/id/P/PE/PERLER/JavaScript-Dumper-%{V_a Source8: ftp://ftp.openpkg.org/sources/CPY/VERSIONED/json/json-%{V_api_js1}.js Source9: ftp://ftp.openpkg.org/sources/CPY/VERSIONED/json/json2-%{V_api_js2}.js Source10: http://www.ietf.org/rfc/rfc4627.txt +Patch0: json.patch # build information Prefix: %{l_prefix} @@ -140,6 +141,7 @@ AutoReqProv: no %setup -q -T -D -a 7 cp %{SOURCE json-%{V_api_js1}.js} json.js cp %{SOURCE json2-%{V_api_js2}.js} json2.js + %patch -p0 %build ( cd json-c-%{V_api_c}