[docbook-utils/f14/master] make [[:space:]] class syntax compatible with new grep(#637594)
Ondrej Vasik
ovasik at fedoraproject.org
Tue Sep 28 16:37:21 UTC 2010
commit 5f55f6785146e42fa1368dbe8708f8d37322f8d2
Author: Ondrej Vasik <Reset at localhost.localdomain>
Date: Tue Sep 28 18:37:16 2010 +0200
make [[:space:]] class syntax compatible with new grep(#637594)
docbook-utils-newgrep.patch | 24 ++++++++++++++++++++++++
docbook-utils.spec | 9 +++++++--
2 files changed, 31 insertions(+), 2 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.spec b/docbook-utils.spec
index 839e8e7..3cb03bb 100644
--- a/docbook-utils.spec
+++ b/docbook-utils.spec
@@ -1,6 +1,6 @@
Name: docbook-utils
Version: 0.6.14
-Release: 24%{?dist}
+Release: 25%{?dist}
Group: Applications/Text
Summary: Shell scripts for managing DocBook documents
@@ -36,6 +36,7 @@ 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
@@ -67,6 +68,7 @@ PDF format.
%patch5 -p1 -b .rtfman
%patch6 -p1 -b .papersize
%patch7 -p1 -b .finalecho
+%patch8 -p1 -b .newgrep
%build
./configure --prefix=%{_prefix} --mandir=%{_mandir} --libdir=%{_libdir}
@@ -136,7 +138,10 @@ rm -rf $RPM_BUILD_ROOT
%{_mandir}/*/docbook2ps.*
%changelog
-* Mon May 31 2010 Ondrej Vasik <ovasik at redhat.com> 0.6-14-24
+* Tue Sep 28 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)
More information about the scm-commits
mailing list