rpms/docbook-style-xsl/devel .cvsignore, 1.21, 1.22 docbook-style-xsl.spec, 1.46, 1.47 docbook-xsl-list-item-body.patch, 1.1, 1.2 sources, 1.21, 1.22
Ondrej Vasik (ovasik)
fedora-extras-commits at redhat.com
Tue Jun 3 11:17:40 UTC 2008
Author: ovasik
Update of /cvs/extras/rpms/docbook-style-xsl/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13035
Modified Files:
.cvsignore docbook-style-xsl.spec
docbook-xsl-list-item-body.patch sources
Log Message:
New upstream version 1.74.0 + adapted patch
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/docbook-style-xsl/devel/.cvsignore,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- .cvsignore 5 Sep 2007 11:30:11 -0000 1.21
+++ .cvsignore 3 Jun 2008 11:16:45 -0000 1.22
@@ -1,3 +1,2 @@
-docbook-xsl-1.73.1.tar.gz
-docbook-xsl-1.73.2.tar.gz
-docbook-xsl-doc-1.73.2.tar.bz2
+docbook-xsl-1.74.0.tar.gz
+docbook-xsl-doc-1.74.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.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- docbook-style-xsl.spec 14 Dec 2007 12:26:22 -0000 1.46
+++ docbook-style-xsl.spec 3 Jun 2008 11:16:45 -0000 1.47
@@ -1,6 +1,6 @@
Name: docbook-style-xsl
-Version: 1.73.2
-Release: 9%{?dist}
+Version: 1.74.0
+Release: 1%{?dist}
Group: Applications/Text
Summary: Norman Walsh's XSL stylesheets for DocBook XML
@@ -117,6 +117,9 @@
fi
%changelog
+* Tue Jun 03 2008 Ondrej Vasik <ovasik at redhat.com> 1.74.0-1
+- New upstream release 1.74.0, adapted patches
+
* Fri Dec 14 2007 Ondrej Vasik <ovasik at redhat.com> 1.73.2-9
- added fixes for passivetex extension and list-item-body
(#161371)
docbook-xsl-list-item-body.patch:
Index: docbook-xsl-list-item-body.patch
===================================================================
RCS file: /cvs/extras/rpms/docbook-style-xsl/devel/docbook-xsl-list-item-body.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- docbook-xsl-list-item-body.patch 14 Dec 2007 12:26:22 -0000 1.1
+++ docbook-xsl-list-item-body.patch 3 Jun 2008 11:16:45 -0000 1.2
@@ -1,7 +1,7 @@
-diff -urNp docbook-xsl-1.73.2-orig/fo/lists.xsl docbook-xsl-1.73.2/fo/lists.xsl
---- docbook-xsl-1.73.2-orig/fo/lists.xsl 2007-12-14 12:27:58.000000000 +0100
-+++ docbook-xsl-1.73.2/fo/lists.xsl 2007-12-14 12:43:25.000000000 +0100
-@@ -286,9 +286,17 @@
+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
+@@ -248,9 +248,17 @@
</fo:block>
</fo:list-item-label>
<fo:list-item-body start-indent="body-start()">
@@ -22,35 +22,36 @@
</fo:list-item-body>
</xsl:variable>
-@@ -484,9 +492,17 @@
+@@ -446,10 +454,18 @@
</fo:block>
</fo:list-item-label>
<fo:list-item-body start-indent="body-start()">
- <fo:block>
- <xsl:apply-templates select="listitem"/>
- </fo:block>
+- </fo:list-item-body>
+ <xsl:choose>
+ <!-- * work around broken passivetex list-item-body rendering -->
+ <xsl:when test="$passivetex.extensions = '1'">
-+ <xsl:apply-templates select="listitem"/>
++ <xsl:apply-templates/>
+ </xsl:when>
+ <xsl:otherwise>
+ <fo:block>
-+ <xsl:apply-templates select="listitem"/>
++ <xsl:apply-templates/>
+ </fo:block>
+ </xsl:otherwise>
+ </xsl:choose>
- </fo:list-item-body>
++ </fo:list-item-body>
</xsl:variable>
-@@ -963,10 +979,18 @@
+ <xsl:choose>
+@@ -925,9 +941,17 @@
</fo:block>
</fo:list-item-label>
<fo:list-item-body start-indent="body-start()">
- <fo:block>
- <xsl:apply-templates/>
- </fo:block>
-- </fo:list-item-body>
+ <xsl:choose>
+ <!-- * work around broken passivetex list-item-body rendering -->
+ <xsl:when test="$passivetex.extensions = '1'">
@@ -62,11 +63,10 @@
+ </fo:block>
+ </xsl:otherwise>
+ </xsl:choose>
-+ </fo:list-item-body>
+ </fo:list-item-body>
</fo:list-item>
</xsl:template>
-
-@@ -989,9 +1013,17 @@
+@@ -951,9 +975,17 @@
</fo:block>
</fo:list-item-label>
<fo:list-item-body start-indent="body-start()">
@@ -87,7 +87,7 @@
</fo:list-item-body>
</fo:list-item>
</xsl:template>
-@@ -1168,9 +1200,17 @@
+@@ -1141,9 +1173,17 @@
</fo:block>
</fo:list-item-label>
<fo:list-item-body start-indent="body-start()">
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/docbook-style-xsl/devel/sources,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- sources 5 Sep 2007 11:30:11 -0000 1.21
+++ sources 3 Jun 2008 11:16:45 -0000 1.22
@@ -1,2 +1,2 @@
-7dd72a38c7d25e1396fa26b6ee53eae9 docbook-xsl-1.73.2.tar.gz
-d41ce59b783b60383cca765902a41039 docbook-xsl-doc-1.73.2.tar.bz2
+c9afc756e127ac91486ad28748b679c3 docbook-xsl-1.74.0.tar.gz
+3a38cdcfadfacd75ebd1ab6c423d4fd6 docbook-xsl-doc-1.74.0.tar.bz2
More information about the fedora-extras-commits
mailing list