auto-import docbook-utils-0.6.9-24 from docbook-utils-0.6.9-24.src.rpm

.cvsignore

@@ -1 +1,2 @@
 docbook-utils-0.6.9.tar.gz
+docbook-utils-automake.tar.gz

db2html

@@ -17,7 +17,7 @@ do
   -n|--nostd|-u|--nochunks)	;;
   -*)				skip=1
 				;;
-  *)	output="$(echo $arg | sed 's,\.sgml$,,;s,\.sgm$,,')"
+  *)	output="$(echo $arg | sed 's,\.sgml$,,;s,\.sgm$,,;s,\.xml,,')"
 	echo "output is $output"
 	break
 	;;

docbook-utils.spec

@@ -1,14 +1,17 @@
 Name: docbook-utils
 Version: 0.6.9
-Release: 2.1.1
+Release: 24
 Group: Applications/Text
 
 Summary: Shell scripts for managing DocBook documents.
+URL: ftp://sources.redhat.com/pub/docbook-tools/new-trials/
 
 License: GPL
 
-Requires: docbook-style-dsssl >= 1.64-2
+Requires: docbook-style-dsssl >= 1.72
+Requires: docbook-dtds
 Requires: perl-SGMLSpm >= 1.03ii
+Requires: which
 
 BuildRoot: %{_tmppath}/%{name}-%{version}
 
@@ -16,13 +19,27 @@ BuildArch: noarch
 Source0: %{name}-%{version}.tar.gz
 Source1: db2html
 Source2: gdp-both.dsl
+Source3: docbook-utils-automake.tar.gz
 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.9-nochunks.patch
+Patch5: docbook-utils-0.6.9-txt.patch
+Patch6: docbook-utils-0.6.9--o.patch
+Patch7: docbook-utils-0.6.9-manpage.patch
+Patch8: docbook-utils-0.6.9-sdata.patch
+Patch9: docbook-utils-0.6.9-help.patch
+Patch10: docbook-utils-0.6.9-ol.patch
+Patch11: docbook-utils-0.6.9--V.patch
+Patch12: docbook-utils-0.6.9-sgml_xml.patch
+Patch13: docbook-utils-0.6.9-excl.patch
+Patch14: docbook-utils-0.6.9-link.patch
+Patch15: docbook-utils-0.6.9-pagesize.patch
+Patch16: docbook-utils-0.6.9-texinputs.patch
 
 Obsoletes: stylesheets
+Provides: stylesheets
 
 
 %Description
@@ -35,7 +52,9 @@ Requires: tetex-dvips jadetex >= 2.5
 Requires: docbook-utils = %{version}
 Group: Applications/Text
 Obsoletes: stylesheets-db2pdf
+Provides: stylesheets-db2pdf
 Summary: A script for converting DocBook documents to PDF format.
+URL: ftp://sources.redhat.com/pub/docbook-tools/new-trials/
 
 %description pdf
 This package contains a script for converting DocBook documents to
@@ -48,13 +67,25 @@ PDF format.
 %patch2 -p1 -b .@
 %patch3 -p1 -b .pdf
 %patch4 -p1 -b .nochunks
+%patch5 -p1 -b .txt
+%patch6 -p1 -b .-o
+%patch7 -p1 -b .manpage
+%patch8 -p1 -b .sdata
+%patch9 -p1 -b .help
+%patch10 -p1 -b .ol
+%patch11 -p1 -b .-V
+%patch12 -p1 -b .sgml_xml
+%patch13 -p1 -b .excl
+%patch14 -p1 -b .link
+%patch15 -p1 -b .pagesize
+%patch16 -p1 -b .texinputs
 
 
 %Build
 
 # Delinkify COPYING
-cat COPYING > COPYING..
+rm COPYING install-sh missing mkinstalldirs
-mv -f COPYING.. COPYING
+tar zxf %{SOURCE3}
 
 ./configure --prefix=%{_prefix} --mandir=%{_mandir}
 make
@@ -63,16 +94,18 @@ make
 %Install
 export DESTDIR=$RPM_BUILD_ROOT
 rm -rf $DESTDIR
-make install prefix=%{_prefix} mandir=%{_mandir} docdir=$DESTDIR/usr/share/doc
+make install prefix=%{_prefix} mandir=%{_mandir} docdir=$DESTDIR%{_docdir}
 for util in dvi html pdf ps rtf
 do
-	ln -s docbook2$util $RPM_BUILD_ROOT/usr/bin/db2$util
+	ln -s docbook2$util $RPM_BUILD_ROOT%{_bindir}/db2$util
 	ln -s jw.1.gz $RPM_BUILD_ROOT/%{_mandir}/man1/db2$util.1
 done
 # db2html is not just a symlink, as it has to create the output directory
-rm -f $RPM_BUILD_ROOT/usr/bin/db2html
+rm -f $RPM_BUILD_ROOT%{_bindir}/db2html
-install -c -m 775 %{SOURCE1} $RPM_BUILD_ROOT/usr/bin/db2html
+install -c -m 775 %{SOURCE1} $RPM_BUILD_ROOT%{_bindir}/db2html
 install -c -m 644 %{SOURCE2} $RPM_BUILD_ROOT/usr/share/sgml/docbook/utils-%{version}/docbook-utils.dsl
+install -c -m 644 %{SOURCE2} $RPM_BUILD_ROOT/usr/share/sgml/docbook/utils-%{version}/docbook-utils-a4.dsl
+perl -pi -e 's/^ "USletter"/ "A4"/' $RPM_BUILD_ROOT/usr/share/sgml/docbook/utils-%{version}/docbook-utils-a4.dsl
 
 %Clean
 DESTDIR=$RPM_BUILD_ROOT
@@ -82,34 +115,107 @@ rm -rf $DESTDIR
 %Files
 %defattr (-,root,root)
 %doc README COPYING TODO
-/usr/bin/jw
+%{_bindir}/jw
-/usr/bin/docbook2dvi
+%{_bindir}/docbook2dvi
-/usr/bin/docbook2html
+%{_bindir}/docbook2html
-/usr/bin/docbook2man
+%{_bindir}/docbook2man
-/usr/bin/docbook2ps
+%{_bindir}/docbook2ps
-/usr/bin/docbook2rtf
+%{_bindir}/docbook2rtf
-/usr/bin/docbook2tex
+%{_bindir}/docbook2tex
-/usr/bin/docbook2texi
+%{_bindir}/docbook2texi
-/usr/bin/docbook2txt
+%{_bindir}/docbook2txt
-/usr/bin/db2dvi
+%{_bindir}/db2dvi
-/usr/bin/db2html
+%{_bindir}/db2html
-/usr/bin/db2ps
+%{_bindir}/db2ps
-/usr/bin/db2rtf
+%{_bindir}/db2rtf
-/usr/bin/sgmldiff
+%{_bindir}/sgmldiff
 /usr/share/sgml/docbook/utils-%{version}
 %{_mandir}/*/*
 
 %files pdf
 %defattr (-,root,root)
-/usr/bin/docbook2pdf
+%{_bindir}/docbook2pdf
-/usr/bin/db2pdf
+%{_bindir}/db2pdf
 
 %changelog
-* Thu Apr 18 2002 Tim Waugh <twaugh@redhat.com> 0.6.9-2.1.1
+* Fri Mar 22 2002 Tim Waugh <twaugh@redhat.com> 0.6.9-24
-- Rebuild.
+- Pick up images from the right place (bug #61652).
 
-* Thu Apr 11 2002 Tim Waugh <twaugh@redhat.com> 0.6.9-2.1
+* Wed Mar  6 2002 Tim Waugh <twaugh@redhat.com> 0.6.9-23
-- Disable use-id-as-filename in gdp-both.dsl.
+- Add URL tags, and provide: stylesheets and stylesheets-pdf (bug #60226).
+
+* Thu Feb 21 2002 Tim Waugh <twaugh@redhat.com> 0.6.9-22
+- Rebuild in new environment.
+
+* Tue Feb  5 2002 Tim Waugh <twaugh@redhat.com> 0.6.9-21
+- Edited the wrong file when making the patch.. fix breakage introduced
+  by trying to fix bug #58375.
+
+* Tue Feb  5 2002 Tim Waugh <twaugh@redhat.com> 0.6.9-20
+- Fix docbook frontend (bug #51478).
+- Make the old db2html script understand the .xml filename extension
+  (bug #59194).
+- Determine page size to use automatically from LC_PAPER (bug #58375).
+
+* Fri Jan 25 2002 Tim Waugh <twaugh@redhat.com> 0.6.9-19
+- Require the DocBook DTDs.
+
+* Tue Jan 22 2002 Tim Waugh <twaugh@redhat.com> 0.6.9-18
+- Fix bug #46913 again, since the last change broke it.
+
+* Sun Jan 20 2002 Tim Waugh <twaugh@redhat.com> 0.6.9-16
+- Several more fixes that will be in the next upstream version.
+
+* Sat Jan 19 2002 Tim Waugh <twaugh@redhat.com> 0.6.9-15
+- Support -V (bug #31518).
+
+* Wed Jan 09 2002 Tim Powers <timp@redhat.com> 0.6.9-14
+- automated rebuild
+
+* Wed Jan  9 2002 Tim Waugh <twaugh@redhat.com> 0.6.9-13
+- Fix generated man output for orderedlists.
+
+* Mon Dec  3 2001 Tim Waugh <twaugh@redhat.com> 0.6.9-12
+- Fix generated man output for funcprototypes with more than one
+  paramdef.
+
+* Wed Nov 28 2001 Tim Waugh <twaugh@redhat.com> 0.6.9-11
+- Rebuild to fix man pages (bug #56449).
+
+* Thu Nov 22 2001 Tim Waugh <twaugh@redhat.com> 0.6.9-10
+- Fix jw behaviour when executed with no parameter.
+- Fix 'jw --help'.
+
+* Wed Nov 14 2001 Tim Waugh <twaugh@redhat.com> 0.6.9-9
+- Actually apply the patch that makes man backend understand &minus;.
+- Also don't redefine <comment> and <remark> for HTML output either.
+
+* Tue Nov 13 2001 Tim Waugh <twaugh@redhat.com> 0.6.9-8
+- Default stylesheet: <comment> and <remark> as rationale markers
+  probably isn't really appropriate for general use.
+- Default stylesheet: larger top margin to make some RTF readers
+  happy (bug #56011).
+- Make man backend understand &minus;.
+- Specfile cleanups (%%{_bindir}, %%{_docdir}).
+
+* Mon Nov 12 2001 Tim Waugh <twaugh@redhat.com> 0.6.9-7
+- The fix for bug #53546 broke '--dsl none'.  Fix it.
+
+* Fri Nov  2 2001 Tim Waugh <twaugh@redhat.com> 0.6.9-6
+- Explicit synopsis for each docbook2[xxx] command in the jw man page.
+- Clean up all temporary files in pdf backend.
+
+* Mon Oct  1 2001 Tim Waugh <twaugh@redhat.com> 0.6.9-5
+- Fix ADDRESS element output (bug #50605).
+
+* Fri Sep 28 2001 Tim Waugh <twaugh@redhat.com> 0.6.9-4
+- Adjust stylesheet so that it works with docbook-dsssl 1.72.
+- Fix jw so that -o and -d can be used together (bug #53546).
+
+* Thu Sep  6 2001 Tim Waugh <twaugh@redhat.com> 0.6.9-3
+- Fix txt backend so that it works.
+- Fix jw so that it uses the HTML stylesheet for text backends.
+- Use links if lynx isn't available, in txt backend.
 
 * Mon Aug 13 2001 Tim Waugh <twaugh@redhat.com> 0.6.9-2
 - Larger bottom margin in gdp-both.dsl to fix RTF output (bug #49677).

gdp-both.dsl

@@ -25,7 +25,9 @@
 ;;#                                                                     #
 ;;#                       This is Version 1.0-4                         #
 ;;#                  patched to fix RTF output (#49677)                 #
-;;#                    disable use-id-as-filename                       #
+;;#                patched to work with docbook-dsssl-1.72              #
+;;#                 patched for ADDRESS output (#50605)                 #
+;;#                      removed comment and remark                     #
 ;;#######################################################################
 -->
 
@@ -252,7 +254,7 @@
 (define %top-margin%
 (if (equal? %visual-acuity% "large-type")
       7.5pi
-      4pi))
+      6pi))
 
 ;;How big do you want the margin at the bottom?
 (define %bottom-margin% 
@@ -455,46 +457,12 @@
 (element SERIESINFO (empty-sosofo))
 (element DOCINFO (empty-sosofo))
 (element ARTHEADER (empty-sosofo))
-(element ADDRESS (empty-sosofo))
+;;(element ADDRESS (empty-sosofo))
 
 ;;Show comment element?
 (define %show-comments%
   #t)
 
-;;Redefine comment for LSB
-(element comment
-  (if %show-comments%
-      (make paragraph
-	start-indent: 0pt
-	first-line-start-indent: -10pt
-	font-posture: 'italic
-	font-size: (* (inherited-font-size) 0.9)
-	(make sequence
-	  (make line-field 
-	    field-width: 10pt
-	    quadding: 'center
-	    (literal "BEGIN RATIONALE:   "))
-	  (process-children))
-	(literal "END RATIONALE:   "))
-      (empty-sosofo)))
-
-;; In DocBook V4.0 comment became remark
-(element remark
-  (if %show-comments%
-      (make paragraph
-	start-indent: 0pt
-	first-line-start-indent: -10pt
-	font-posture: 'italic
-	font-size: (* (inherited-font-size) 0.9)
-	(make sequence
-	  (make line-field 
-	    field-width: 10pt
-	    quadding: 'center
-	    (literal "BEGIN RATIONALE:   "))
-	  (process-children))
-	(literal "END RATIONALE:   "))
-      (empty-sosofo)))
-
 ;;======================================
 ;;Formalpara titles
 ;;======================================
@@ -506,7 +474,7 @@
   ;(make sequence
   ;font-weight: 'bold
   ;($runinhead$))
-  ($lowtitle$ 5))
+  ($lowtitle$ 5 7))
 
 ;;======================================
 ;;Inlines
@@ -572,7 +540,7 @@
 
 ;;Use element ids as filenames?
 (define %use-id-as-filename%
- #f)
+ #t)
 
 
 ;;=========================
@@ -907,30 +875,6 @@
 (define %show-comments%
   #t)
 
-;;Redefine comment element for LSB
-(element comment
-  (if %show-comments%
-      (make element gi: "TABLE"
-	    attributes: ($shade-verbatim-attr$)
-	    (make element gi: "TR"
-		  (make element gi: "TD"
-			(literal "RATIONALE:")
-			(make element gi: "P"
-			      (process-children)))))
-      (empty-sosofo)))
-
-;;In DocBook V4.0 comment became remark
-(element remark
-  (if %show-comments%
-      (make element gi: "TABLE"
-	    attributes: ($shade-verbatim-attr$)
-	    (make element gi: "TR"
-		  (make element gi: "TD"
-			(literal "RATIONALE:")
-			(make element gi: "P"
-			      (process-children)))))
-      (empty-sosofo)))
-
 ;;====================
 ;; General Formatting
 ;;====================

sources

@@ -1 +1,2 @@
 09f6a2026fc1380dcd26be6f547497ac  docbook-utils-0.6.9.tar.gz
+b8cad43ed0adf40780077542aa696288  docbook-utils-automake.tar.gz