From c0e0361138a115b690bc40e05ac2709a95987e9f Mon Sep 17 00:00:00 2001
From: Ondrej Vasik <ovasik@fedoraproject.org>
Date: Nov 02 2009 09:09:29 +0000
Subject: new upstream release 1.75.2 (required for Publican 1.0) - #532258


---

diff --git a/.cvsignore b/.cvsignore
index 63c4c36..3a95ce9 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1,2 +1,2 @@
-docbook-xsl-1.74.3.tar.bz2
-docbook-xsl-doc-1.74.3.tar.bz2
+docbook-xsl-1.75.2.tar.bz2
+docbook-xsl-doc-1.75.2.tar.bz2
diff --git a/docbook-style-xsl.spec b/docbook-style-xsl.spec
index 5101619..371d1f9 100644
--- a/docbook-style-xsl.spec
+++ b/docbook-style-xsl.spec
@@ -1,6 +1,6 @@
 Name: docbook-style-xsl
-Version: 1.74.3
-Release: 2%{?dist}
+Version: 1.75.2
+Release: 1%{?dist}
 Group: Applications/Text
 
 Summary: Norman Walsh's XSL stylesheets for DocBook XML
@@ -30,7 +30,6 @@ Patch2: docbook-xsl-marginleft.patch
 Patch3: docbook-xsl-newmethods.patch
 Patch4: docbook-xsl-non-constant-expressions.patch
 Patch5: docbook-xsl-list-item-body.patch
-Patch6: docbook-xsl-fop1extensionpath.patch
 
 
 %description
@@ -48,7 +47,6 @@ popd
 %patch3 -p1 -b .newmethods
 %patch4 -p1 -b .nonconstant
 %patch5 -p1 -b .listitembody
-%patch6 -p1 -b .fop1ext
 
 cp -p %{SOURCE1} Makefile
 
@@ -119,6 +117,11 @@ if [ "$1" = 0 ]; then
 fi
 
 %changelog
+* Mon Nov 02 2009 Ondrej Vasik <ovasik@redhat.com> 1.75.2-1
+- new upstream release 1.75.2 (required for Publican 1.0)
+  (#532258)
+- update marginleft patch
+
 * Wed Aug 05 2009 Ondrej Vasik <ovasik@redhat.com> 1.74.3-2
 - Add extension URL to fop1 extension(#505364)
 
diff --git a/docbook-xsl-fop1extensionpath.patch b/docbook-xsl-fop1extensionpath.patch
deleted file mode 100644
index 68a2802..0000000
--- a/docbook-xsl-fop1extensionpath.patch
+++ /dev/null
@@ -1,10 +0,0 @@
-diff -urNp docbook-xsl-1.74.3-orig/fo/fop1.xsl docbook-xsl-1.74.3/fo/fop1.xsl
---- docbook-xsl-1.74.3-orig/fo/fop1.xsl	2009-01-06 21:04:27.000000000 +0100
-+++ docbook-xsl-1.74.3/fo/fop1.xsl	2009-08-05 14:18:41.000000000 +0200
-@@ -1,5 +1,6 @@
- <?xml version='1.0'?>
- <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-+                xmlns:fox="http://xmlgraphics.apache.org/fop/extensions"
-                 xmlns:fo="http://www.w3.org/1999/XSL/Format"
-                 version='1.0'>
- 
diff --git a/docbook-xsl-marginleft.patch b/docbook-xsl-marginleft.patch
index abea63e..31c1b84 100644
--- a/docbook-xsl-marginleft.patch
+++ b/docbook-xsl-marginleft.patch
@@ -63,24 +63,24 @@ diff -ruNp docbook-xsl-1.74.0.orig/fo/lists.xsl docbook-xsl-1.74.0/fo/lists.xsl
    </xsl:variable>
  
    <xsl:if test="title">
-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}"
- -->
- <xsl:param name="margin.left.outer">
--  <xsl:choose>
--    <xsl:when test="$passivetex.extensions != 0">
--      <xsl:value-of select="$page.margin.outer"/>
--    </xsl:when>
--    <xsl:otherwise>
--      <xsl:value-of select="$page.margin.outer"/>
--      <xsl:text> - </xsl:text>
--      <xsl:value-of select="$title.margin.left"/>
--    </xsl:otherwise>
--  </xsl:choose>
-+  <xsl:value-of select="$page.margin.outer"/>
+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 @@
+ <xsl:attribute-set name="component.title.properties">
+   <xsl:attribute name="keep-with-next.within-column">always</xsl:attribute>
+   <xsl:attribute name="space-before.optimum"><xsl:value-of select="concat($body.font.master, 'pt')"/></xsl:attribute>
+-  <xsl:attribute name="space-before.minimum"><xsl:value-of select="concat($body.font.master, 'pt * 0.8')"/></xsl:attribute>
+-  <xsl:attribute name="space-before.maximum"><xsl:value-of select="concat($body.font.master, 'pt * 1.2')"/></xsl:attribute>
++  <xsl:attribute name="space-before.minimum"><xsl:value-of select="concat($body.font.master*0.8, 'pt')"/></xsl:attribute>
++  <xsl:attribute name="space-before.maximum"><xsl:value-of select="concat($body.font.master*1.2, 'pt')"/></xsl:attribute>
+   <xsl:attribute name="hyphenate">false</xsl:attribute>
+   <xsl:attribute name="text-align">
+     <xsl:choose>
+diff -urNp docbook-xsl-1.75.0-orig/fo/pagesetup.xsl docbook-xsl-1.75.0/fo/pagesetup.xsl
+--- docbook-xsl-1.75.0-orig/fo/pagesetup.xsl	2009-05-11 11:40:49.000000000 +0200
++++ docbook-xsl-1.75.0/fo/pagesetup.xsl	2009-05-11 11:42:29.000000000 +0200
+@@ -30,16 +30,7 @@
  </xsl:param>
  
  <xsl:param name="margin.left.inner">
@@ -98,17 +98,3 @@ diff -ruNp docbook-xsl-1.74.0.orig/fo/pagesetup.xsl docbook-xsl-1.74.0/fo/pagese
  </xsl:param>
  
  <xsl:template name="setup.pagemasters">
-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 @@
- <xsl:attribute-set name="component.title.properties">
-   <xsl:attribute name="keep-with-next.within-column">always</xsl:attribute>
-   <xsl:attribute name="space-before.optimum"><xsl:value-of select="concat($body.font.master, 'pt')"/></xsl:attribute>
--  <xsl:attribute name="space-before.minimum"><xsl:value-of select="concat($body.font.master, 'pt * 0.8')"/></xsl:attribute>
--  <xsl:attribute name="space-before.maximum"><xsl:value-of select="concat($body.font.master, 'pt * 1.2')"/></xsl:attribute>
-+  <xsl:attribute name="space-before.minimum"><xsl:value-of select="concat($body.font.master*0.8, 'pt')"/></xsl:attribute>
-+  <xsl:attribute name="space-before.maximum"><xsl:value-of select="concat($body.font.master*1.2, 'pt')"/></xsl:attribute>
-   <xsl:attribute name="hyphenate">false</xsl:attribute>
-   <xsl:attribute name="text-align">
-     <xsl:choose>
diff --git a/sources b/sources
index 3e8e4f5..de6fc42 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-c77c0c317040b2f2e366842bd9df2218  docbook-xsl-1.74.3.tar.bz2
-2a032a95fbf24367d13acc8210f9cd72  docbook-xsl-doc-1.74.3.tar.bz2
+0c76a58a8e6cb5ab49f819e79917308f  docbook-xsl-1.75.2.tar.bz2
+0a59c4c1796683fca32881c221df0b16  docbook-xsl-doc-1.75.2.tar.bz2