Bump to jsoncpp 1.9.2

Change-Id: I4090a3f0dce823fad351de9578f77cb377733c2d
Signed-off-by: DongHun Kwak <dh0128.kwak@samsung.com>

diff --git a/packaging/jsoncpp.spec b/packaging/jsoncpp.spec
index ce779a9..1691bd4 100644 (file)
--- a/packaging/jsoncpp.spec
+++ b/packaging/jsoncpp.spec
@@ -1,7 +1,7 @@
 %global jsondir json
 
 Name:       jsoncpp
-Version:    1.8.4
+Version:    1.9.2
 Release:    0
 Summary:    JSON library implemented in C++
 Group:      System Environment/Libraries
@@ -35,17 +35,23 @@ This package contains the development headers and library for %{name}.
 cp %{SOURCE1001} .
 
 %build
-%cmake -DJSONCPP_WITH_TESTS=OFF -DJSONCPP_WITH_POST_BUILD_UNITTEST=OFF -DBUILD_SHARED_LIBS=ON -DBUILD_STATIC_LIBS=OFF .
+mkdir build
+pushd build
+%cmake -DJSONCPP_WITH_TESTS=OFF -DJSONCPP_WITH_POST_BUILD_UNITTEST=OFF -DBUILD_SHARED_LIBS=ON -DBUILD_STATIC_LIBS=OFF ..
 make %{?_smp_mflags}
+popd
+
 # Build the doc
-python doxybuild.py --doxygen %{_bindir}/doxygen
+# python doxybuild.py --doxygen %{_bindir}/doxygen
 
 #%check
 # Tests are run automatically in the build section
 # ctest -V %{?_smp_mflags}
 
 %install
+pushd build
 make install DESTDIR=%{buildroot}
+popd
 
 #mkdir -p $RPM_BUILD_ROOT%{_docdir}/%{name}/html
 #for f in AUTHORS LICENSE NEWS.txt README.md ; do
@@ -56,6 +62,9 @@ make install DESTDIR=%{buildroot}
 mkdir -p $RPM_BUILD_ROOT%{_includedir}/%{name}/
 ln -sf ../json $RPM_BUILD_ROOT%{_includedir}/%{name}/json
 
+# remove jsoncpp cmake files
+rm -rf $RPM_BUILD_ROOT%{_libdir}/cmake/jsoncpp
+
 %remove_docs
 
 
@@ -64,7 +73,6 @@ ln -sf ../json $RPM_BUILD_ROOT%{_includedir}/%{name}/json
 
 %files
 %license LICENSE
-%exclude %{_docdir}/%{name}/html
 %{_libdir}/lib%{name}.so.*
 
 %files devel