added fedora patches [release 0.6.14-7mamba;Wed Jun 30 2021]
This commit is contained in:
parent
b244be6e4b
commit
86eadea78d
260
docbook-utils-0.6.14-2ndspaces.patch
Normal file
260
docbook-utils-0.6.14-2ndspaces.patch
Normal file
@ -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
|
||||||
@ -1,17 +0,0 @@
|
|||||||
Fix wrong charakter classes no longer missinterpreted by grep-2.7
|
|
||||||
Michael Weber <xmw@gentoo.org>
|
|
||||||
|
|
||||||
--- docbook-utils-0.6.14/bin/jw.in
|
|
||||||
+++ docbook-utils-0.6.14/bin/jw.in
|
|
||||||
@@ -80,9 +80,9 @@
|
|
||||||
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 $RE $SGML_CONF | sed "s/$RE//"`
|
|
||||||
- RE='^[:space:]*SGML_CATALOGS_DIR[:space:]*=[:space:]*'
|
|
||||||
+ RE='^[[:space:]]*SGML_CATALOGS_DIR[[:space:]]*=[[:space:]]*'
|
|
||||||
SGML_CATALOGS_DIR=`grep $RE $SGML_CONF | sed "s/$RE//"`
|
|
||||||
fi
|
|
||||||
|
|
||||||
15
docbook-utils-0.6.14-grepnocolors.patch
Normal file
15
docbook-utils-0.6.14-grepnocolors.patch
Normal file
@ -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
|
||||||
24
docbook-utils-0.6.14-newgrep.patch
Normal file
24
docbook-utils-0.6.14-newgrep.patch
Normal file
@ -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=""
|
||||||
12
docbook-utils-0.6.14-nofinalecho.patch
Normal file
12
docbook-utils-0.6.14-nofinalecho.patch
Normal file
@ -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
|
||||||
12
docbook-utils-0.6.14-papersize.patch
Normal file
12
docbook-utils-0.6.14-papersize.patch
Normal file
@ -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
|
||||||
15
docbook-utils-0.6.14-rtfmanpage.patch
Normal file
15
docbook-utils-0.6.14-rtfmanpage.patch
Normal file
@ -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
|
||||||
24
docbook-utils-0.6.14-sgmlinclude.patch
Normal file
24
docbook-utils-0.6.14-sgmlinclude.patch
Normal file
@ -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" ]
|
||||||
32
docbook-utils-0.6.14-spaces.patch
Normal file
32
docbook-utils-0.6.14-spaces.patch
Normal file
@ -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`
|
||||||
12
docbook-utils-0.6.14-w3mtxtconvert.patch
Normal file
12
docbook-utils-0.6.14-w3mtxtconvert.patch
Normal file
@ -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
|
||||||
@ -1,6 +1,6 @@
|
|||||||
Name: docbook-utils
|
Name: docbook-utils
|
||||||
Version: 0.6.14
|
Version: 0.6.14
|
||||||
Release: 6mamba
|
Release: 7mamba
|
||||||
Summary: Shell scripts to manage DocBook documents
|
Summary: Shell scripts to manage DocBook documents
|
||||||
Group: Applications/Publishing
|
Group: Applications/Publishing
|
||||||
Vendor: openmamba
|
Vendor: openmamba
|
||||||
@ -9,7 +9,15 @@ Packager: Silvan Calarco <silvan.calarco@mambasoft.it>
|
|||||||
URL: https://www.sourceware.org/docbook-tools/
|
URL: https://www.sourceware.org/docbook-tools/
|
||||||
Source: ftp://sources.redhat.com/pub/docbook-tools/new-trials/SOURCES/docbook-utils-%{version}.tar.gz
|
Source: ftp://sources.redhat.com/pub/docbook-tools/new-trials/SOURCES/docbook-utils-%{version}.tar.gz
|
||||||
Patch0: %{name}-0.6.14-sgml_catalog.patch
|
Patch0: %{name}-0.6.14-sgml_catalog.patch
|
||||||
Patch1: %{name}-0.6.14-grep-2.7.patch
|
Patch2: docbook-utils-0.6.14-spaces.patch
|
||||||
|
Patch3: docbook-utils-0.6.14-2ndspaces.patch
|
||||||
|
Patch4: docbook-utils-0.6.14-w3mtxtconvert.patch
|
||||||
|
Patch5: docbook-utils-0.6.14-grepnocolors.patch
|
||||||
|
Patch6: docbook-utils-0.6.14-sgmlinclude.patch
|
||||||
|
Patch7: docbook-utils-0.6.14-rtfmanpage.patch
|
||||||
|
Patch8: docbook-utils-0.6.14-papersize.patch
|
||||||
|
Patch9: docbook-utils-0.6.14-nofinalecho.patch
|
||||||
|
Patch10: docbook-utils-0.6.14-newgrep.patch
|
||||||
License: GPL
|
License: GPL
|
||||||
## AUTOBUILDREQ-BEGIN
|
## AUTOBUILDREQ-BEGIN
|
||||||
BuildRequires: perl-devel
|
BuildRequires: perl-devel
|
||||||
@ -37,10 +45,19 @@ Shell scripts to manage DocBook documents.
|
|||||||
%prep
|
%prep
|
||||||
%setup -q
|
%setup -q
|
||||||
%patch0 -p1
|
%patch0 -p1
|
||||||
%patch1 -p1
|
%patch2 -p1
|
||||||
|
%patch3 -p1
|
||||||
|
%patch4 -p1
|
||||||
|
%patch5 -p1
|
||||||
|
%patch6 -p1
|
||||||
|
%patch7 -p1
|
||||||
|
%patch8 -p1
|
||||||
|
%patch9 -p1
|
||||||
|
%patch10 -p1
|
||||||
|
|
||||||
%build
|
%build
|
||||||
%configure
|
%configure
|
||||||
|
|
||||||
%make -j1 docdir=%{_docdir}
|
%make -j1 docdir=%{_docdir}
|
||||||
|
|
||||||
%install
|
%install
|
||||||
@ -88,6 +105,9 @@ Shell scripts to manage DocBook documents.
|
|||||||
#ChangeLog NEWS README TODO
|
#ChangeLog NEWS README TODO
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Wed Jun 30 2021 Silvan Calarco <silvan.calarco@mambasoft.it> 0.6.14-7mamba
|
||||||
|
- added fedora patches
|
||||||
|
|
||||||
* Tue Jun 01 2021 Silvan Calarco <silvan.calarco@mambasoft.it> 0.6.14-6mamba
|
* Tue Jun 01 2021 Silvan Calarco <silvan.calarco@mambasoft.it> 0.6.14-6mamba
|
||||||
- rebuilt
|
- rebuilt
|
||||||
|
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user