Date: Monday, August 31, 2020 @ 18:09:26 Author: andyrtr Revision: 395021
upgpkg: docbook-utils 0.6.14-11: db2html is not just a symlink, it has to create the output directory - FS#67758; add symlinks to the manpages Added: docbook-utils/trunk/db2html Modified: docbook-utils/trunk/PKGBUILD ----------+ PKGBUILD | 11 +++++++++-- db2html | 59 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 68 insertions(+), 2 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2020-08-31 17:25:30 UTC (rev 395020) +++ PKGBUILD 2020-08-31 18:09:26 UTC (rev 395021) @@ -6,7 +6,7 @@ pkgname=docbook-utils pkgver=0.6.14 -pkgrel=10 +pkgrel=11 pkgdesc='Shell scripts to manage DocBook documents' arch=('any') url="https://www.sourceware.org/docbook-tools/" @@ -18,8 +18,10 @@ 'texlive-htmlxml: for conversion to pdf') conflicts=('docbook2x') source=(ftp://sources.redhat.com/pub/docbook-tools/new-trials/SOURCES/${pkgname}-${pkgver}.tar.gz + db2html # script taken from Fedora docbook-utils-0.6.14-grep_fix-1.patch) sha256sums=('48faab8ee8a7605c9342fb7b906e0815e3cee84a489182af38e8f7c0df2e92e9' + '10b9c29ad659cce5036871a6e85598fd33cc52c0c38cf059eeb485382a5d90d7' 'ddf0ddca0a540fd4f34f38b7b9090f96746e37da12b4e2bf8f4174c5ad61f54a') prepare() { @@ -41,6 +43,11 @@ #common alternative names for doctype in 'html' 'ps' 'dvi' 'man' 'pdf' 'rtf' 'tex' 'texi' 'txt'; do - ln -svf "docbook2${doctype}" "${pkgdir}/usr/bin/db2${doctype}" + ln -sv "docbook2${doctype}" "${pkgdir}/usr/bin/db2${doctype}" + ln -sv "jw.1" "${pkgdir}/usr/share/man/man1/db2${doctype}" done + + # db2html is not just a symlink, as it has to create the output directory - FS#67758 + rm "${pkgdir}/usr/bin/db2html" + install -p -m 755 ../db2html "${pkgdir}/usr/bin/db2html" } Added: db2html =================================================================== --- db2html (rev 0) +++ db2html 2020-08-31 18:09:26 UTC (rev 395021) @@ -0,0 +1,59 @@ +#! /bin/sh + +ADMON_GRAPHICS=/usr/share/sgml/docbook/dsssl-stylesheets/images/*.gif + +output=docbook2html-dir +skip=0 +dbdircleanup=1 +outputdone=0 +for arg in "$@" +do + if [ $skip -gt 0 ] + then + skip=$(($skip - 1)) + continue + fi + case $arg in + -h|--help|-v|--version) break + ;; + -n|--nostd|-u|--nochunks) ;; + -o|--output) outputdone=1 + ;; + + -*) skip=1 + ;; + *) dbdircleanup=0 + if [ ${outputdone} -eq 1 ]; + then + output="$(echo $arg | sed 's,\.sgml$,,;s,\.sgm$,,;s,\.xml,,')" + outputfile="$basename "$output"" + outputdone=2 + elif [ ${outputdone} -eq 2 ]; + then + outputfile="$(echo $arg | sed 's,\.sgml$,,;s,\.sgm$,,;s,\.xml,,' | \ + rev | cut -d'/' -f1 | rev)" + else + output="$(echo $arg | sed 's,\.sgml$,,;s,\.sgm$,,;s,\.xml,,')" + outputfile=$(basename "$output") + fi + ;; + esac +done + +if [ ${dbdircleanup} -eq 0 ]; +then + echo "Output is $output/$outputfile.html" +fi +if [ -d ${output} ] +then + rm -rf ${output}.junk + mv ${output} ${output}.junk +fi +mkdir ${output} +mkdir ${output}/stylesheet-images +cp ${ADMON_GRAPHICS} ${output}/stylesheet-images +jw -f docbook -b html -o ${output} "$@" +if [ ${dbdircleanup} -eq 1 ]; +then + rm -rf ${output} +fi