docbook-utils/docbook-utils-0.6.14-grep_fix-1.patch

   1 Submitted By: Ken Moffat <ken at linuxfromscratch dot org>
   2 Date: 2011-01-01
   3 Initial Package Version: 0.6.14
   4 Upstream Status: unknown
   5 Origin: fedora
   6 Description: Grep-2.7 errors out on the 'space' syntax, causing
   7 docbook2html to fail.  Fixed up by hand (the fedora version depends
   8 on a different patch which adds --color=never).
   9
  10 diff -Naur docbook-utils-0.6.14.orig/bin/jw.in docbook-utils-0.6.14//bin/jw.in
  11 --- docbook-utils-0.6.14.orig/bin/jw.in 2003-04-30 17:21:49.000000000 +0100
  12 +++ docbook-utils-0.6.14//bin/jw.in     2011-01-01 18:43:21.558959786 +0000
  13 @@ -80,9 +80,9 @@
  14  SGML_CATALOGS_DIR="/etc/sgml"
  15  if [ -f "$SGML_CONF" ]
  16  then
  17 -  RE='^[:space:]*SGML_BASE_DIR[:space:]*=[:space:]*'
  18 +  RE='^[[:space:]]*SGML_BASE_DIR[[:space:]]*=[[:space:]]*'
  19    SGML_BASE_DIR=`grep $RE $SGML_CONF | sed "s/$RE//"`
  20 -  RE='^[:space:]*SGML_CATALOGS_DIR[:space:]*=[:space:]*'
  21 +  RE='^[[:space:]]*SGML_CATALOGS_DIR[[:space:]]*=[[:space:]]*'
  22    SGML_CATALOGS_DIR=`grep $RE $SGML_CONF | sed "s/$RE//"`
  23  fi
  24
  25 @@ -312,7 +312,7 @@
  26           SGML_CATALOG_FILES=$SGML_CENTRALIZED_CATALOG
  27         else
  28           SGML_CATALOG_FILES=`find $SGML_BASE_DIR -name catalog`
  29 -         SGML_CATALOG_FILES=`echo "$SGML_CATALOG_FILES" | tr [:space:] :`
  30 +         SGML_CATALOG_FILES=`echo "$SGML_CATALOG_FILES" | tr [[:space:]] :`
  31         fi
  32         ;;
  33    no)  SGML_CATALOG_FILES=""