added patch to work with grep 2.7 [release 0.6.14-4mamba;Thu Dec 02 2010]
This commit is contained in:
parent
1bd07e1310
commit
88fe08c91c
17
docbook-utils-0.6.14-grep-2.7.patch
Normal file
17
docbook-utils-0.6.14-grep-2.7.patch
Normal file
@ -0,0 +1,17 @@
|
||||
Fix wrong charakter classes no longer missinterpreted by grep-2.7
|
||||
Michael Weber <xmw@gentoo.org>
|
||||
|
||||
--- docbook-utils-0.6.14/bin/jw.in
|
||||
+++ docbook-utils-0.6.14/bin/jw.in
|
||||
@@ -80,9 +80,9 @@
|
||||
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 $RE $SGML_CONF | sed "s/$RE//"`
|
||||
- RE='^[:space:]*SGML_CATALOGS_DIR[:space:]*=[:space:]*'
|
||||
+ RE='^[[:space:]]*SGML_CATALOGS_DIR[[:space:]]*=[[:space:]]*'
|
||||
SGML_CATALOGS_DIR=`grep $RE $SGML_CONF | sed "s/$RE//"`
|
||||
fi
|
||||
|
||||
35
docbook-utils-0.6.14-sgml_catalog.patch
Normal file
35
docbook-utils-0.6.14-sgml_catalog.patch
Normal file
@ -0,0 +1,35 @@
|
||||
diff -Nru docbook-utils-0.6.14.orig/frontends/docbook.in docbook-utils-0.6.14/frontends/docbook.in
|
||||
--- docbook-utils-0.6.14.orig/frontends/docbook.in 2002-11-02 18:45:10.000000000 +0100
|
||||
+++ docbook-utils-0.6.14/frontends/docbook.in 2009-01-07 01:33:15.000000000 +0100
|
||||
@@ -17,20 +17,18 @@
|
||||
head -n 1 |
|
||||
sed 's/^.*DocBook\( XML\)\? V\([0-9][\.0-9]*\).*$/\2/'`
|
||||
SGML_CATALOG=
|
||||
- for f in "${SGML_CATALOGS_DIR}/${SGML_XML}-docbook-${SGML_VERSION}"*".cat"
|
||||
- do
|
||||
- if [ -f "$f" ]
|
||||
- then
|
||||
- SGML_CATALOG=$f
|
||||
- break
|
||||
- fi
|
||||
- done
|
||||
- if [ -z "$SGML_CATALOG" ]
|
||||
+ if [ -f ${SGML_CATALOGS_DIR}/catalog ]
|
||||
then
|
||||
- if [ "${SGML_XML}" != "sgml" ]
|
||||
- then SGML_CATALOG=${SGML_CATALOGS_DIR}/${SGML_XML}-docbook.cat
|
||||
- else SGML_CATALOG=${SGML_CATALOGS_DIR}/catalog
|
||||
- fi
|
||||
+ SGML_CATALOG=${SGML_CATALOGS_DIR}/catalog
|
||||
+ else
|
||||
+ for f in "${SGML_CATALOGS_DIR}/${SGML_XML}-docbook-${SGML_VERSION}"*".cat"
|
||||
+ do
|
||||
+ if [ -f "$f" ]
|
||||
+ then
|
||||
+ SGML_CATALOG=$f
|
||||
+ break
|
||||
+ fi
|
||||
+ done
|
||||
fi
|
||||
echo "$SGML_CATALOG"
|
||||
;;
|
||||
102
docbook-utils.spec
Normal file
102
docbook-utils.spec
Normal file
@ -0,0 +1,102 @@
|
||||
Name: docbook-utils
|
||||
Version: 0.6.14
|
||||
Release: 4mamba
|
||||
Summary: Shell scripts to manage DocBook documents
|
||||
Group: Applications/Publishing
|
||||
Vendor: openmamba
|
||||
Distribution: openmamba
|
||||
Packager: Silvan Calarco <silvan.calarco@mambasoft.it>
|
||||
URL: ftp://sources.redhat.com
|
||||
Source: ftp://sources.redhat.com/pub/docbook-tools/new-trials/SOURCES/docbook-utils-%{version}.tar.gz
|
||||
Patch0: %{name}-0.6.14-sgml_catalog.patch
|
||||
Patch1: %{name}-0.6.14-grep-2.7.patch
|
||||
License: GPL
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-root
|
||||
## AUTOBUILDREQ-BEGIN
|
||||
BuildRequires: perl-devel
|
||||
## AUTOBUILDREQ-END
|
||||
BuildRequires: OpenSP
|
||||
BuildRequires: jadetex
|
||||
BuildRequires: sgml-common
|
||||
BuildRequires: docbook-dtds
|
||||
BuildRequires: docbook-dsssl
|
||||
BuildRequires: openjade
|
||||
Requires: OpenSP
|
||||
Requires: openjade
|
||||
Requires: docbook-dtds
|
||||
Requires: docbook-xsl
|
||||
Requires: docbook-dsssl
|
||||
Requires: /usr/bin/sgmlspl
|
||||
Provides: docbook2man-sgmlspl
|
||||
Obsoletes: docbook2man-sgmlspl
|
||||
Provides: docbook2X
|
||||
Obsoletes: docbook2X
|
||||
|
||||
%description
|
||||
Shell scripts to manage DocBook documents.
|
||||
|
||||
%prep
|
||||
|
||||
%setup -q
|
||||
%patch0 -p1
|
||||
%patch1 -p1
|
||||
|
||||
%build
|
||||
%configure
|
||||
%make -j1 docdir=%{_docdir}
|
||||
|
||||
%install
|
||||
[ "%{buildroot}" != / ] && rm -rf "%{buildroot}"
|
||||
%makeinstall docdir=%{_docdir}
|
||||
|
||||
%clean
|
||||
[ "%{buildroot}" != / ] && rm -rf "%{buildroot}"
|
||||
|
||||
%files
|
||||
%defattr(-,root,root)
|
||||
%{_bindir}/docbook2dvi
|
||||
%{_bindir}/docbook2html
|
||||
%{_bindir}/docbook2man
|
||||
%{_bindir}/docbook2pdf
|
||||
%{_bindir}/docbook2ps
|
||||
%{_bindir}/docbook2rtf
|
||||
%{_bindir}/docbook2tex
|
||||
%{_bindir}/docbook2texi
|
||||
%{_bindir}/docbook2txt
|
||||
%{_bindir}/jw
|
||||
%{_bindir}/sgmldiff
|
||||
%{_datadir}/sgml/docbook/utils-%{version}/backends/*
|
||||
%{_datadir}/sgml/docbook/utils-%{version}/docbook-utils.dsl
|
||||
%{_datadir}/sgml/docbook/utils-%{version}/frontends/docbook
|
||||
%{_datadir}/sgml/docbook/utils-%{version}/helpers/docbook2man-*spec.pl
|
||||
%{_datadir}/sgml/docbook/utils-%{version}/helpers/docbook2texi-*spec.pl
|
||||
%dir %{_docdir}/html/docbook-utils-%{version}
|
||||
%{_docdir}/html/docbook-utils-%{version}/*
|
||||
%{_mandir}/man1/docbook2dvi.1.*
|
||||
%{_mandir}/man1/docbook2html.1.*
|
||||
%{_mandir}/man1/docbook2man.1.*
|
||||
%{_mandir}/man1/docbook2pdf.1.*
|
||||
%{_mandir}/man1/docbook2ps.1.*
|
||||
%{_mandir}/man1/docbook2rtf.1.*
|
||||
%{_mandir}/man1/docbook2tex.1.*
|
||||
%{_mandir}/man1/docbook2texi.1.*
|
||||
%{_mandir}/man1/docbook2man-spec.pl.1.gz
|
||||
%{_mandir}/man1/docbook2texi-spec.pl.1.gz
|
||||
%{_mandir}/man1/jw.1.gz
|
||||
%{_mandir}/man1/sgmldiff.1.gz
|
||||
%{_mandir}/man7/backend-spec.7.gz
|
||||
%{_mandir}/man7/frontend-spec.7.gz
|
||||
%doc AUTHORS COPYING ChangeLog NEWS README TODO
|
||||
|
||||
%changelog
|
||||
* Thu Dec 02 2010 Silvan Calarco <silvan.calarco@mambasoft.it> 0.6.14-4mamba
|
||||
- added patch to work with grep 2.7
|
||||
|
||||
* Wed Jun 02 2010 Silvan Calarco <silvan.calarco@mambasoft.it> 0.6.14-3mamba
|
||||
- added requirement for /usr/bin/sgmlspl
|
||||
|
||||
* Wed Jan 07 2009 Silvan Calarco <silvan.calarco@mambasoft.it> 0.6.14-2mamba
|
||||
- added patch for use of /etc/sgml/catalog as catalog
|
||||
|
||||
* Tue Sep 23 2008 Silvan Calarco <silvan.calarco@mambasoft.it> 0.6.14-1mamba
|
||||
- package created by autospec
|
||||
Loading…
Reference in New Issue
Block a user