diff --git a/jsoncpp-1.8.4.tar.gz b/jsoncpp-1.8.4.tar.gz new file mode 100644 index 0000000000000000000000000000000000000000..7f3cd4b40ca7b06e2df7d26847041bb3f23c9bd0 Binary files /dev/null and b/jsoncpp-1.8.4.tar.gz differ diff --git a/jsoncpp-1.9.3.tar.gz b/jsoncpp-1.9.3.tar.gz deleted file mode 100644 index 6d1f8231b7761c75ec6c090cd97e75f586a627b5..0000000000000000000000000000000000000000 Binary files a/jsoncpp-1.9.3.tar.gz and /dev/null differ diff --git a/jsoncpp.spec b/jsoncpp.spec index 0fcd87011656fd6b3229b061a1607ecaa90c18b0..fbb6fef36e4b039da70a1a18239c8f671771e5f1 100644 --- a/jsoncpp.spec +++ b/jsoncpp.spec @@ -1,6 +1,6 @@ Name: jsoncpp -Version: 1.9.3 -Release: 1 +Version: 1.8.4 +Release: 6 Summary: JSON C++ library License: Public Domain or MIT URL: https://github.com/open-source-parsers/jsoncpp @@ -37,20 +37,19 @@ doxygen -s -u doc/doxyfile.in sed -i -e 's!^DOT_FONTNAME.*=.*!DOT_FONTNAME =!g' doc/doxyfile.in %build -install -d %{_vpath_builddir} -cd %{_vpath_builddir} +install -d %{_target_platform} +cd %{_target_platform} %cmake -DBUILD_STATIC_LIBS=OFF -DJSONCPP_WITH_WARNING_AS_ERROR=OFF \ -DJSONCPP_WITH_PKGCONFIG_SUPPORT=ON -DJSONCPP_WITH_CMAKE_PACKAGE=ON \ -DJSONCPP_WITH_POST_BUILD_UNITTEST=OFF -DPYTHON_EXECUTABLE="%{__python3}" \ .. cd .. -%make_build -C %{_vpath_builddir} -cp -p %{_vpath_builddir}/version . +%make_build -C %{_target_platform} %{__python3} doxybuild.py --with-dot --doxygen %{_bindir}/doxygen -rm -f version + %install -%make_install -C %{_vpath_builddir} +%make_install -C %{_target_platform} mkdir -p %{buildroot}%{_docdir}/%{name} cp README.md %{buildroot}%{_docdir}/%{name} chmod 644 %{buildroot}%{_docdir}/%{name}/README.md @@ -62,7 +61,7 @@ touch %{buildroot}%{_docdir}/%{name}/html hardlink -cfv %{buildroot}%{_docdir}/%{name} %check -%make_build -C %{_vpath_builddir} jsoncpp_check +%make_build -C %{_target_platform} jsoncpp_check %post /sbin/ldconfig @@ -74,8 +73,7 @@ hardlink -cfv %{buildroot}%{_docdir}/%{name} %license AUTHORS LICENSE %doc %dir %{_docdir}/%{name} %exclude %{_docdir}/%{name}/html -%{_libdir}/lib%{name}.so.24* -%{_libdir}/lib%{name}.so.%{version} +%{_libdir}/lib%{name}.so.* %files devel @@ -91,11 +89,5 @@ hardlink -cfv %{buildroot}%{_docdir}/%{name} %changelog -* Mon Jul 27 2020wenzhanli - 1.9.3-1 -- Type:bugfix -- ID:NA -- SUG:NA -- DESC:version update 1.9.3 - * Mon Nov 25 2019 zhujunhao - 1.8.4-6 - Package init