summaryrefslogtreecommitdiffstats
path: root/cgit.spec
diff options
context:
space:
mode:
authorTodd Zullinger <tmz@pobox.com>2018-06-15 23:11:50 -0400
committerTodd Zullinger <tmz@pobox.com>2018-06-16 22:36:06 -0400
commitbd1a10187c7885064d6af691c58f429f0fbd7f2c (patch)
tree8ff6b68af8f132ac531af3c4924c67d634905119 /cgit.spec
parent70a14e8b3690d0a6d000c502cad6b38b3c9af433 (diff)
downloadcgit_EL6-bd1a10187c7885064d6af691c58f429f0fbd7f2c.tar.gz
fix parallel make issues in docs
Diffstat (limited to 'cgit.spec')
-rw-r--r--cgit.spec11
1 files changed, 7 insertions, 4 deletions
diff --git a/cgit.spec b/cgit.spec
index 0519bd1..9de375b 100644
--- a/cgit.spec
+++ b/cgit.spec
@@ -33,6 +33,11 @@ Source3: README.SELinux
# All supported releases use highlight version 3.
Patch0: cgit-0.9.1-highlightv3.patch
+# fix parallel make issues in docs
+# https://git.zx2c4.com/cgit/patch/?id=48f1750
+# https://lists.zx2c4.com/pipermail/cgit/2018-June/003861.html
+Patch1: 0001-Makefile-drive-asciidoc-directly-for-HTML-output.patch
+
# Security guys might try to repoquery for this.
Provides: bundled(git) = %gitver
@@ -112,10 +117,7 @@ EOF
%build
-%make_build
-
-# Something in the a2x chain doesn't like running in parallel. :/
-make -j1 doc-man doc-html
+%make_build all doc-man doc-html
%if %{with highlight}
highlight --print-style --style-outfile=stdout >> cgit.css
@@ -157,6 +159,7 @@ install -d -m0755 %{buildroot}%{cachedir}
- use %%bcond_(with|without) to toggle highlight
- use %%autosetup macro
- drop crufty curl-devel conditional
+- fix parallel make issues in docs
* Mon Jun 04 2018 Todd Zullinger <tmz@pobox.com>
- make config: drop redundant DESTDIR/INSTALL, add COPYTREE