Update to version 0.10.5

This commit is contained in:
Sébastien Willmann 2015-09-13 21:50:05 +02:00
parent 4eddab27bc
commit 53d94d2a35
4 changed files with 12 additions and 43 deletions

1
.gitignore vendored
View File

@ -1,2 +1,3 @@
jsoncpp.pc jsoncpp.pc
jsoncpp-src-0.6.0-rc2.tar.gz jsoncpp-src-0.6.0-rc2.tar.gz
/jsoncpp-0.10.5.tar.gz

View File

@ -1,27 +0,0 @@
--- a/json_value.cpp
+++ b/json_value.cpp
@@ -666,6 +666,7 @@ Value::asString() const
case booleanValue:
return value_.bool_ ? "true" : "false";
case intValue:
+ return valueToString( value_.int_ );
case uintValue:
case realValue:
case arrayValue:
@@ -1423,14 +1424,14 @@ Value::isString() const
bool
Value::isArray() const
{
- return type_ == nullValue || type_ == arrayValue;
+ return type_ == arrayValue;
}
bool
Value::isObject() const
{
- return type_ == nullValue || type_ == objectValue;
+ return type_ == objectValue;
}

View File

@ -1,19 +1,13 @@
%global src_release 0.6.0
%global src_prerelease rc2
%global src_version %{src_release}-%{src_prerelease}
Name: jsoncpp Name: jsoncpp
Version: %{src_release} Version: 0.10.5
Release: 0.18.%{src_prerelease}%{?dist} Release: 1
Summary: JSON library implemented in C++ Summary: JSON library implemented in C++
Group: System Environment/Libraries Group: System Environment/Libraries
License: Public Domain or MIT License: Public Domain or MIT
URL: http://sourceforge.net/projects/%{name}/ URL: https://github.com/open-source-parsers/jsoncpp
Source0: http://downloads.sourceforge.net/project/%{name}/%{name}/%{src_version}/%{name}-src-%{src_version}.tar.gz Source0: https://github.com/open-source-parsers/%{name}/archive/%{version}.tar.gz#/%{name}-%{version}.tar.gz
Source1: jsoncpp.pc Source1: jsoncpp.pc
Patch0: asstring.patch
BuildRequires: python scons doxygen BuildRequires: python scons doxygen
BuildRequires: graphviz BuildRequires: graphviz
@ -43,8 +37,7 @@ This package contains the documentation for %{name}
%prep %prep
%setup -q -n %{name}-src-%{src_version} %setup -q -n %{name}-%{version}
%patch0 -dsrc/lib_json -p1
grep -e "-Wall" SConstruct grep -e "-Wall" SConstruct
sed 's|CCFLAGS = "-Wall"|CCFLAGS = "%{optflags}"|' -i SConstruct sed 's|CCFLAGS = "-Wall"|CCFLAGS = "%{optflags}"|' -i SConstruct
@ -56,8 +49,7 @@ g++ -o libjsoncpp.so.0.0.0 -shared -Wl,-z,now -Wl,-soname,libjsoncpp.so.0 builds
python doxybuild.py --with-dot --doxygen %{_bindir}/doxygen python doxybuild.py --with-dot --doxygen %{_bindir}/doxygen
%check %check
# Fails due to patch0 scons platform=linux-gcc check %{?_smp_mflags}
# scons platform=linux-gcc check %{?_smp_mflags}
%install %install
install -p -D lib%{name}.so.0.0.0 $RPM_BUILD_ROOT%{_libdir}/lib%{name}.so.0.0.0 install -p -D lib%{name}.so.0.0.0 $RPM_BUILD_ROOT%{_libdir}/lib%{name}.so.0.0.0
@ -67,7 +59,7 @@ ln -s %{_libdir}/lib%{name}.so.0.0.0 $RPM_BUILD_ROOT%{_libdir}/lib%{name}.so.0
install -d $RPM_BUILD_ROOT%{_includedir}/%{name}/json install -d $RPM_BUILD_ROOT%{_includedir}/%{name}/json
install -p -m 0644 include/json/*.h $RPM_BUILD_ROOT%{_includedir}/%{name}/json install -p -m 0644 include/json/*.h $RPM_BUILD_ROOT%{_includedir}/%{name}/json
mkdir -p $RPM_BUILD_ROOT%{_docdir}/%{name}/html mkdir -p $RPM_BUILD_ROOT%{_docdir}/%{name}/html
for f in AUTHORS LICENSE NEWS.txt README.txt ; do for f in AUTHORS LICENSE NEWS.txt README.md ; do
install -p -m 0644 $f $RPM_BUILD_ROOT%{_docdir}/%{name} install -p -m 0644 $f $RPM_BUILD_ROOT%{_docdir}/%{name}
done done
install -p -m 0644 dist/doxygen/*/*.{html,png} $RPM_BUILD_ROOT%{_docdir}/%{name}/html install -p -m 0644 dist/doxygen/*/*.{html,png} $RPM_BUILD_ROOT%{_docdir}/%{name}/html
@ -93,6 +85,9 @@ sed -i 's|@@LIBDIR@@|%{_libdir}|g' $RPM_BUILD_ROOT%{_libdir}/pkgconfig/jsoncpp.p
%{_docdir}/%{name}/ %{_docdir}/%{name}/
%changelog %changelog
* Sun Sep 13 2015 Sébastien Willmann <sebastien.willmann@gmail.com> - 0.10.5-1
- Update to version 0.10.5
* Fri Aug 14 2015 Adam Jackson <ajax@redhat.com> 0.6.0-0.18.rc2 * Fri Aug 14 2015 Adam Jackson <ajax@redhat.com> 0.6.0-0.18.rc2
- Link libjsoncpp with -z now - Link libjsoncpp with -z now

View File

@ -1,2 +1,2 @@
363e2f4cbd3aeb63bf4e571f377400fb jsoncpp-src-0.6.0-rc2.tar.gz db146bac5a126ded9bd728ab7b61ed6b jsoncpp-0.10.5.tar.gz
50728b46a67e6dc9d062330829fbf57b jsoncpp.pc 50728b46a67e6dc9d062330829fbf57b jsoncpp.pc