rpms/docbook-style-xsl/devel .cvsignore, 1.25, 1.26 docbook-style-xsl.spec, 1.58, 1.59 docbook-xsl-marginleft.patch, 1.7, 1.8 sources, 1.25, 1.26

[Ondrej Vasik]

Author: ovasik

Update of /cvs/extras/rpms/docbook-style-xsl/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13690

Modified Files:
	.cvsignore docbook-style-xsl.spec docbook-xsl-marginleft.patch 
	sources 
Log Message:
New upstream release 1.75.0, update marginleft patch


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/docbook-style-xsl/devel/.cvsignore,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -p -r1.25 -r1.26
--- .cvsignore	11 Mar 2009 22:19:47 -0000	1.25
+++ .cvsignore	11 May 2009 09:46:36 -0000	1.26
@@ -1,2 +1,2 @@
-docbook-xsl-1.74.3.tar.bz2
-docbook-xsl-doc-1.74.3.tar.bz2
+docbook-xsl-1.75.0.tar.bz2
+docbook-xsl-doc-1.75.0.tar.bz2


Index: docbook-style-xsl.spec
===================================================================
RCS file: /cvs/extras/rpms/docbook-style-xsl/devel/docbook-style-xsl.spec,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -p -r1.58 -r1.59
--- docbook-style-xsl.spec	11 Mar 2009 22:19:47 -0000	1.58
+++ docbook-style-xsl.spec	11 May 2009 09:46:36 -0000	1.59
@@ -1,5 +1,5 @@
 Name: docbook-style-xsl
-Version: 1.74.3
+Version: 1.75.0
 Release: 1%{?dist}
 Group: Applications/Text
 
@@ -117,6 +117,10 @@ if [ "$1" = 0 ]; then
 fi
 
 %changelog
+* Mon May 11 2009 Ondrej Vasik <ovasik at redhat.com> 1.75.0-1
+- New upstream release 1.75.0
+- update marginleft patch
+
 * Wed Mar 11 2009 Ondrej Vasik <ovasik at redhat.com> 1.74.3-1
 - New upstream release 1.74.3
 

docbook-xsl-marginleft.patch:

Index: docbook-xsl-marginleft.patch
===================================================================
RCS file: /cvs/extras/rpms/docbook-style-xsl/devel/docbook-xsl-marginleft.patch,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- docbook-xsl-marginleft.patch	6 Aug 2008 11:56:12 -0000	1.7
+++ docbook-xsl-marginleft.patch	11 May 2009 09:46:36 -0000	1.8
@@ -63,24 +63,24 @@ diff -ruNp docbook-xsl-1.74.0.orig/fo/li
    </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/pa
  </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>


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/docbook-style-xsl/devel/sources,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -p -r1.25 -r1.26
--- sources	11 Mar 2009 22:19:47 -0000	1.25
+++ sources	11 May 2009 09:46:36 -0000	1.26
@@ -1,2 +1,2 @@
-c77c0c317040b2f2e366842bd9df2218  docbook-xsl-1.74.3.tar.bz2
-2a032a95fbf24367d13acc8210f9cd72  docbook-xsl-doc-1.74.3.tar.bz2
+70b32995e9dfa9b636f6b73babcd3187  docbook-xsl-1.75.0.tar.bz2
+979096e1b04ac0a22f5f9dd2ed0d8e40  docbook-xsl-doc-1.75.0.tar.bz2