update to 0.6.15 [release 0.6.15-1mamba;Thu Nov 14 2024]

docbook-utils-0.6.14-grep-2.7.patch

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

docbook-utils-0.6.14-grepnocolors.patch

@@ -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

docbook-utils-0.6.14-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 --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=""

docbook-utils-0.6.14-nofinalecho.patch

@@ -0,0 +1,12 @@
+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-05-31 16:21:46.379401250 +0200
++++ docbook-utils-0.6.14/bin/jw.in	2010-05-31 16:23:55.348413466 +0200
+@@ -438,5 +438,7 @@ cd "$SGML_CURRENT_DIRECTORY"
+ if [ $SGML_RETURN -gt 0 ]
+ then exit `expr 7 + $SGML_RETURN`
+ fi
+-echo "Done."
++#Final echo commented out, it causes manpage noise when generating some
++#manpages with new perl(#513271, #587012)
++#echo "Done."
+ exit 0

docbook-utils-0.6.14-papersize.patch

@@ -0,0 +1,12 @@
+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	2009-10-07 14:41:19.000000000 +0200
++++ docbook-utils-0.6.14/bin/jw.in	2009-10-07 14:45:22.000000000 +0200
+@@ -368,7 +368,7 @@ case "$SGML_OPTIONS" in
+ 	fi
+ 	if [ -n "$papersize" ]
+ 	then
+-	  SGML_OPTIONS="-V paper-type=$papersize $SGML_OPTIONS"
++	  SGML_OPTIONS="-V %paper-type%=$papersize $SGML_OPTIONS"
+ 	fi
+ 	;;
+ esac

docbook-utils-0.6.14-rtfmanpage.patch

@@ -0,0 +1,15 @@
+diff -urNp docbook-utils-0.6.14-orig/doc/man/jw.1 docbook-utils-0.6.14/doc/man/jw.1
+--- docbook-utils-0.6.14-orig/doc/man/jw.1	2004-02-11 15:16:21.000000000 +0100
++++ docbook-utils-0.6.14/doc/man/jw.1	2009-08-13 10:44:03.000000000 +0200
+@@ -192,6 +192,11 @@ by calling \fBJade\fR or
+ \fBOpenJade\fR\&. The resulting file can
+ then be inported into \fBMS Word\fR
+ or one of its Linux replacement programs.
++
++\fBNote\fR - The original picture must be
++present when RTF document is viewed, because
++the RTF documents created by \fBOpenJade\fR
++includes pictures by reference.
+ .TP
+ \fB\fItex\fB\fR
+ Converts to TeX by calling \fBJade\fR or

docbook-utils-0.6.14-sgml_catalog.patch

@@ -1,35 +0,0 @@
-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"
- 	;;

docbook-utils-0.6.14-sgmlinclude.patch

@@ -0,0 +1,24 @@
+diff -urNp docbook-utils-0.6.14-orig/backends/man.in docbook-utils-0.6.14/backends/man.in
+--- docbook-utils-0.6.14-orig/backends/man.in	2009-07-24 15:17:42.000000000 +0200
++++ docbook-utils-0.6.14/backends/man.in	2009-07-24 15:20:57.000000000 +0200
+@@ -7,7 +7,7 @@ HELPER=$SGML_BASE_DIR/docbook/utils-@VER
+ TMPDIR=`mktemp -d /tmp/man.XXXXXX` || \
+  { echo >&2 "man backend: could not create secure temporary directory"; exit 1;}
+ trap 'rm -rf "${TMPDIR}"' EXIT
+-nsgmls "$SGML_FILE" > "${TMPDIR}/nsgmls.tmp"
++nsgmls ${SGML_INCLUDE} "$SGML_FILE" > "${TMPDIR}/nsgmls.tmp"
+ sgmlspl $HELPER <"${TMPDIR}/nsgmls.tmp" 2>"${TMPDIR}/errs"
+ if [ $? -ne 0 ]
+ then
+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	2009-07-24 15:17:42.000000000 +0200
++++ docbook-utils-0.6.14/bin/jw.in	2009-07-24 15:18:51.000000000 +0200
+@@ -423,7 +423,7 @@ echo "Using catalogs: `echo $SGML_CATALO
+ echo "Using stylesheet: $SGML_STYLESHEET"
+ echo "Working on: $SGML_FILE"
+ cd "$SGML_OUTPUT_DIRECTORY"
+-export SGML_JADE SGML_FILE_NAME SGML_ARGUMENTS
++export SGML_JADE SGML_FILE_NAME SGML_ARGUMENTS SGML_INCLUDE
+ export SGML_CATALOG_FILES SGML_BASE_DIR SGML_FILE SGML_STYLESHEET
+ NOCHUNKS=`echo $SGML_OPTIONS | grep nochunks`
+ if [ -z "$NOCHUNKS" ]

docbook-utils-0.6.14-w3mtxtconvert.patch

@@ -0,0 +1,12 @@
+diff -urNp original/txt new/txt
+--- original/backends/txt	2007-11-05 18:44:52.000000000 +0100
++++ new/backends/txt	2007-11-22 15:21:36.000000000 +0100
+@@ -13,7 +13,7 @@ then
+ elif [ -x /usr/bin/w3m ]
+ then
+   CONVERT=/usr/bin/w3m
+-  ARGS="-dump"
++  ARGS="-T text/html -dump"
+ else
+   echo >&2 "No way to convert HTML to text found."
+   exit 1

docbook-utils.spec

@@ -1,17 +1,25 @@
 Name:          docbook-utils
-Version:       0.6.14
-Release:       6mamba
+Version:       0.6.15
+Release:       1mamba
 Summary:       Shell scripts to manage DocBook documents
 Group:         Applications/Publishing
 Vendor:        openmamba
 Distribution:  openmamba
 Packager:      Silvan Calarco <silvan.calarco@mambasoft.it>
-URL:           https://www.sourceware.org/docbook-tools/
-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
+URL:           https://github.com/devexp-db/docbook-utils
+Source:        https://github.com/devexp-db/docbook-utils.git/v%{version}/docbook-utils-%{version}.tar.bz2
+Source1:       gdp-both.dsl
+Source2:       docbook2man-spec.pl
+Patch4:        docbook-utils-0.6.14-w3mtxtconvert.patch
+Patch5:        docbook-utils-0.6.14-grepnocolors.patch
+Patch6:        docbook-utils-0.6.14-sgmlinclude.patch
+Patch7:        docbook-utils-0.6.14-rtfmanpage.patch
+Patch8:        docbook-utils-0.6.14-papersize.patch
+Patch9:        docbook-utils-0.6.14-nofinalecho.patch
+Patch10:       docbook-utils-0.6.14-newgrep.patch
 License:       GPL
 ## AUTOBUILDREQ-BEGIN
+BuildRequires: perl-SGMLSpm
 BuildRequires: perl-devel
 ## AUTOBUILDREQ-END
 BuildRequires: OpenSP
@@ -28,25 +36,33 @@ Requires:      docbook-dsssl
 Requires:      /usr/bin/sgmlspl
 Provides:      docbook2man-sgmlspl
 Obsoletes:     docbook2man-sgmlspl <= 0.6.14-5mamba
-Provides:      docbook2X
-Obsoletes:     docbook2X <= 0.6.14-5mamba
 
 %description
 Shell scripts to manage DocBook documents.
 
 %prep
 %setup -q
-%patch0 -p1
-%patch1 -p1
+
+autoreconf -f -i
 
 %build
 %configure
+
 %make -j1 docdir=%{_docdir}
 
 %install
 [ "%{buildroot}" != / ] && rm -rf "%{buildroot}"
 %makeinstall docdir=%{_docdir}
 
+for util in dvi html pdf ps rtf; do
+	ln -s docbook2$util %{buildroot}%{_bindir}/db2$util
+	ln -s jw.1.gz %{buildroot}%{_mandir}/man1/db2$util.1
+done
+ln -s jw.1.gz %{buildroot}%{_mandir}/man1/docbook2txt.1
+
+install -p -m 644 %{SOURCE1} %{buildroot}%{_datadir}/sgml/docbook/utils-%{version}/docbook-utils.dsl
+install -p -m 755 %{SOURCE2} %{buildroot}%{_datadir}/sgml/docbook/utils-%{version}/helpers/docbook2man-spec.pl
+ 
 %clean
 [ "%{buildroot}" != / ] && rm -rf "%{buildroot}"
 
@@ -61,6 +77,7 @@ Shell scripts to manage DocBook documents.
 %{_bindir}/docbook2tex
 %{_bindir}/docbook2texi
 %{_bindir}/docbook2txt
+%{_bindir}/db2*
 %{_bindir}/jw
 %{_bindir}/sgmldiff
 %{_datadir}/sgml/docbook/utils-%{version}/backends/*
@@ -80,6 +97,8 @@ Shell scripts to manage DocBook documents.
 %{_mandir}/man1/docbook2texi.1.*
 %{_mandir}/man1/docbook2man-spec.pl.1*
 %{_mandir}/man1/docbook2texi-spec.pl.1*
+%{_mandir}/man1/docbook2txt.1*
+%{_mandir}/man1/db2*.1*
 %{_mandir}/man1/jw.1*
 %{_mandir}/man1/sgmldiff.1*
 %{_mandir}/man7/backend-spec.7*
@@ -88,6 +107,15 @@ Shell scripts to manage DocBook documents.
 #ChangeLog NEWS README TODO
 
 %changelog
+* Thu Nov 14 2024 Silvan Calarco <silvan.calarco@mambasoft.it> 0.6.15-1mamba
+- update to 0.6.15
+
+* Sun Oct 24 2021 Silvan Calarco <silvan.calarco@mambasoft.it> 0.6.14-8mamba
+- also replace docbook-utils.dsl and docbook2man-spec.pl from Fedora
+
+* Wed Jun 30 2021 Silvan Calarco <silvan.calarco@mambasoft.it> 0.6.14-7mamba
+- added fedora patches
+
 * Tue Jun 01 2021 Silvan Calarco <silvan.calarco@mambasoft.it> 0.6.14-6mamba
 - rebuilt