diff --git a/docbook-style-xsl.spec b/docbook-style-xsl.spec index cba24e2..1f733e1 100644 --- a/docbook-style-xsl.spec +++ b/docbook-style-xsl.spec @@ -1,6 +1,6 @@ Name: docbook-style-xsl Version: 1.74.0 -Release: 2%{?dist} +Release: 3%{?dist} Group: Applications/Text Summary: Norman Walsh's XSL stylesheets for DocBook XML @@ -117,6 +117,9 @@ if [ "$1" = 0 ]; then fi %changelog +* Wed Aug 06 2008 Kamil Dudka 1.74.0-3 +- Rediffed all patches to work with patch --fuzz=0 + * Wed Aug 06 2008 Kamil Dudka 1.74.0-2 - Tiny changes in docbook-xsl-newmethods.patch to work with xalan (#452867) diff --git a/docbook-xsl-list-item-body.patch b/docbook-xsl-list-item-body.patch index bac9441..5338716 100644 --- a/docbook-xsl-list-item-body.patch +++ b/docbook-xsl-list-item-body.patch @@ -1,6 +1,6 @@ -diff -urNp docbook-xsl-1.74.0-orig/fo/lists.xsl docbook-xsl-1.74.0/fo/lists.xsl ---- docbook-xsl-1.74.0-orig/fo/lists.xsl 2008-06-03 13:04:57.000000000 +0200 -+++ docbook-xsl-1.74.0/fo/lists.xsl 2008-06-03 13:09:54.000000000 +0200 +diff -ruNp docbook-xsl-1.74.0.orig/fo/lists.xsl docbook-xsl-1.74.0/fo/lists.xsl +--- docbook-xsl-1.74.0.orig/fo/lists.xsl 2008-08-06 13:32:46.000000000 +0200 ++++ docbook-xsl-1.74.0/fo/lists.xsl 2008-08-06 13:41:27.000000000 +0200 @@ -248,9 +248,17 @@ diff --git a/docbook-xsl-marginleft.patch b/docbook-xsl-marginleft.patch index 7ae08ae..abea63e 100644 --- a/docbook-xsl-marginleft.patch +++ b/docbook-xsl-marginleft.patch @@ -1,5 +1,71 @@ ---- docbook-xsl-1.68.0/fo/pagesetup.xsl.marginleft 2005-02-09 12:09:37.000000000 +0000 -+++ docbook-xsl-1.68.0/fo/pagesetup.xsl 2005-02-09 14:53:59.088068221 +0000 +diff -ruNp docbook-xsl-1.74.0.orig/fo/lists.xsl docbook-xsl-1.74.0/fo/lists.xsl +--- docbook-xsl-1.74.0.orig/fo/lists.xsl 2008-06-01 23:36:39.000000000 +0200 ++++ docbook-xsl-1.74.0/fo/lists.xsl 2008-08-06 13:32:46.000000000 +0200 +@@ -324,7 +324,7 @@ + + + +- ++ + + + +@@ -333,15 +333,7 @@ + + + +- +- +- +- em +- +- +- em * 0.60 +- +- ++ em + + + +@@ -350,15 +342,7 @@ + + + +- +- +- +- em +- +- +- em * 0.60 +- +- ++ em + + + +@@ -372,17 +356,7 @@ + + 1em + +- +- +- +- +- +- +- +- + +- +- +- ++ + + + +diff -ruNp docbook-xsl-1.74.0.orig/fo/pagesetup.xsl docbook-xsl-1.74.0/fo/pagesetup.xsl +--- docbook-xsl-1.74.0.orig/fo/pagesetup.xsl 2008-08-06 13:31:11.000000000 +0200 ++++ docbook-xsl-1.74.0/fo/pagesetup.xsl 2008-08-06 13:32:46.000000000 +0200 @@ -34,29 +34,11 @@ margin-left="{$page.margin.outer} - {$title.margin.left}" --> @@ -32,73 +98,10 @@ ---- docbook-xsl-1.68.0/fo/lists.xsl.marginleft 2005-02-09 12:09:37.000000000 +0000 -+++ docbook-xsl-1.68.0/fo/lists.xsl 2005-02-09 14:55:06.682138599 +0000 -@@ -371,7 +371,7 @@ - - - -- -+ - - - -@@ -380,15 +380,7 @@ - - - -- -- -- -- em -- -- -- em * 0.60 -- -- -+ em - - - -@@ -397,15 +389,7 @@ - - - -- -- -- -- em -- -- -- em * 0.60 -- -- -+ em - - - -@@ -419,17 +403,7 @@ - - 1em - -- -- -- -- -- -- -- -- + -- -- -- -+ - - - ---- docbook-xsl-1.68.0/fo/param.xsl.marginleft 2005-02-09 12:20:55.000000000 +0000 -+++ docbook-xsl-1.68.0/fo/param.xsl 2005-02-09 14:53:59.115063057 +0000 -@@ -95,8 +95,8 @@ +diff -ruNp docbook-xsl-1.74.0.orig/fo/param.xsl docbook-xsl-1.74.0/fo/param.xsl +--- docbook-xsl-1.74.0.orig/fo/param.xsl 2008-06-02 01:06:18.000000000 +0200 ++++ docbook-xsl-1.74.0/fo/param.xsl 2008-08-06 13:32:46.000000000 +0200 +@@ -133,8 +133,8 @@ always @@ -107,5 +110,5 @@ + + false - 0pt - + + diff --git a/docbook-xsl-newmethods.patch b/docbook-xsl-newmethods.patch index 93db5bf..79c2bbe 100644 --- a/docbook-xsl-newmethods.patch +++ b/docbook-xsl-newmethods.patch @@ -1,15 +1,15 @@ -diff -urNp docbook-xsl-1.72.0/html/docbook.xsl devel/html/docbook.xsl ---- docbook-xsl-1.72.0/html/docbook.xsl 2007-01-21 18:39:03.000000000 +0100 -+++ devel/html/docbook.xsl 2007-06-18 13:19:45.000000000 +0200 -@@ -25,6 +25,7 @@ +diff -ruNp docbook-xsl-1.74.0.orig/html/docbook.xsl docbook-xsl-1.74.0/html/docbook.xsl +--- docbook-xsl-1.74.0.orig/html/docbook.xsl 2008-06-01 23:36:39.000000000 +0200 ++++ docbook-xsl-1.74.0/html/docbook.xsl 2008-08-06 13:37:35.000000000 +0200 +@@ -26,6 +26,7 @@ + - -@@ -42,6 +43,7 @@ + +@@ -44,6 +45,7 @@ @@ -17,9 +17,9 @@ diff -urNp docbook-xsl-1.72.0/html/docbook.xsl devel/html/docbook.xsl -diff -urNp docbook-xsl-1.72.0/html/dtbl.xsl devel/html/dtbl.xsl ---- docbook-xsl-1.72.0/html/dtbl.xsl 1970-01-01 01:00:00.000000000 +0100 -+++ devel/html/dtbl.xsl 2007-06-18 14:00:05.000000000 +0200 +diff -ruNp docbook-xsl-1.74.0.orig/html/dtbl.xsl docbook-xsl-1.74.0/html/dtbl.xsl +--- docbook-xsl-1.74.0.orig/html/dtbl.xsl 1970-01-01 01:00:00.000000000 +0100 ++++ docbook-xsl-1.74.0/html/dtbl.xsl 2008-08-06 13:37:35.000000000 +0200 @@ -0,0 +1,293 @@ + + + + -diff -urNp docbook-xsl-1.72.0/html/param.xsl devel/html/param.xsl ---- docbook-xsl-1.72.0/html/param.xsl 2007-01-23 13:33:37.000000000 +0100 -+++ devel/html/param.xsl 2007-06-18 13:26:41.000000000 +0200 +diff -ruNp docbook-xsl-1.74.0.orig/html/param.xsl docbook-xsl-1.74.0/html/param.xsl +--- docbook-xsl-1.74.0.orig/html/param.xsl 2008-06-02 01:06:16.000000000 +0200 ++++ docbook-xsl-1.74.0/html/param.xsl 2008-08-06 13:37:35.000000000 +0200 @@ -64,6 +64,7 @@ div.annotation-close { position: absolut - right: 2px; - } + } - + + http://docbook.sourceforge.net/release/script/AnchorPosition.js http://docbook.sourceforge.net/release/script/PopupWindow.js - http://docbook.sourceforge.net/release/images/annot-open.png - -diff -urNp docbook-xsl-1.72.0/html/table.xsl devel/html/table.xsl ---- docbook-xsl-1.72.0/html/table.xsl 2006-12-06 10:28:33.000000000 +0100 -+++ devel/html/table.xsl 2007-06-18 13:30:00.000000000 +0200 +diff -ruNp docbook-xsl-1.74.0.orig/html/table.xsl docbook-xsl-1.74.0/html/table.xsl +--- docbook-xsl-1.74.0.orig/html/table.xsl 2008-06-01 23:36:39.000000000 +0200 ++++ docbook-xsl-1.74.0/html/table.xsl 2008-08-06 13:37:35.000000000 +0200 @@ -5,7 +5,8 @@ xmlns:xtbl="xalan://com.nwalsh.xalan.Table" xmlns:lxslt="http://xml.apache.org/xslt" @@ -341,7 +338,7 @@ diff -urNp docbook-xsl-1.72.0/html/table.xsl devel/html/table.xsl version='1.0'> -@@ -373,6 +374,9 @@ +@@ -365,6 +366,9 @@ @@ -351,7 +348,7 @@ diff -urNp docbook-xsl-1.72.0/html/table.xsl devel/html/table.xsl -@@ -397,6 +401,9 @@ +@@ -389,6 +393,9 @@ @@ -361,9 +358,9 @@ diff -urNp docbook-xsl-1.72.0/html/table.xsl devel/html/table.xsl -diff -urNp docbook-xsl-1.72.0/lib/dumpfragment.xsl devel/lib/dumpfragment.xsl ---- docbook-xsl-1.72.0/lib/dumpfragment.xsl 1970-01-01 01:00:00.000000000 +0100 -+++ devel/lib/dumpfragment.xsl 2007-06-18 14:00:52.000000000 +0200 +diff -ruNp docbook-xsl-1.74.0.orig/lib/dumpfragment.xsl docbook-xsl-1.74.0/lib/dumpfragment.xsl +--- docbook-xsl-1.74.0.orig/lib/dumpfragment.xsl 1970-01-01 01:00:00.000000000 +0100 ++++ docbook-xsl-1.74.0/lib/dumpfragment.xsl 2008-08-06 13:37:35.000000000 +0200 @@ -0,0 +1,30 @@ + +always always @@ -12,7 +12,7 @@ diff -ur docbook-xsl-1.73.2-orig/fo/param.xsl docbook-xsl-1.73.2/fo/param.xsl false center -@@ -331,8 +331,8 @@ +@@ -334,8 +334,8 @@ set toc,title bold always diff --git a/docbook-xsl-pagesetup.patch b/docbook-xsl-pagesetup.patch index f7fa3a4..e4d77ff 100644 --- a/docbook-xsl-pagesetup.patch +++ b/docbook-xsl-pagesetup.patch @@ -1,10 +1,10 @@ -diff -urp docbook-xsl-1.73.2-orig/fo/pagesetup.xsl docbook-xsl-1.73.2/fo/pagesetup.xsl ---- docbook-xsl-1.73.2-orig/fo/pagesetup.xsl 2007-12-03 14:54:28.000000000 +0100 -+++ docbook-xsl-1.73.2/fo/pagesetup.xsl 2007-12-03 15:24:32.000000000 +0100 -@@ -1679,37 +1679,82 @@ +diff -ruNp docbook-xsl-1.74.0.orig/fo/pagesetup.xsl docbook-xsl-1.74.0/fo/pagesetup.xsl +--- docbook-xsl-1.74.0.orig/fo/pagesetup.xsl 2008-06-01 23:36:39.000000000 +0200 ++++ docbook-xsl-1.74.0/fo/pagesetup.xsl 2008-08-06 13:31:11.000000000 +0200 +@@ -1697,36 +1697,81 @@ - + - - - proportional-column-width( @@ -110,11 +110,10 @@ diff -urp docbook-xsl-1.73.2-orig/fo/pagesetup.xsl docbook-xsl-1.73.2/fo/pageset + + + - + - -@@ -2003,36 +2046,81 @@ +@@ -2021,36 +2066,81 @@