diff --git a/json_reformat.1 b/json_reformat.1 new file mode 100644 index 0000000..13474ce --- /dev/null +++ b/json_reformat.1 @@ -0,0 +1,22 @@ +.TH json_reformat 1 +.SH NAME +json_reformat \- Reformat json from stdin +.SH SYNOPSIS +.B json_reformat +[ +.I OPTION +] +.SH "DESCRIPTION" +A sample program to demonstrate the use of yajl. json_reformat reformats json from stdin. +.SH OPTIONS +.TP +.B \-m +minimize json rather than beautify (default) +.TP +.B \-u +allow invalid UTF8 inside strings during parsing +.BR +.SH AUTHORS + Lloyd Hilaiel + + diff --git a/json_verify.1 b/json_verify.1 new file mode 100644 index 0000000..66ad135 --- /dev/null +++ b/json_verify.1 @@ -0,0 +1,25 @@ +.TH json_verify 1 +.SH NAME +json_verify \- Validate json from stdin +.SH SYNOPSIS +.B json_verify +[ +.I OPTION +] +.SH "DESCRIPTION" +A sample program to demonstrate the use of yajl. json_verify validates json from stdin. +.SH OPTIONS +.TP +.B \-q +quiet mode +.TP +.B \-c +allow comments +.TP +.B \-u +allow invalid utf8 inside strings +.BR +.SH AUTHORS + Lloyd Hilaiel + + diff --git a/libyajl-optflags.patch b/libyajl-optflags.patch index 130e7bd..df7a393 100644 --- a/libyajl-optflags.patch +++ b/libyajl-optflags.patch @@ -1,7 +1,9 @@ ---- CMakeLists.txt.orig 2010-12-01 22:29:50.000000000 +0100 -+++ CMakeLists.txt 2010-12-01 22:30:29.000000000 +0100 -@@ -70,7 +70,7 @@ - "${CMAKE_C_FLAGS} -fPIC -std=c99 -pedantic -Wpointer-arith -Wno-format-y2k -Wstrict-prototypes -Wmissing-declarations -Wnested-externs -Wextra -Wundef -Wwrite-strings -Wold-style-definition -Wredundant-decls -Wno-unused-parameter -Wno-sign-compare -Wmissing-prototypes") +Index: CMakeLists.txt +=================================================================== +--- CMakeLists.txt.orig ++++ CMakeLists.txt +@@ -59,7 +59,7 @@ ELSE (WIN32) + "${CMAKE_C_FLAGS} -std=c99 -pedantic -Wpointer-arith -Wno-format-y2k -Wstrict-prototypes -Wmissing-declarations -Wnested-externs -Wextra -Wundef -Wwrite-strings -Wold-style-definition -Wredundant-decls -Wno-unused-parameter -Wno-sign-compare -Wmissing-prototypes") SET(CMAKE_C_FLAGS_DEBUG "-DDEBUG -g") - SET(CMAKE_C_FLAGS_RELEASE "-DNDEBUG -O2 -Wuninitialized") diff --git a/libyajl.changes b/libyajl.changes index 30b9c87..7eeeff5 100644 --- a/libyajl.changes +++ b/libyajl.changes @@ -1,3 +1,62 @@ +------------------------------------------------------------------- +Fri Aug 12 11:09:08 UTC 2011 - mrueckert@suse.de + +- update to 2.0.1 + - lth generator flag to allow client to specify they want escaped + solidi '/'. issue #28 + - lth crash fix when yajl_parse() is never called. issue #27 +- additional changes from 2.0.0 + - lth YAJL is now ISC licensed: + http://en.wikipedia.org/wiki/ISC_license + - lth 20-35% (osx and linux respectively) parsing performance + improvement attained by tweaking string scanning (idea: + @michaelrhanson). + - Florian Forster & lth - yajl_tree interface introduced as a + higher level interface to the parser (eats JSON, poops a memory + representation) + - lth require a C99 compiler + - lth integers are now represented with long long (64bit+) on all + platforms. + - lth size_t now used throughout to represent buffer lengths, so + you can safely manage buffers greater than 4GB. + - gno semantic improvements to yajl's API regarding partial value + parsing and trailing garbage + - lth new configuration mechanism for yajl, see yajl_config() and + yajl_gen_config() + - gno more allocation checking in more places + - gno remove usage of strtol, replace with custom implementation + that cares not about your locale. + - lth yajl_parse_complete renamed to yajl_complete_parse. + - lth add a switch to validate utf8 strings as they are + generated. + - lth tests are a lot quieter in their output. + - lth addition of a little in tree performance benchmark, + `perftest` in perf/perftest.c +- additional changes from 1.0.12 + - Conrad Irwin - Parse null bytes correctly + - Mirek Rusin - fix LLVM warnings + - gno - Don't generate numbers for keys. closes #13 + - lth - various win32 fixes, including build documentation + improvements + - John Stamp - Don't export private symbols. + - John Stamp - Install yajl_version.h, not the template. + - John Stamp - Don't use -fPIC for static lib. Cmake will + automatically add it for the shared. + - lth 0 fix paths embedded in dylib upon installation on osx. + closes #11 +- refreshed optflags patch + +------------------------------------------------------------------- +Wed Jun 1 22:33:07 MDT 2011 - jfehlig@novell.com + +- Add man pages for json_{reformat,verify} + +------------------------------------------------------------------- +Wed Apr 13 10:43:49 MDT 2011 - jfehlig@novell.com + +- Add filters to rpmlintrc +- spec file: Document githash usage in tarbal name + ------------------------------------------------------------------- Wed Apr 13 10:43:49 MDT 2011 - jfehlig@novell.com diff --git a/libyajl.spec b/libyajl.spec index 41828ad..6586559 100644 --- a/libyajl.spec +++ b/libyajl.spec @@ -19,8 +19,8 @@ Name: libyajl -Version: 1.0.11 -Release: 7 +Version: 2.0.1 +Release: 0 # # NB, upstream does not provide pre-built tar.gz downloads. Instead # they make you use the 'on the fly' generated tar.gz from GITHub's @@ -40,19 +40,21 @@ Release: 7 # # So for new versions, update 'githash' to match the hash of the # GIT tag associated with updated 'Version:' field just above -%global githash f4baae0 +%global githash f4b2b1a -%define soname 1 +%define soname 2 Summary: Yet Another JSON Library # http://download.github.com/lloyd-yajl-%{version}-0-g%{githash}.tar.gz -Source: lloyd-yajl-%{version}-0-g%{githash}.tar.bz2 +Source: lloyd-yajl-%{version}-0-g%{githash}.tar.gz Source1: baselibs.conf +Source2: json_reformat.1 +Source3: json_verify.1 Patch1: libyajl-optflags.patch Patch2: libyajl-lib_suffix.patch Source99: %{name}-rpmlintrc Url: http://lloyd.github.com/yajl/ Group: System/Libraries -License: BSD3c +License: ISC BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: bison flex BuildRequires: cmake @@ -102,8 +104,6 @@ This package provides the necessary environment for linking statically against %{name}. %package -n yajl - - Summary: Yet Another JSON Library Tools Group: Productivity/Text/Utilities Requires: %{name}%{soname} = %{version} @@ -136,13 +136,15 @@ cmake \ -DLIB_SUFFIX="$LIBSUFFIX" \ .. -%__make %{?jobs:-j%{jobs}} +%__make %{?_smp_flags} popd build %install pushd build %makeinstall popd build +install -d -m 0755 $RPM_BUILD_ROOT%{_mandir}/man1 +install -m644 %SOURCE2 %SOURCE3 $RPM_BUILD_ROOT/%{_mandir}/man1 %check cd test @@ -172,6 +174,8 @@ cd test %files -n yajl %defattr(-,root,root) +%doc %{_mandir}/man1/json_reformat.1* +%doc %{_mandir}/man1/json_verify.1* %{_bindir}/json_reformat %{_bindir}/json_verify diff --git a/lloyd-yajl-1.0.11-0-gf4baae0.tar.bz2 b/lloyd-yajl-1.0.11-0-gf4baae0.tar.bz2 deleted file mode 100644 index c64abe0..0000000 --- a/lloyd-yajl-1.0.11-0-gf4baae0.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:00dbfd8401ac66846fe482b16bca32fa15916d166bb4038a584610853a20a296 -size 43076 diff --git a/lloyd-yajl-2.0.1-0-gf4b2b1a.tar.gz b/lloyd-yajl-2.0.1-0-gf4b2b1a.tar.gz new file mode 100644 index 0000000..1bba7d4 --- /dev/null +++ b/lloyd-yajl-2.0.1-0-gf4b2b1a.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c2d9096ba1ebc9a368347c7c695cfbbc72690571a5f7955ce226eedbea5b4721 +size 82102