From f00d7fd5710227dd53ac7348158fc4feb947ff45 Mon Sep 17 00:00:00 2001 From: cvsdist Date: Thu, 9 Sep 2004 04:20:22 +0000 Subject: [PATCH] auto-import docbook-utils-0.6.9-1 from docbook-utils-0.6.9-1.src.rpm --- .cvsignore | 2 +- db2html | 7 ++++++- docbook-utils.spec | 36 +++++++++++++++++++++++++----------- gdp-both.dsl | 3 +-- sources | 2 +- 5 files changed, 34 insertions(+), 16 deletions(-) diff --git a/.cvsignore b/.cvsignore index bc4057c..dad2349 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -docbook-utils-0.6.tar.gz +docbook-utils-0.6.9.tar.gz diff --git a/db2html b/db2html index 45e52db..9f8a0c1 100755 --- a/db2html +++ b/db2html @@ -1,7 +1,10 @@ #! /bin/sh + +ADMON_GRAPHICS=/usr/share/sgml/docbook/dsssl-stylesheets/images/*.gif + output=docbook2html-dir skip=0 -for arg in $* +for arg in "$@" do if [ $skip -gt 0 ] then @@ -26,4 +29,6 @@ then mv ${output} ${output}.junk fi mkdir ${output} +mkdir ${output}/stylesheet-images +cp ${ADMON_GRAPHICS} ${output}/stylesheet-images jw -f docbook -b html -o ${output} "$@" diff --git a/docbook-utils.spec b/docbook-utils.spec index 1a64cc3..c66ff77 100644 --- a/docbook-utils.spec +++ b/docbook-utils.spec @@ -1,13 +1,13 @@ Name: docbook-utils -Version: 0.6 -Release: 13.2p +Version: 0.6.9 +Release: 1 Group: Applications/Text Summary: Shell scripts to manage DocBook documents. License: GPL -Requires: docbook-style-dsssl >= 1.49 +Requires: docbook-style-dsssl >= 1.64-2 Requires: perl-SGMLSpm >= 1.03ii BuildRoot: %{_tmppath}/%{name}-%{version} @@ -20,7 +20,7 @@ Patch0: docbook-utils-0.6-..patch Patch1: jw-custom.patch Patch2: docbook-utils-0.6-@.patch Patch3: docbook-utils-0.6-pdf.patch -Patch4: docbook-utils-0.6-perl.patch +Patch4: docbook-utils-0.6.9-nochunks.patch Obsoletes: stylesheets @@ -45,10 +45,15 @@ This package contains a script to convert DocBook documents to PDF. %patch1 -p1 -b .custom %patch2 -p1 -b .@ %patch3 -p1 -b .pdf -%patch4 -p1 -b .perl +%patch4 -p1 -b .nochunks %Build + +# Delinkify COPYING +cat COPYING > COPYING.. +mv -f COPYING.. COPYING + ./configure --prefix=%{_prefix} --mandir=%{_mandir} make @@ -56,7 +61,7 @@ make %Install export DESTDIR=$RPM_BUILD_ROOT rm -rf $DESTDIR -make install prefix=$DESTDIR/%{_prefix} mandir=$DESTDIR/%{_mandir} docdir=/usr/share/doc +make install prefix=%{_prefix} mandir=%{_mandir} docdir=$DESTDIR/usr/share/doc for util in dvi html pdf ps rtf do ln -s docbook2$util $RPM_BUILD_ROOT/usr/bin/db2$util @@ -98,13 +103,22 @@ rm -rf $DESTDIR /usr/bin/db2pdf %changelog -* Fri Apr 26 2002 Tim Waugh 0.6-13.2 -- Make sgmldiff work. +* Tue Jul 3 2001 Tim Waugh 0.6.9-1 +- 0.6.9. +- With --nochunks, send output to a file instead of stdout (bug #46913). -* Thu Apr 11 2002 Tim Waugh 0.6-13.1 -- Disable use-id-as-filename in gdp-both.dsl. +* Mon Jun 4 2001 Tim Waugh 0.6.8-2 +- Make sure COPYING isn't installed as a symlink. -* Sat Mar 24 2001 Tim Waugh +* Mon May 21 2001 Tim Waugh 0.6.8-1 +- 0.6.8. + +* Mon May 21 2001 Tim Waugh 0.6-14 +- db2html: copy admon graphics to output directory (bug #40143). +- Require docbook-style-dsssl 1.64-2 for symbolic link used by db2html. +- db2html: handle arguments with spaces better. + +* Sat Mar 24 2001 Tim Waugh 0.6-13 - Fix man pages (bug #32820). * Mon Mar 12 2001 Tim Waugh diff --git a/gdp-both.dsl b/gdp-both.dsl index a156b93..fdfa66c 100644 --- a/gdp-both.dsl +++ b/gdp-both.dsl @@ -24,7 +24,6 @@ ;;# and rename it cygnus-both.dsl # ;;# # ;;# This is Version 1.0-4 # -;;# disable use-id-as-filename # ;;####################################################################### --> @@ -571,7 +570,7 @@ ;;Use element ids as filenames? (define %use-id-as-filename% - #f) + #t) ;;========================= diff --git a/sources b/sources index 156f3ce..3631473 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -1a792344ff14bafb65f7025acd7d1f04 docbook-utils-0.6.tar.gz +09f6a2026fc1380dcd26be6f547497ac docbook-utils-0.6.9.tar.gz