diff --git a/jsoncpp.spec b/jsoncpp.spec index 0892f23..0fcd870 100644 --- a/jsoncpp.spec +++ b/jsoncpp.spec @@ -37,19 +37,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 @@ -61,7 +62,7 @@ touch %{buildroot}%{_docdir}/%{name}/html hardlink -cfv %{buildroot}%{_docdir}/%{name} %check -%make_build -C %{_target_platform} jsoncpp_check +%make_build -C %{_vpath_builddir} jsoncpp_check %post /sbin/ldconfig @@ -73,7 +74,8 @@ hardlink -cfv %{buildroot}%{_docdir}/%{name} %license AUTHORS LICENSE %doc %dir %{_docdir}/%{name} %exclude %{_docdir}/%{name}/html -%{_libdir}/lib%{name}.so.* +%{_libdir}/lib%{name}.so.24* +%{_libdir}/lib%{name}.so.%{version} %files devel @@ -89,7 +91,7 @@ hardlink -cfv %{buildroot}%{_docdir}/%{name} %changelog -* Mon Jul 27 2020wenzhanli - 1.9.4-1 +* Mon Jul 27 2020wenzhanli - 1.9.3-1 - Type:bugfix - ID:NA - SUG:NA