rpms/docbook-utils
5
0
Fork 0
Code Issues Pull Requests Releases Activity

make [[:space:]] class syntax compatible with new grep(#637594)

Browse Source
This commit is contained in:
Ondrej Vasik 2010-09-28 18:32:26 +02:00
parent 46f03cca7b
commit a11a395bf1
2 changed files with 31 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
docbook-utils-newgrep.patch Normal file
View 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=""

9
docbook-utils.spec
View File

@ -1,6 +1,6 @@
Name: docbook-utils Name: docbook-utils
Version: 0.6.14 Version: 0.6.14
Release: 24%{?dist} Release: 25%{?dist}
Group: Applications/Text Group: Applications/Text
Summary: Shell scripts for managing DocBook documents Summary: Shell scripts for managing DocBook documents
@ -36,6 +36,7 @@ Patch4: docbook-utils-sgmlinclude.patch
Patch5: docbook-utils-rtfmanpage.patch Patch5: docbook-utils-rtfmanpage.patch
Patch6: docbook-utils-papersize.patch Patch6: docbook-utils-papersize.patch
Patch7: docbook-utils-nofinalecho.patch Patch7: docbook-utils-nofinalecho.patch
Patch8: docbook-utils-newgrep.patch
%description %description
This package contains scripts are for easy conversion from DocBook This package contains scripts are for easy conversion from DocBook
@ -67,6 +68,7 @@ PDF format.
%patch5 -p1 -b .rtfman %patch5 -p1 -b .rtfman
%patch6 -p1 -b .papersize %patch6 -p1 -b .papersize
%patch7 -p1 -b .finalecho %patch7 -p1 -b .finalecho
%patch8 -p1 -b .newgrep
%build %build
./configure --prefix=%{_prefix} --mandir=%{_mandir} --libdir=%{_libdir} ./configure --prefix=%{_prefix} --mandir=%{_mandir} --libdir=%{_libdir}
@ -136,7 +138,10 @@ rm -rf $RPM_BUILD_ROOT
%{_mandir}/*/docbook2ps.* %{_mandir}/*/docbook2ps.*
%changelog %changelog
* Mon May 31 2010 Ondrej Vasik <ovasik@redhat.com> 0.6-14-24 * Tue Sep 28 2010 Ondrej Vasik <ovasik@redhat.com> 0.6.14-25
- make [[:space:]] class syntax compatible with new grep(#637594)
* Mon May 31 2010 Ondrej Vasik <ovasik@redhat.com> 0.6.14-24
- do not produce final echo, it causes some manpage noise - do not produce final echo, it causes some manpage noise
with new perl(#513271, #587012) with new perl(#513271, #587012)