Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=78cc93b4dd7913bae602574a8350ffff9ffb1dbe
commit 78cc93b4dd7913bae602574a8350ffff9ffb1dbe Author: Miklos Vajna <vmik...@frugalware.org> Date: Fri Dec 3 02:15:33 2010 +0100 docbook-utils-0.6.14-2-i686 - add patch to work with newer grep diff --git a/source/apps-extra/docbook-utils/FrugalBuild b/source/apps-extra/docbook-utils/FrugalBuild index fbbb11f..2a07f04 100644 --- a/source/apps-extra/docbook-utils/FrugalBuild +++ b/source/apps-extra/docbook-utils/FrugalBuild @@ -3,15 +3,17 @@ pkgname=docbook-utils pkgver=0.6.14 -pkgrel=1 +pkgrel=2 pkgdesc="A collection of scripts used to convert and analyze SGML and DocBook files." url="http://sources.redhat.com/docbook-tools/"; depends=('perl' 'openjade') groups=('apps-extra') archs=('i686' 'x86_64' 'ppc') up2date="lynx -dump ftp://sources.redhat.com/pub/docbook-tools/new-trials/SOURCES/|grep $pkgname-|Flasttar" -source=(ftp://sources.redhat.com/pub/docbook-tools/new-trials/SOURCES/docbook-utils-$pkgver.tar.gz) -sha1sums=('aae596844930e0e4bb7f8824024be0982cc4fa85') +source=(ftp://sources.redhat.com/pub/docbook-tools/new-trials/SOURCES/docbook-utils-$pkgver.tar.gz \ + docbook-utils-newgrep.patch) +sha1sums=('aae596844930e0e4bb7f8824024be0982cc4fa85' \ + 'a5114bb0b0bcc35347e89c4266934bb1a9b4a949') options=('scriptlet') build() diff --git a/source/apps-extra/docbook-utils/docbook-utils-newgrep.patch b/source/apps-extra/docbook-utils/docbook-utils-newgrep.patch new file mode 100644 index 0000000..b82373e --- /dev/null +++ b/source/apps-extra/docbook-utils/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 $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 + +@@ -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="" _______________________________________________ Frugalware-git mailing list Frugalware-git@frugalware.org http://frugalware.org/mailman/listinfo/frugalware-git
