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

require grep,gawk, fix jw script to work even with color=always GREP_OPTION set (#473278), finish drop of funcsynopsis patch

Browse Source
This commit is contained in:
Ondrej Vasik 2008-11-28 10:41:54 +00:00
parent 5aad9b2415
commit d4245531fa
3 changed files with 31 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
docbook-utils-funcsynopsis.patch
View File

@ -1,16 +0,0 @@
--- docbook-utils-0.6.14/helpers/docbook2man-spec.pl.0 2007-04-24 16:19:56.000000000 +0200
+++ docbook-utils-0.6.14/helpers/docbook2man-spec.pl 2007-04-24 16:21:23.000000000 +0200
@@ -418,11 +418,13 @@
man_sgml('<FUNCSYNOPSIS>', sub {
man_output("\n.sp\n");
+ man_output("\n.nf\n");
bold_on();
});
man_sgml('</FUNCSYNOPSIS>', sub {
font_off();
man_output("\n");
+ man_output("\n.fi\n");
});
man_sgml('<CMDSYNOPSIS>', "\n\n");

15
docbook-utils-grepnocolors.patch Normal file
View File

@ -0,0 +1,15 @@
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

27
docbook-utils.spec
View File

@ -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 @@ License: GPLv2+
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 @@ Obsoletes: stylesheets <= %{version}-%{release}
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 @@ PDF format.
%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 @@ rm -rf $RPM_BUILD_ROOT
%{_mandir}/*/docbook2dvi.*
%{_mandir}/*/docbook2ps.*
%changelog
%changelog
* Fri Nov 28 2008 Ondrej Vasik <ovasik@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@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@redhat.com> 0.6.14-13