rpms/docbook-style-xsl/F-11 .cvsignore, 1.25, 1.26 docbook-style-xsl.spec, 1.61, 1.62 docbook-xsl-marginleft.patch, 1.7, 1.8 sources, 1.25, 1.26 docbook-xsl-fop1extensionpath.patch, 1.1, NONE
Ondrej Vasik
ovasik at fedoraproject.org
Mon Nov 2 09:09:31 UTC 2009
Author: ovasik
Update of /cvs/extras/rpms/docbook-style-xsl/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19963
Modified Files:
.cvsignore docbook-style-xsl.spec docbook-xsl-marginleft.patch
sources
Removed Files:
docbook-xsl-fop1extensionpath.patch
Log Message:
new upstream release 1.75.2 (required for Publican 1.0) - #532258
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/docbook-style-xsl/F-11/.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 2 Nov 2009 09:09:28 -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.2.tar.bz2
+docbook-xsl-doc-1.75.2.tar.bz2
Index: docbook-style-xsl.spec
===================================================================
RCS file: /cvs/extras/rpms/docbook-style-xsl/F-11/docbook-style-xsl.spec,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -p -r1.61 -r1.62
--- docbook-style-xsl.spec 5 Aug 2009 12:54:26 -0000 1.61
+++ docbook-style-xsl.spec 2 Nov 2009 09:09:29 -0000 1.62
@@ -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 at 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 at redhat.com> 1.74.3-2
- Add extension URL to fop1 extension(#505364)
docbook-xsl-marginleft.patch:
docbook-xsl-1.74.0/fo/lists.xsl | 34 ++++------------------------------
docbook-xsl-1.74.0/fo/param.xsl | 4 ++--
docbook-xsl-1.75.0/fo/pagesetup.xsl | 11 +----------
3 files changed, 7 insertions(+), 42 deletions(-)
Index: docbook-xsl-marginleft.patch
===================================================================
RCS file: /cvs/extras/rpms/docbook-style-xsl/F-11/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 2 Nov 2009 09:09:29 -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/F-11/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 2 Nov 2009 09:09:29 -0000 1.26
@@ -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
--- docbook-xsl-fop1extensionpath.patch DELETED ---
More information about the scm-commits
mailing list