diff --git a/.cvsignore b/.cvsignore index 7c11a0b..5d1b15c 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -docbook-xsl-1.61.2.tar.gz +docbook-xsl-1.64.1.tar.gz diff --git a/docbook-style-xsl.Makefile b/docbook-style-xsl.Makefile index 49c6c21..cfb5887 100644 --- a/docbook-style-xsl.Makefile +++ b/docbook-style-xsl.Makefile @@ -14,9 +14,7 @@ install-xsl: cp fo/*.xsl $(DESTDIR)/fo cp html/*.xml $(DESTDIR)/html cp html/*.xsl $(DESTDIR)/html - cp htmlhelp/*.xml $(DESTDIR)/htmlhelp cp htmlhelp/*.xsl $(DESTDIR)/htmlhelp -# cp htmlhelp/doc/*.xml $(DESTDIR)/htmlhelp/doc cp javahelp/*.xsl $(DESTDIR)/javahelp cp lib/lib.xsl $(DESTDIR)/lib cp template/README $(DESTDIR)/template diff --git a/docbook-style-xsl.spec b/docbook-style-xsl.spec index 03ea5b9..8d5cfcf 100644 --- a/docbook-style-xsl.spec +++ b/docbook-style-xsl.spec @@ -1,6 +1,6 @@ Name: docbook-style-xsl -Version: 1.61.2 -Release: 2.1 +Version: 1.64.1 +Release: 6 Group: Applications/Text Summary: Norman Walsh's XSL stylesheets for DocBook XML. @@ -21,7 +21,9 @@ BuildArch: noarch Source0: http://prdownloads.sourceforge.net/docbook/docbook-xsl-%{version}.tar.gz Source1: %{name}.Makefile -Patch0: docbook-xsl-1.61.0-hyphens.patch +Patch1: docbook-xsl-manpages.patch +Patch2: docbook-xsl-marginleft.patch +Patch3: docbook-xsl-listblock.patch %description @@ -31,7 +33,9 @@ other formats, such as HTML, FO, and XHMTL. They are highly customizable. %prep %setup -q -n docbook-xsl-%{version} -%patch0 -p1 -b .hyphens +%patch1 -p1 -b .manpages +%patch2 -p1 -b .marginleft +%patch3 -p1 -b .listblock cp %{SOURCE1} Makefile @@ -87,6 +91,43 @@ CATALOG=/etc/xml/catalog %changelog +* Tue Jan 20 2004 Tim Waugh 1.64.1-6 +- Fix last margin-left fix (bug #113456). +- Reduce instances of itemized/ordered lists having misalignments. + +* Sun Jan 18 2004 Tim Waugh 1.64.1-5 +- And another (bug #113456). + +* Thu Jan 15 2004 Tim Waugh 1.64.1-4 +- Fixed another instance of bug #113456 in lists layout. + +* Wed Jan 14 2004 Tim Waugh 1.64.1-3 +- Hard-code the margin-left work around to expect passivetex (bug #113456). + +* Wed Dec 24 2003 Tim Waugh 1.64.1-2 +- Another manpage fix. + +* Fri Dec 19 2003 Tim Waugh 1.64.1-1 +- 1.64.1. + +* Thu Dec 18 2003 Tim Waugh 1.64.0-2 +- Another manpage fix. + +* Tue Dec 16 2003 Tim Waugh 1.64.0-1 +- 1.64.0. + +* Fri Dec 12 2003 Tim Waugh 1.62.4-3 +- Use the fr.xml from 1.62.1 (bug #111989). + +* Thu Dec 11 2003 Tim Waugh 1.62.4-2 +- Manpages fixes. + +* Thu Dec 11 2003 Tim Waugh 1.62.4-1 +- 1.62.4. +- No longer need hyphens patch. +- Avoid expressions in margin-left attributes, since passivetex does not + understand them. + * Fri Jul 4 2003 Tim Waugh 1.61.2-2.1 - Rebuilt. diff --git a/docbook-xsl-marginleft.patch b/docbook-xsl-marginleft.patch new file mode 100644 index 0000000..9850e55 --- /dev/null +++ b/docbook-xsl-marginleft.patch @@ -0,0 +1,73 @@ +--- docbook-xsl-1.64.1/fo/pagesetup.xsl.marginleft 2003-12-17 00:57:36.000000000 +0000 ++++ docbook-xsl-1.64.1/fo/pagesetup.xsl 2004-01-18 16:29:32.000000000 +0000 +@@ -34,29 +34,11 @@ + margin-left="{$page.margin.outer} - {$title.margin.left}" + --> + +- +- +- +- +- +- +- - +- +- +- ++ + + + +- +- +- +- +- +- +- - +- +- +- ++ + + + +--- docbook-xsl-1.64.1/fo/lists.xsl.marginleft 2003-12-04 20:13:46.000000000 +0000 ++++ docbook-xsl-1.64.1/fo/lists.xsl 2004-01-18 16:31:51.000000000 +0000 +@@ -303,7 +303,7 @@ + + + +- ++ + + + +@@ -312,7 +312,7 @@ + + + +- em * 0.60 ++ em + + + +@@ -321,7 +321,7 @@ + + + +- em * 0.60 ++ em + + + +@@ -348,8 +348,7 @@ + |processing-instruction()[not(preceding-sibling::varlistentry)]"/> + + +