diff --git a/jsoncpp-1.8.4.tar.gz b/jsoncpp-1.8.4.tar.gz deleted file mode 100644 index 7f3cd4b40ca7b06e2df7d26847041bb3f23c9bd0..0000000000000000000000000000000000000000 Binary files a/jsoncpp-1.8.4.tar.gz and /dev/null differ diff --git a/jsoncpp-1.9.3.tar.gz b/jsoncpp-1.9.3.tar.gz new file mode 100644 index 0000000000000000000000000000000000000000..6d1f8231b7761c75ec6c090cd97e75f586a627b5 Binary files /dev/null and b/jsoncpp-1.9.3.tar.gz differ diff --git a/jsoncpp.spec b/jsoncpp.spec index fbb6fef36e4b039da70a1a18239c8f671771e5f1..013df24b230ee3993828126185190081f20d4c78 100644 --- a/jsoncpp.spec +++ b/jsoncpp.spec @@ -1,11 +1,11 @@ Name: jsoncpp -Version: 1.8.4 -Release: 6 +Version: 1.9.3 +Release: 1 Summary: JSON C++ library License: Public Domain or MIT URL: https://github.com/open-source-parsers/jsoncpp Source0: https://github.com/open-source-parsers/jsoncpp/archive/%{version}/%{name}-%{version}.tar.gz -BuildRequires: gcc-c++ cmake >= 3.1 python3-devel +BuildRequires: gcc-c++ cmake >= 3.1 python3-devel jsoncpp %description JsonCpp is a C++ library that allows manipulating JSON values, @@ -20,7 +20,6 @@ Requires: %{name} = %{version}-%{release} %description devel Document files contain library and head files for jsoncpp. - %package help Summary: Document for jsoncpp BuildRequires: doxygen graphviz hardlink @@ -37,19 +36,20 @@ doxygen -s -u doc/doxyfile.in sed -i -e 's!^DOT_FONTNAME.*=.*!DOT_FONTNAME =!g' doc/doxyfile.in %build -install -d %{_target_platform} -cd %{_target_platform} +install -d %{_vpath_builddir} +cd %{_vpath_builddir} %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 %{_target_platform} +%make_build -C %{_vpath_builddir} +cp -p %{_vpath_builddir}/version . %{__python3} doxybuild.py --with-dot --doxygen %{_bindir}/doxygen - +rm -f version %install -%make_install -C %{_target_platform} +%make_install -C %{_vpath_builddir} mkdir -p %{buildroot}%{_docdir}/%{name} cp README.md %{buildroot}%{_docdir}/%{name} chmod 644 %{buildroot}%{_docdir}/%{name}/README.md @@ -59,9 +59,10 @@ cp dist/doxygen/*/*.{html,png} %{buildroot}%{_docdir}/%{name}/html chmod 644 %{buildroot}%{_docdir}/%{name}/html/*.{html,png} touch %{buildroot}%{_docdir}/%{name}/html hardlink -cfv %{buildroot}%{_docdir}/%{name} +cp -p %{_libdir}/libjsoncpp.so.* %{buildroot}%{_libdir} %check -%make_build -C %{_target_platform} jsoncpp_check +%make_build -C %{_vpath_builddir} jsoncpp_check %post /sbin/ldconfig @@ -74,7 +75,7 @@ hardlink -cfv %{buildroot}%{_docdir}/%{name} %doc %dir %{_docdir}/%{name} %exclude %{_docdir}/%{name}/html %{_libdir}/lib%{name}.so.* - +%{_libdir}/lib%{name}.so.%{version} %files devel %{_libdir}/lib%{name}.so @@ -82,12 +83,17 @@ hardlink -cfv %{buildroot}%{_docdir}/%{name} %{_libdir}/cmake/* %{_libdir}/pkgconfig/%{name}.pc - %files help %doc %{_docdir}/%{name} %doc %{_docdir}/%{name}/README.md %changelog +* Tue Aug 4 2020 zhangguangzhi - 1.9.3-1 +- Type:update +- ID:NA +- SUG:NA +- DESC:update version 1.9.3 + * Mon Nov 25 2019 zhujunhao - 1.8.4-6 - Package init