From d1ba64014eeb811091032317c45b0e38da110821ad0cff062aa715b9514c9533 Mon Sep 17 00:00:00 2001 From: Luigi Baldoni Date: Fri, 7 May 2021 11:52:35 +0000 Subject: [PATCH] Accepting request 891275 from home:dirkmueller:Factory - fix build on architectures without pandoc OBS-URL: https://build.opensuse.org/request/show/891275 OBS-URL: https://build.opensuse.org/package/show/X11:Utilities/xpra?expand=0&rev=80 --- xpra.changes | 5 +++++ xpra.spec | 15 +++++++++++++++ 2 files changed, 20 insertions(+) diff --git a/xpra.changes b/xpra.changes index e40b0bd..ae88329 100644 --- a/xpra.changes +++ b/xpra.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Fri May 7 11:23:54 UTC 2021 - Dirk Müller + +- fix build on architectures without pandoc + ------------------------------------------------------------------- Fri Apr 23 09:09:12 UTC 2021 - Luigi Baldoni diff --git a/xpra.spec b/xpra.spec index 8423643..70456e9 100644 --- a/xpra.spec +++ b/xpra.spec @@ -17,6 +17,11 @@ # +%ifarch x86_64 ppc64 s390x aarch64 riscv64 +%global with_pandoc 1 +%endif +%bcond_with pandoc + %define xpra_ver 4.1.3 %define html5_ver 4.1.2 %define uglifyjs_ver 3.13.4 @@ -43,7 +48,9 @@ BuildRequires: hicolor-icon-theme # Needed by uglify-js BuildRequires: nodejs-common BuildRequires: pam-devel +%if %{with pandoc} BuildRequires: pandoc +%endif BuildRequires: pkgconfig BuildRequires: python3-Cython >= 0.20.0 BuildRequires: python3-devel @@ -161,6 +168,9 @@ python3 setup.py build \ --with-service \ --without-cuda_kernels \ --without-nvenc \ +%if !%{with pandoc} + --without-docs \ +%endif --without-nvfbc %install @@ -171,6 +181,9 @@ python3 setup.py install \ --with-service \ --with-Xdummy \ --with-Xdummy_wrapper \ +%if !%{with pandoc} + --without-docs \ +%endif --verbose pushd %{name}-html5-%{html5_ver} @@ -206,7 +219,9 @@ mkdir -p %{_rundir}/%{name} || exit 1 %files %doc docs/README.md docs/CHANGELOG.md +%if %{with pandoc} %doc %{_defaultdocdir}/xpra +%endif %license COPYING %dir %{_datadir}/xpra %dir %{_prefix}/lib/xpra