diff --git a/prebuild-pandoc.sh b/prebuild-pandoc.sh new file mode 100644 index 0000000..98e6b23 --- /dev/null +++ b/prebuild-pandoc.sh @@ -0,0 +1,12 @@ +#!/bin/bash +TARBALL=$(rpmspec --parse rdma-core.spec | grep Source: | awk '{ print $NF}') +OUTDIR=$(tar tf rdma-core-18.1.0.1f4780139d62.tar.gz | head -n 1) + +rm -Rf $OUTDIR +tar xf $TARBALL +cd $OUTDIR +mkdir build +cd build +cmake .. +make docs +tar czf ../../prebuilt-pandoc.tgz pandoc-prebuilt diff --git a/prebuilt-pandoc.tgz b/prebuilt-pandoc.tgz new file mode 100644 index 0000000..1a2a8e7 --- /dev/null +++ b/prebuilt-pandoc.tgz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:bb73f2fca391590206191cd3e22c42b0cb55843c5a11f3c7f20b165e4b90c44b +size 11399 diff --git a/rdma-core.changes b/rdma-core.changes index 5370e24..85e46c5 100644 --- a/rdma-core.changes +++ b/rdma-core.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Thu Jun 14 08:54:13 UTC 2018 - nmoreychaisemartin@suse.com + +- Remove pandoc BuildRequires + * Add prebuilt-pandoc.sh to pre-generate the man pages + * Add prebuilt-pandoc.tgz containing pre-generated man pages + * Extract man pages in the appropriate directory during build + ------------------------------------------------------------------- Tue Jun 12 10:40:32 UTC 2018 - nmoreychaisemartin@suse.com diff --git a/rdma-core.spec b/rdma-core.spec index 7e00a94..85ef748 100644 --- a/rdma-core.spec +++ b/rdma-core.spec @@ -48,10 +48,10 @@ Group: Productivity/Networking/Other Url: https://github.com/linux-rdma/rdma-core Source: rdma-core-%{version}%{git_ver}.tar.gz Source1: baselibs.conf +Source2: prebuilt-pandoc.tgz BuildRequires: binutils BuildRequires: cmake >= 2.8.11 BuildRequires: gcc -BuildRequires: pandoc BuildRequires: pkgconfig BuildRequires: python3-base BuildRequires: pkgconfig(libsystemd) @@ -314,6 +314,8 @@ on those changes. %prep %setup -q -n %{name}-%{version}%{git_ver} +#Extract prebuilt pandoc file in the buildlib directory +(cd buildlib && tar xf %{S:2}) %build