From 79e39103bcb9e8e8647c750f3f8549e56147e4c8 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Mar 11 2019 18:17:39 +0000 Subject: use python3-sphinx, %make_build --- diff --git a/extra-cmake-modules.spec b/extra-cmake-modules.spec index f00ba02..fd407ca 100644 --- a/extra-cmake-modules.spec +++ b/extra-cmake-modules.spec @@ -9,7 +9,7 @@ Name: extra-cmake-modules Summary: Additional modules for CMake build system Version: 5.56.0 -Release: 1%{?dist} +Release: 2%{?dist} License: BSD URL: https://api.kde.org/ecm/ @@ -48,9 +48,10 @@ BuildRequires: kf5-rpm-macros BuildRequires: qt5-qttools-devel # sphinx-build %if 0%{?fedora} || 0%{?rhel} > 7 -BuildRequires: python2-sphinx +BuildRequires: python3-sphinx +%global sphinx_build -DSphinx_BUILD_EXECUTABLE:PATH=%{_bindir}/sphinx-build-3 %else -BuildRequires: python-sphinx +BuildRequires: python2-sphinx %endif %endif @@ -88,10 +89,11 @@ pushd %{_target_platform} %{cmake_kf5} .. \ -DBUILD_HTML_DOCS:BOOL=%{?docs:ON}%{!?docs:OFF} \ -DBUILD_MAN_DOCS:BOOL=%{?docs:ON}%{!?docs:OFF} \ - -DBUILD_TESTING:BOOL=%{?tests:ON}%{!?tests:OFF} + -DBUILD_TESTING:BOOL=%{?tests:ON}%{!?tests:OFF} \ + %{?sphinx_build} popd -make %{?_smp_mflags} -C %{_target_platform} +%make_build -C %{_target_platform} %install @@ -126,6 +128,9 @@ make test ARGS="--output-on-failure --timeout 300" -C %{_target_platform} ||: %changelog +* Mon Mar 11 2019 Rex Dieter - 5.56.0-2 +- use python3-sphinx, %%make_build + * Tue Mar 05 2019 Rex Dieter - 5.56.0-1 - 5.56.0