!1 init package

Merge pull request !1 from 薄皮小笼包/master

db2html

@@ -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

docbook-utils-2ndspaces.patch

@@ -0,0 +1,260 @@
+--- Original/backends/dvi	2003-01-13 18:14:10.000000000 +0100
++++ Changes/backends/dvi	2007-05-21 14:10:42.000000000 +0200
+@@ -6,31 +6,31 @@
+ export TEXINPUTS
+ 
+ # Convert to TeX
+-$SGML_JADE -t tex -o ${SGML_FILE_NAME}.tex $SGML_ARGUMENTS
++$SGML_JADE -t tex -o "${SGML_FILE_NAME}.tex" $SGML_ARGUMENTS "$SGML_FILE"
+ if [ $? -ne 0 ]
+ then exit 1
+ fi
+ 
+ # Convert from TeX to DVI
+-jadetex ${SGML_FILE_NAME}.tex >${SGML_FILE_NAME}.tmp
++jadetex "${SGML_FILE_NAME}.tex" > "${SGML_FILE_NAME}.tmp"
+ if [ $? -ne 0 ]
+ then
+-  cat ${SGML_FILE_NAME}.tmp
+-  rm ${SGML_FILE_NAME}.tmp
+-  rm ${SGML_FILE_NAME}.tex
++  cat "${SGML_FILE_NAME}.tmp"
++  rm "${SGML_FILE_NAME}.tmp"
++  rm "${SGML_FILE_NAME}.tex"
+   exit 2
+ fi
+-rm ${SGML_FILE_NAME}.tmp
++rm "${SGML_FILE_NAME}.tmp"
+ 
+ # If there are unresolved references, re-run jadetex, twice 
+-if egrep '^LaTeX Warning: There were undefined references.$' ${SGML_FILE_NAME}.log >/dev/null 2>&1
++if egrep '^LaTeX Warning: There were undefined references.$' "${SGML_FILE_NAME}.log" >/dev/null 2>&1
+ then
+-    jadetex ${SGML_FILE_NAME}.tex >/dev/null
+-    jadetex ${SGML_FILE_NAME}.tex >/dev/null
++    jadetex "${SGML_FILE_NAME}.tex" >/dev/null
++    jadetex "${SGML_FILE_NAME}.tex" >/dev/null
+ fi
+-rm ${SGML_FILE_NAME}.log
+-rm ${SGML_FILE_NAME}.aux
+-rm ${SGML_FILE_NAME}.tex
+-rm ${SGML_FILE_NAME}.out
++rm "${SGML_FILE_NAME}.log"
++rm "${SGML_FILE_NAME}.aux"
++rm "${SGML_FILE_NAME}.tex"
++rm "${SGML_FILE_NAME}.out"
+ 
+ exit 0
+--- Original/backends/html	2000-07-21 20:15:22.000000000 +0200
++++ Changes/backends/html	2007-05-21 14:11:32.000000000 +0200
+@@ -3,7 +3,7 @@
+ # This program is under GPL license. See LICENSE file for details.
+ 
+ # Convert to HTML
+-$SGML_JADE -t sgml $SGML_ARGUMENTS
++$SGML_JADE -t sgml $SGML_ARGUMENTS "$SGML_FILE"
+ if [ $? -ne 0 ]
+ then exit 1
+ fi
+--- Original/backends/pdf	2003-03-17 18:47:11.000000000 +0100
++++ Changes/backends/pdf	2007-05-21 14:13:58.000000000 +0200
+@@ -6,26 +6,26 @@
+ export TEXINPUTS
+ 
+ # Convert to TeX
+-$SGML_JADE -t tex -o ${SGML_FILE_NAME}.tex $SGML_ARGUMENTS
++$SGML_JADE -t tex -o "${SGML_FILE_NAME}.tex" $SGML_ARGUMENTS "$SGML_FILE"
+ if [ $? -ne 0 ]
+ then exit 1
+ fi
+ 
+ # Convert from TeX to PDF
+-pdfjadetex ${SGML_FILE_NAME}.tex >${SGML_FILE_NAME}.tmp
++pdfjadetex "${SGML_FILE_NAME}.tex" > "${SGML_FILE_NAME}.tmp"
+ if [ $? -ne 0 ]
+ then
+-  cat ${SGML_FILE_NAME}.tmp
+-  rm ${SGML_FILE_NAME}.tmp
+-  rm ${SGML_FILE_NAME}.tex
++  cat "${SGML_FILE_NAME}.tmp"
++  rm "${SGML_FILE_NAME}.tmp"
++  rm "${SGML_FILE_NAME}.tex"
+   exit 2
+ fi
+-rm ${SGML_FILE_NAME}.tmp
++rm "${SGML_FILE_NAME}.tmp"
+ 
+ # Unconditionally re-run pdfjadetex, twice 
+-pdfjadetex ${SGML_FILE_NAME}.tex >/dev/null
+-pdfjadetex ${SGML_FILE_NAME}.tex >/dev/null
+-rm -f ${SGML_FILE_NAME}.log ${SGML_FILE_NAME}.aux \
+-      ${SGML_FILE_NAME}.tex ${SGML_FILE_NAME}.out
++pdfjadetex "${SGML_FILE_NAME}.tex" >/dev/null
++pdfjadetex "${SGML_FILE_NAME}.tex" >/dev/null
++rm -f "${SGML_FILE_NAME}.log" "${SGML_FILE_NAME}.aux" \
++      "${SGML_FILE_NAME}.tex" "${SGML_FILE_NAME}.out"
+ 
+ exit 0
+--- Original/backends/ps	2003-03-17 18:51:48.000000000 +0100
++++ Changes/backends/ps	2007-05-21 14:16:51.000000000 +0200
+@@ -6,30 +6,30 @@
+ export TEXINPUTS
+ 
+ # Convert to TeX
+-$SGML_JADE -t tex -o ${SGML_FILE_NAME}.tex $SGML_ARGUMENTS
++$SGML_JADE -t tex -o "${SGML_FILE_NAME}.tex" $SGML_ARGUMENTS "$SGML_FILE"
+ if [ $? -ne 0 ]
+ then exit 1
+ fi
+ 
+ # Convert from TeX to DVI
+-jadetex ${SGML_FILE_NAME}.tex >${SGML_FILE_NAME}.tmp
++jadetex "${SGML_FILE_NAME}.tex" > "${SGML_FILE_NAME}.tmp"
+ if [ $? -ne 0 ]
+ then
+-  cat ${SGML_FILE_NAME}.tmp
+-  rm ${SGML_FILE_NAME}.tmp
+-  rm ${SGML_FILE_NAME}.tex
++  cat "${SGML_FILE_NAME}.tmp"
++  rm "${SGML_FILE_NAME}.tmp"
++  rm "${SGML_FILE_NAME}.tex"
+   exit 2
+ fi
+-rm ${SGML_FILE_NAME}.tmp
++rm "${SGML_FILE_NAME}.tmp"
+ 
+ # If there are unresolved references, re-run jadetex, twice 
+-if egrep '^LaTeX Warning: There were undefined references.$' ${SGML_FILE_NAME}.log >/dev/null 2>&1
++if egrep '^LaTeX Warning: There were undefined references.$' "${SGML_FILE_NAME}.log" >/dev/null 2>&1
+ then
+-    jadetex ${SGML_FILE_NAME}.tex >/dev/null
+-    jadetex ${SGML_FILE_NAME}.tex >/dev/null
++    jadetex "${SGML_FILE_NAME}.tex" >/dev/null
++    jadetex "${SGML_FILE_NAME}.tex" >/dev/null
+ fi
+-rm -f ${SGML_FILE_NAME}.log ${SGML_FILE_NAME}.aux \
+-	${SGML_FILE_NAME}.tex ${SGML_FILE_NAME}.out
++rm -f "${SGML_FILE_NAME}.log" "${SGML_FILE_NAME}.aux" \
++	"${SGML_FILE_NAME}.tex" "${SGML_FILE_NAME}.out"
+ 
+ # Convert from DVI to PostScript
+ PAPERSIZE="-t letter"
+@@ -38,12 +38,12 @@
+   PAPERSIZE="-t a4"
+ fi
+ 
+-dvips -R -q $PAPERSIZE ${SGML_FILE_NAME}.dvi -o ${SGML_FILE_NAME}.ps
++dvips -R -q $PAPERSIZE "${SGML_FILE_NAME}.dvi" -o "${SGML_FILE_NAME}.ps"
+ if [ $? -ne 0 ]
+ then
+-  rm ${SGML_FILE_NAME}.dvi
++  rm "${SGML_FILE_NAME}.dvi"
+   exit 3
+ fi
+-rm ${SGML_FILE_NAME}.dvi
++rm "${SGML_FILE_NAME}.dvi"
+ 
+ exit 0
+--- Original/backends/rtf	2000-07-21 20:15:22.000000000 +0200
++++ Changes/backends/rtf	2007-05-21 14:18:37.000000000 +0200
+@@ -3,7 +3,7 @@
+ # This program is under GPL license. See LICENSE file for details.
+ 
+ # Convert to RTF
+-$SGML_JADE -t rtf -o ${SGML_FILE_NAME}.rtf $SGML_ARGUMENTS
++$SGML_JADE -t rtf -o "${SGML_FILE_NAME}.rtf" $SGML_ARGUMENTS "$SGML_FILE"
+ if [ $? -ne 0 ]
+ then exit 1
+ fi
+--- Original/backends/tex	2000-07-21 20:15:22.000000000 +0200
++++ Changes/backends/tex	2007-05-21 14:21:12.000000000 +0200
+@@ -3,7 +3,7 @@
+ # This program is under GPL license. See LICENSE file for details.
+ 
+ # Convert to TeX
+-$SGML_JADE -t tex -o ${SGML_FILE_NAME}.tex $SGML_ARGUMENTS
++$SGML_JADE -t tex -o "${SGML_FILE_NAME}.tex" $SGML_ARGUMENTS "$SGML_FILE"
+ if [ $? -ne 0 ]
+ then exit 1
+ fi
+--- Original/backends/txt	2004-02-11 14:58:03.000000000 +0100
++++ Changes/backends/txt	2007-05-21 14:22:33.000000000 +0200
+@@ -23,7 +23,7 @@
+ trap 'rm -f "$HTML"; exit' 0 1 2 3 7 13 15
+ 
+ # Convert to HTML
+-$SGML_JADE -V nochunks -t sgml ${SGML_ARGUMENTS} >${HTML}
++$SGML_JADE -V nochunks -t sgml ${SGML_ARGUMENTS} "$SGML_FILE" >${HTML}
+ if [ $? -ne 0 ]
+ then exit 1
+ fi
+--- Original/bin/jw.in	2003-04-30 18:21:49.000000000 +0200
++++ Changes/bin/jw.in	2007-05-21 14:28:58.000000000 +0200
+@@ -246,7 +246,7 @@ then
+   echo -e $SGML_HELP_MESSAGE >&2
+   exit 1
+ fi
+-if [ ! -s $SGML_FRONTEND ]
++if [ ! -s "$SGML_FRONTEND" ]
+ then
+   echo "`basename $0`: There is no frontend called \"$SGML_FRONTEND\"." >&2
+   exit 2
+@@ -270,14 +270,14 @@
+   echo -e $SGML_HELP_MESSAGE >&2
+   exit 1
+ fi
+-if [ ! -s $SGML_FILE ]
++if [ ! -s "$SGML_FILE" ]
+ then
+   echo "`basename $0`: Cannot open \"$SGML_FILE\"." >&2
+   exit 3
+ fi
+ 
+ # Separate the file name and the extension (if any)
+-SGML_FILE_NAME=`basename $SGML_FILE`
++SGML_FILE_NAME=`basename "$SGML_FILE"`
+ SGML_FILE_NAME=${SGML_FILE_NAME%.*}
+ 
+ # Determine if we are in an XML file
+@@ -416,7 +416,7 @@
+ fi
+ 
+ # Prepare the parser's arguments
+-SGML_ARGUMENTS="$SGML_INCLUDE -i $SGML_TYPE -d $SGML_STYLESHEET $SGML_OPTIONS $SGML_WARNINGS $SGML_DECL $SGML_FILE"
++SGML_ARGUMENTS="$SGML_INCLUDE -i $SGML_TYPE -d $SGML_STYLESHEET $SGML_OPTIONS $SGML_WARNINGS $SGML_DECL"
+ 
+ # Call the backend
+ echo "Using catalogs: `echo $SGML_CATALOG_FILES | sed 's/:/, /g'`"
+@@ -430,7 +430,7 @@
+ then
+ 	sh $SGML_BACKEND
+ else
+-	sh $SGML_BACKEND >$SGML_FILE_NAME.html
++	sh $SGML_BACKEND >"$SGML_FILE_NAME.html"
+ fi
+ SGML_RETURN=$?
+ cd "$SGML_CURRENT_DIRECTORY"
+diff -urNp docbook-utils-0.6.14-orig/backends/man.in docbook-utils-0.6.14/backends/man.in
+--- docbook-utils-0.6.14-orig/backends/man.in	2003-02-11 13:56:23.000000000 +0100
++++ docbook-utils-0.6.14/backends/man.in	2009-07-24 15:07:04.000000000 +0200
+@@ -7,7 +7,7 @@ HELPER=$SGML_BASE_DIR/docbook/utils-@VER
+ TMPDIR=`mktemp -d /tmp/man.XXXXXX` || \
+  { echo >&2 "man backend: could not create secure temporary directory"; exit 1;}
+ trap 'rm -rf "${TMPDIR}"' EXIT
+-nsgmls $SGML_FILE > "${TMPDIR}/nsgmls.tmp"
++nsgmls "$SGML_FILE" > "${TMPDIR}/nsgmls.tmp"
+ sgmlspl $HELPER <"${TMPDIR}/nsgmls.tmp" 2>"${TMPDIR}/errs"
+ if [ $? -ne 0 ]
+ then
+diff -urNp docbook-utils-0.6.14-orig/backends/texi.in docbook-utils-0.6.14/backends/texi.in
+--- docbook-utils-0.6.14-orig/backends/texi.in	2002-08-05 23:20:56.000000000 +0200
++++ docbook-utils-0.6.14/backends/texi.in	2009-07-24 15:08:02.000000000 +0200
+@@ -3,7 +3,7 @@
+ # This program is under GPL license. See LICENSE file for details.
+ 
+ # Convert to texinfo
+-nsgmls $SGML_FILE | sgmlspl $SGML_BASE_DIR/docbook/utils-@VERSION@/helpers/docbook2texi-spec.pl >$SGML_FILE_NAME.texi
++nsgmls "$SGML_FILE" | sgmlspl $SGML_BASE_DIR/docbook/utils-@VERSION@/helpers/docbook2texi-spec.pl >$SGML_FILE_NAME.texi
+ if [ $? -ne 0 ]
+ then exit 1
+ fi

docbook-utils-grepnocolors.patch

@@ -0,0 +1,15 @@
+diff -urNp docbook-utils-0.6.14-orig/bin/jw.in docbook-utils-0.6.14/bin/jw.in
+--- docbook-utils-0.6.14-orig/bin/jw.in	2008-11-28 10:53:09.000000000 +0100
++++ docbook-utils-0.6.14/bin/jw.in	2008-11-28 11:22:28.000000000 +0100
+@@ -81,9 +81,9 @@ SGML_CATALOGS_DIR="/etc/sgml"
+ if [ -f "$SGML_CONF" ]
+ then
+   RE='^[:space:]*SGML_BASE_DIR[:space:]*=[:space:]*'
+-  SGML_BASE_DIR=`grep $RE $SGML_CONF | sed "s/$RE//"`
++  SGML_BASE_DIR=`grep --color=never $RE $SGML_CONF | sed "s/$RE//"`
+   RE='^[:space:]*SGML_CATALOGS_DIR[:space:]*=[:space:]*'
+-  SGML_CATALOGS_DIR=`grep $RE $SGML_CONF | sed "s/$RE//"`
++  SGML_CATALOGS_DIR=`grep --color=never $RE $SGML_CONF | sed "s/$RE//"`
+ fi
+ 
+ # Set frontend to use

docbook-utils-newgrep.patch

@@ -0,0 +1,24 @@
+diff -urNp docbook-utils-0.6.14-orig/bin/jw.in docbook-utils-0.6.14/bin/jw.in
+--- docbook-utils-0.6.14-orig/bin/jw.in	2010-09-28 18:18:39.567895321 +0200
++++ docbook-utils-0.6.14/bin/jw.in	2010-09-28 18:23:25.849756994 +0200
+@@ -80,9 +80,9 @@ SGML_BASE_DIR="@prefix@/share/sgml"
+ SGML_CATALOGS_DIR="/etc/sgml"
+ if [ -f "$SGML_CONF" ]
+ then
+-  RE='^[:space:]*SGML_BASE_DIR[:space:]*=[:space:]*'
++  RE='^[[:space:]]*SGML_BASE_DIR[[:space:]]*=[[:space:]]*'
+   SGML_BASE_DIR=`grep --color=never $RE $SGML_CONF | sed "s/$RE//"`
+-  RE='^[:space:]*SGML_CATALOGS_DIR[:space:]*=[:space:]*'
++  RE='^[[:space:]]*SGML_CATALOGS_DIR[[:space:]]*=[[:space:]]*'
+   SGML_CATALOGS_DIR=`grep --color=never $RE $SGML_CONF | sed "s/$RE//"`
+ fi
+ 
+@@ -312,7 +312,7 @@ case $SGML_STANDARD_CATALOGS in
+ 	  SGML_CATALOG_FILES=$SGML_CENTRALIZED_CATALOG
+ 	else
+ 	  SGML_CATALOG_FILES=`find $SGML_BASE_DIR -name catalog`
+-	  SGML_CATALOG_FILES=`echo "$SGML_CATALOG_FILES" | tr [:space:] :`
++	  SGML_CATALOG_FILES=`echo "$SGML_CATALOG_FILES" | tr [[:space:]] :`
+ 	fi
+ 	;;
+   no)	SGML_CATALOG_FILES=""

docbook-utils-nofinalecho.patch

@@ -0,0 +1,12 @@
+diff -urNp docbook-utils-0.6.14-orig/bin/jw.in docbook-utils-0.6.14/bin/jw.in
+--- docbook-utils-0.6.14-orig/bin/jw.in	2010-05-31 16:21:46.379401250 +0200
++++ docbook-utils-0.6.14/bin/jw.in	2010-05-31 16:23:55.348413466 +0200
+@@ -438,5 +438,7 @@ cd "$SGML_CURRENT_DIRECTORY"
+ if [ $SGML_RETURN -gt 0 ]
+ then exit `expr 7 + $SGML_RETURN`
+ fi
+-echo "Done."
++#Final echo commented out, it causes manpage noise when generating some
++#manpages with new perl(#513271, #587012)
++#echo "Done."
+ exit 0

docbook-utils-papersize.patch

@@ -0,0 +1,12 @@
+diff -urNp docbook-utils-0.6.14-orig/bin/jw.in docbook-utils-0.6.14/bin/jw.in
+--- docbook-utils-0.6.14-orig/bin/jw.in	2009-10-07 14:41:19.000000000 +0200
++++ docbook-utils-0.6.14/bin/jw.in	2009-10-07 14:45:22.000000000 +0200
+@@ -368,7 +368,7 @@ case "$SGML_OPTIONS" in
+ 	fi
+ 	if [ -n "$papersize" ]
+ 	then
+-	  SGML_OPTIONS="-V paper-type=$papersize $SGML_OPTIONS"
++	  SGML_OPTIONS="-V %paper-type%=$papersize $SGML_OPTIONS"
+ 	fi
+ 	;;
+ esac

docbook-utils-rtfmanpage.patch

@@ -0,0 +1,15 @@
+diff -urNp docbook-utils-0.6.14-orig/doc/man/jw.1 docbook-utils-0.6.14/doc/man/jw.1
+--- docbook-utils-0.6.14-orig/doc/man/jw.1	2004-02-11 15:16:21.000000000 +0100
++++ docbook-utils-0.6.14/doc/man/jw.1	2009-08-13 10:44:03.000000000 +0200
+@@ -192,6 +192,11 @@ by calling \fBJade\fR or
+ \fBOpenJade\fR\&. The resulting file can
+ then be inported into \fBMS Word\fR
+ or one of its Linux replacement programs.
++
++\fBNote\fR - The original picture must be
++present when RTF document is viewed, because
++the RTF documents created by \fBOpenJade\fR
++includes pictures by reference.
+ .TP
+ \fB\fItex\fB\fR
+ Converts to TeX by calling \fBJade\fR or

docbook-utils-sgmlinclude.patch

@@ -0,0 +1,24 @@
+diff -urNp docbook-utils-0.6.14-orig/backends/man.in docbook-utils-0.6.14/backends/man.in
+--- docbook-utils-0.6.14-orig/backends/man.in	2009-07-24 15:17:42.000000000 +0200
++++ docbook-utils-0.6.14/backends/man.in	2009-07-24 15:20:57.000000000 +0200
+@@ -7,7 +7,7 @@ HELPER=$SGML_BASE_DIR/docbook/utils-@VER
+ TMPDIR=`mktemp -d /tmp/man.XXXXXX` || \
+  { echo >&2 "man backend: could not create secure temporary directory"; exit 1;}
+ trap 'rm -rf "${TMPDIR}"' EXIT
+-nsgmls "$SGML_FILE" > "${TMPDIR}/nsgmls.tmp"
++nsgmls ${SGML_INCLUDE} "$SGML_FILE" > "${TMPDIR}/nsgmls.tmp"
+ sgmlspl $HELPER <"${TMPDIR}/nsgmls.tmp" 2>"${TMPDIR}/errs"
+ if [ $? -ne 0 ]
+ then
+diff -urNp docbook-utils-0.6.14-orig/bin/jw.in docbook-utils-0.6.14/bin/jw.in
+--- docbook-utils-0.6.14-orig/bin/jw.in	2009-07-24 15:17:42.000000000 +0200
++++ docbook-utils-0.6.14/bin/jw.in	2009-07-24 15:18:51.000000000 +0200
+@@ -423,7 +423,7 @@ echo "Using catalogs: `echo $SGML_CATALO
+ echo "Using stylesheet: $SGML_STYLESHEET"
+ echo "Working on: $SGML_FILE"
+ cd "$SGML_OUTPUT_DIRECTORY"
+-export SGML_JADE SGML_FILE_NAME SGML_ARGUMENTS
++export SGML_JADE SGML_FILE_NAME SGML_ARGUMENTS SGML_INCLUDE
+ export SGML_CATALOG_FILES SGML_BASE_DIR SGML_FILE SGML_STYLESHEET
+ NOCHUNKS=`echo $SGML_OPTIONS | grep nochunks`
+ if [ -z "$NOCHUNKS" ]

docbook-utils-spaces.patch

@@ -0,0 +1,32 @@
+--- docbook-utils-0.6.14/bin/jw.in.spaces	2003-04-30 17:21:49.000000000 +0100
++++ docbook-utils-0.6.14/bin/jw.in	2004-08-19 09:33:34.989426640 +0100
+@@ -405,9 +405,9 @@
+   echo -e $SGML_HELP_MESSAGE >&2
+   exit 1
+ fi
+-if [ ! -d $SGML_OUTPUT_DIRECTORY ]
++if [ ! -d "$SGML_OUTPUT_DIRECTORY" ]
+ then
+-  mkdir $SGML_OUTPUT_DIRECTORY 2>/dev/null
++  mkdir "$SGML_OUTPUT_DIRECTORY" 2>/dev/null
+   if [ $? -ne 0 ]
+   then
+     echo "`basename $0`: Could not create \"$SGML_OUTPUT_DIRECTORY\" output directory" >&2
+@@ -422,7 +422,7 @@
+ echo "Using catalogs: `echo $SGML_CATALOG_FILES | sed 's/:/, /g'`"
+ echo "Using stylesheet: $SGML_STYLESHEET"
+ echo "Working on: $SGML_FILE"
+-cd $SGML_OUTPUT_DIRECTORY
++cd "$SGML_OUTPUT_DIRECTORY"
+ export SGML_JADE SGML_FILE_NAME SGML_ARGUMENTS
+ export SGML_CATALOG_FILES SGML_BASE_DIR SGML_FILE SGML_STYLESHEET
+ NOCHUNKS=`echo $SGML_OPTIONS | grep nochunks`
+@@ -433,7 +433,7 @@
+ 	sh $SGML_BACKEND >$SGML_FILE_NAME.html
+ fi
+ SGML_RETURN=$?
+-cd $SGML_CURRENT_DIRECTORY
++cd "$SGML_CURRENT_DIRECTORY"
+ 
+ if [ $SGML_RETURN -gt 0 ]
+ then exit `expr 7 + $SGML_RETURN`

docbook-utils-w3mtxtconvert.patch

@@ -0,0 +1,12 @@
+diff -urNp original/txt new/txt
+--- original/backends/txt	2007-11-05 18:44:52.000000000 +0100
++++ new/backends/txt	2007-11-22 15:21:36.000000000 +0100
+@@ -13,7 +13,7 @@ then
+ elif [ -x /usr/bin/w3m ]
+ then
+   CONVERT=/usr/bin/w3m
+-  ARGS="-dump"
++  ARGS="-T text/html -dump"
+ else
+   echo >&2 "No way to convert HTML to text found."
+   exit 1

docbook-utils.spec

@@ -0,0 +1,124 @@
+Name:         docbook-utils
+Version:      0.6.14
+Release:      47
+Summary:      Shell scripts for managing DocBook documents
+URL:          http://www.linuxfromscratch.org/blfs/view/svn/pst/docbook-utils.html
+License:      GPLv2+
+Requires:     docbook-dtds grep gawk text-www-browser which docbook-style-dsssl >= 1.72 perl-SGMLSpm >= 1.03ii
+BuildRequires:perl-generators perl-SGMLSpm, openjade, docbook-style-dsssl
+BuildArch:    noarch
+Source0:      https://sourceware.org/ftp/docbook-tools/new-trials/SOURCES/%{name}-%{version}.tar.gz
+Source1:      db2html
+Source2:      gdp-both.dsl
+Source3:      docbook2man-spec.pl
+Obsoletes:    stylesheets < %{version}-%{release}
+Provides:     stylesheets = %{version}-%{release}
+
+Patch0000:    docbook-utils-spaces.patch
+Patch0001:    docbook-utils-2ndspaces.patch
+Patch0002:    docbook-utils-w3mtxtconvert.patch
+Patch0003:    docbook-utils-grepnocolors.patch
+Patch0004:    docbook-utils-sgmlinclude.patch
+Patch0005:    docbook-utils-rtfmanpage.patch
+Patch0006:    docbook-utils-papersize.patch
+Patch0007:    docbook-utils-nofinalecho.patch
+Patch0008:    docbook-utils-newgrep.patch
+
+%description
+The DocBook-utils package is a collection of utility scripts used to convert and
+analyze SGML documents in general, and DocBook files in particular. The scripts
+are used to convert from DocBook or other SGML formats into “classical” file formats
+like HTML, man, info, RTF and many more. There's also a utility to compare two SGML
+files and only display the differences in markup. This is useful for comparing
+documents prepared for different languages.
+
+%package      pdf
+Summary:      A script for converting DocBook documents to PDF format
+License:      GPL+
+Requires:     docbook-utils = %{version} tex(dvips) texlive-jadetex >= 7
+Requires:     texlive-collection-fontsrecommended texlive-collection-htmlxml
+Obsoletes:    stylesheets-db2pdf <= %{version}-%{release}
+Provides:     stylesheets-db2pdf = %{version}-%{release}
+
+%description  pdf
+This package contains a script for converting DocBook documents to
+PDF format.
+
+%package      help
+Summary:      Help document for DocBook-utils
+
+%description  help
+Help document for DocBook-utils.
+
+%prep
+%autosetup -p1
+
+%build
+./configure --prefix=%{_prefix} --mandir=%{_mandir} --libdir=%{_libdir}
+%make_build
+
+%install
+%make_install prefix=%{_prefix} mandir=%{_mandir} docdir=/tmp
+ln -s docbook2dvi $RPM_BUILD_ROOT%{_bindir}/db2dvi
+ln -s jw.1.gz $RPM_BUILD_ROOT/%{_mandir}/man1/db2dvi.1
+ln -s docbook2html $RPM_BUILD_ROOT%{_bindir}/db2html
+ln -s jw.1.gz $RPM_BUILD_ROOT/%{_mandir}/man1/db2html.1
+ln -s docbook2pdf $RPM_BUILD_ROOT%{_bindir}/db2pdf
+ln -s jw.1.gz $RPM_BUILD_ROOT/%{_mandir}/man1/db2pdf.1
+ln -s docbook2ps $RPM_BUILD_ROOT%{_bindir}/db2ps
+ln -s jw.1.gz $RPM_BUILD_ROOT/%{_mandir}/man1/db2ps.1
+ln -s docbook2rtf $RPM_BUILD_ROOT%{_bindir}/db2rtf
+ln -s jw.1.gz $RPM_BUILD_ROOT/%{_mandir}/man1/db2rtf.1
+ln -s jw.1.gz $RPM_BUILD_ROOT/%{_mandir}/man1/docbook2txt.1
+rm -f $RPM_BUILD_ROOT%{_bindir}/db2html
+rm -rf $RPM_BUILD_ROOT/tmp
+install -p -m 755 %{SOURCE1} $RPM_BUILD_ROOT%{_bindir}/db2html
+install -p -m 644 %{SOURCE2} $RPM_BUILD_ROOT%{_datadir}/sgml/docbook/utils-%{version}/docbook-utils.dsl
+install -p -m 755 %{SOURCE3} $RPM_BUILD_ROOT%{_datadir}/sgml/docbook/utils-%{version}/helpers/docbook2man-spec.pl
+
+%clean
+
+%files
+%doc README COPYING TODO
+%{_bindir}/jw
+%{_bindir}/docbook2html
+%{_bindir}/docbook2man
+%{_bindir}/docbook2rtf
+%{_bindir}/docbook2tex
+%{_bindir}/docbook2texi
+%{_bindir}/docbook2txt
+%{_bindir}/db2rtf
+%{_bindir}/sgmldiff
+%{_datadir}/sgml/docbook/utils-%{version}
+%attr(0755,root,root) %{_bindir}/db2html
+
+%files pdf
+%{_bindir}/docbook2pdf
+%{_bindir}/docbook2dvi
+%{_bindir}/docbook2ps
+%{_bindir}/db2dvi
+%{_bindir}/db2pdf
+%{_bindir}/db2ps
+
+%files help
+%{_mandir}/*/db2dvi.*
+%{_mandir}/*/db2html.*
+%{_mandir}/*/db2ps.*
+%{_mandir}/*/db2rtf.*
+%{_mandir}/*/docbook2html.*
+%{_mandir}/*/docbook2rtf.*
+%{_mandir}/*/docbook2man.*
+%{_mandir}/*/docbook2tex.*
+%{_mandir}/*/docbook2texi.*
+%{_mandir}/*/docbook2txt.*
+%{_mandir}/*/jw.*
+%{_mandir}/*/sgmldiff.*
+%{_mandir}/*/*-spec.*
+%{_mandir}/*/db2pdf.*
+%{_mandir}/*/docbook2pdf.*
+%{_mandir}/*/docbook2dvi.*
+%{_mandir}/*/docbook2ps.*
+
+%changelog
+* Sat Nov 30 2019 wangyiru <wangyiru1@huawei.com> -  0.6.14-47
+- Package inint