Use new cmake macros
This commit is contained in:
parent
b995ae21c9
commit
910153cefc
17
jsoncpp.spec
17
jsoncpp.spec
@ -11,7 +11,7 @@
|
|||||||
|
|
||||||
Name: jsoncpp
|
Name: jsoncpp
|
||||||
Version: 1.9.3
|
Version: 1.9.3
|
||||||
Release: 2%{?dist}
|
Release: 3%{?dist}
|
||||||
Summary: JSON library implemented in C++
|
Summary: JSON library implemented in C++
|
||||||
|
|
||||||
License: Public Domain or MIT
|
License: Public Domain or MIT
|
||||||
@ -72,21 +72,19 @@ mkdir -p %{_vpath_builddir}
|
|||||||
-DJSONCPP_WITH_STRICT_ISO:BOOL=ON \
|
-DJSONCPP_WITH_STRICT_ISO:BOOL=ON \
|
||||||
-DJSONCPP_WITH_TESTS:BOOL=ON \
|
-DJSONCPP_WITH_TESTS:BOOL=ON \
|
||||||
-DJSONCPP_WITH_WARNING_AS_ERROR:BOOL=OFF \
|
-DJSONCPP_WITH_WARNING_AS_ERROR:BOOL=OFF \
|
||||||
-DPYTHON_EXECUTABLE:STRING="%{__python3}" \
|
-DPYTHON_EXECUTABLE:STRING="%{__python3}"
|
||||||
-B $PWD/%{_vpath_builddir} \
|
%cmake_build
|
||||||
-S $PWD
|
|
||||||
%make_build -C %{_vpath_builddir}
|
|
||||||
|
|
||||||
%if %{with jsoncpp_enables_doc}
|
%if %{with jsoncpp_enables_doc}
|
||||||
# Build the doc
|
# Build the doc
|
||||||
cp -p %{_vpath_builddir}/version .
|
cp -p %{__cmake_builddir}/version .
|
||||||
%{__python3} doxybuild.py --with-dot --doxygen %{_bindir}/doxygen
|
%{__python3} doxybuild.py --with-dot --doxygen %{_bindir}/doxygen
|
||||||
rm -f version
|
rm -f version
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
|
|
||||||
%install
|
%install
|
||||||
%make_install -C %{_vpath_builddir}
|
%cmake_install
|
||||||
|
|
||||||
mkdir -p %{buildroot}%{_docdir}/%{name}
|
mkdir -p %{buildroot}%{_docdir}/%{name}
|
||||||
install -pm 0644 README.md %{buildroot}%{_docdir}/%{name}
|
install -pm 0644 README.md %{buildroot}%{_docdir}/%{name}
|
||||||
@ -99,7 +97,7 @@ hardlink -cfv %{buildroot}%{_docdir}/%{name}
|
|||||||
|
|
||||||
|
|
||||||
%check
|
%check
|
||||||
%make_build -C %{_vpath_builddir} jsoncpp_check
|
%ctest
|
||||||
|
|
||||||
|
|
||||||
%ldconfig_scriptlets
|
%ldconfig_scriptlets
|
||||||
@ -131,6 +129,9 @@ hardlink -cfv %{buildroot}%{_docdir}/%{name}
|
|||||||
|
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Wed Jul 29 2020 Björn Esser <besser82@fedoraproject.org> - 1.9.3-3
|
||||||
|
- Use new cmake macros
|
||||||
|
|
||||||
* Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.9.3-2
|
* Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.9.3-2
|
||||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user