rpms/docbook-utils/F-10 docbook-utils-grepnocolors.patch, NONE, 1.1 docbook-utils.spec, 1.29, 1.30 docbook-utils-funcsynopsis.patch, 1.1, NONE

[Ondrej Vasik]

Author: ovasik

Update of /cvs/extras/rpms/docbook-utils/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20661

Modified Files:
	docbook-utils.spec 
Added Files:
	docbook-utils-grepnocolors.patch 
Removed Files:
	docbook-utils-funcsynopsis.patch 
Log Message:
require grep,gawk, fix jw script to work even with color=always GREP_OPTION set (#473278), finish drop of funcsynopsis patch

docbook-utils-grepnocolors.patch:

--- NEW FILE docbook-utils-grepnocolors.patch ---
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


Index: docbook-utils.spec
===================================================================
RCS file: /cvs/extras/rpms/docbook-utils/F-10/docbook-utils.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- docbook-utils.spec	8 Sep 2008 18:34:27 -0000	1.29
+++ docbook-utils.spec	28 Nov 2008 10:51:40 -0000	1.30
@@ -1,6 +1,6 @@
 Name: docbook-utils
 Version: 0.6.14
-Release: 14%{?dist}
+Release: 15%{?dist}
 Group: Applications/Text
 
 Summary: Shell scripts for managing DocBook documents
@@ -11,7 +11,7 @@
 Requires: docbook-style-dsssl >= 1.72
 Requires: docbook-dtds
 Requires: perl-SGMLSpm >= 1.03ii
-Requires: which
+Requires: which grep gawk
 Requires: text-www-browser
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
@@ -29,9 +29,9 @@
 Provides: stylesheets = %{version}-%{release}
 
 Patch0: docbook-utils-spaces.patch
-Patch1: docbook-utils-funcsynopsis.patch
-Patch2: docbook-utils-2ndspaces.patch
-Patch3: docbook-utils-w3mtxtconvert.patch
+Patch1: docbook-utils-2ndspaces.patch
+Patch2: docbook-utils-w3mtxtconvert.patch
+Patch3: docbook-utils-grepnocolors.patch
 
 %description
 This package contains scripts are for easy conversion from DocBook
@@ -56,9 +56,9 @@
 %prep
 %setup -q
 %patch0 -p1 -b .spaces
-%patch1 -p1 -b .0
-%patch2 -p1 -b .2ndspaces
-%patch3 -p1 -b .w3mtxtconvert
+%patch1 -p1 -b .2ndspaces
+%patch2 -p1 -b .w3mtxtconvert
+%patch3 -p1 -b .grepnocolors
 
 %build
 ./configure --prefix=%{_prefix} --mandir=%{_mandir} --libdir=%{_libdir}
@@ -125,11 +125,16 @@
 %{_mandir}/*/docbook2dvi.*
 %{_mandir}/*/docbook2ps.*
 
-%changelog 
+%changelog
+* Fri Nov 28 2008 Ondrej Vasik <ovasik at redhat.com> 0.6.14-15
+- require grep,gawk, fix jw script to find SGML_BASE_DIR even
+  with grep with colors(#473278), finish funcsynopsis patch
+  drop
+
 * Mon Sep 08 2008 Ondrej Vasik <ovasik at redhat.com> 0.6-14-14
-- ship new version of docbook2man-spec.pl to avoid issues 
+- ship new version of docbook2man-spec.pl to avoid issues
   with the old one
-- dropped funcsynopsis patch - docbook2man-spec.pl from 
+- dropped funcsynopsis patch - docbook2man-spec.pl from
   tarball used no longer
 
 * Thu Nov 22 2007 Ondrej Vasik <ovasik at redhat.com> 0.6.14-13


--- docbook-utils-funcsynopsis.patch DELETED ---