[docbook-utils/f13/master] make [[:space:]] class syntax compatible with new grep(#637594), do not produce final echo, it cause

[Ondrej Vasik]

commit baa399040140d18a57cea4cb31bfba5295313000
Author: Ondřej Vašík <ovasik at redhat.com>
Date:   Wed Sep 29 14:20:29 2010 +0200

    make [[:space:]] class syntax compatible with new grep(#637594), do not produce final echo, it causes some manpage noise with new perl(#513271, #587012)

 docbook-utils-newgrep.patch     |   24 ++++++++++++++++++++++++
 docbook-utils-nofinalecho.patch |   12 ++++++++++++
 docbook-utils.spec              |   13 ++++++++++++-
 3 files changed, 48 insertions(+), 1 deletions(-)
---
diff --git a/docbook-utils-newgrep.patch b/docbook-utils-newgrep.patch
new file mode 100644
index 0000000..a2c3591
--- /dev/null
+++ b/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=""
diff --git a/docbook-utils-nofinalecho.patch b/docbook-utils-nofinalecho.patch
new file mode 100644
index 0000000..5787b97
--- /dev/null
+++ b/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
diff --git a/docbook-utils.spec b/docbook-utils.spec
index d37ecad..5b3b8fc 100644
--- a/docbook-utils.spec
+++ b/docbook-utils.spec
@@ -1,6 +1,6 @@
 Name: docbook-utils
 Version: 0.6.14
-Release: 23%{?dist}
+Release: 25%{?dist}
 Group: Applications/Text
 
 Summary: Shell scripts for managing DocBook documents
@@ -35,6 +35,8 @@ Patch3: docbook-utils-grepnocolors.patch
 Patch4: docbook-utils-sgmlinclude.patch
 Patch5: docbook-utils-rtfmanpage.patch
 Patch6: docbook-utils-papersize.patch
+Patch7: docbook-utils-nofinalecho.patch
+Patch8: docbook-utils-newgrep.patch
 
 %description
 This package contains scripts are for easy conversion from DocBook
@@ -65,6 +67,8 @@ PDF format.
 %patch4 -p1 -b .sgmlinclude
 %patch5 -p1 -b .rtfman
 %patch6 -p1 -b .papersize
+%patch7 -p1 -b .finalecho
+%patch8 -p1 -b .newgrep
 
 %build
 ./configure --prefix=%{_prefix} --mandir=%{_mandir} --libdir=%{_libdir}
@@ -134,6 +138,13 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/*/docbook2ps.*
 
 %changelog
+* Wed Sep 29 2010 Ondrej Vasik <ovasik at redhat.com> 0.6.14-25
+- make [[:space:]] class syntax compatible with new grep(#637594)
+
+* Mon May 31 2010 Ondrej Vasik <ovasik at redhat.com> 0.6.14-24
+- do not produce final echo, it causes some manpage noise
+  with new perl(#513271, #587012)
+
 * Tue Oct 27 2009 Ondrej Vasik <ovasik at redhat.com> 0.6.14-23
 - do not obsolete self