rpms/docbook-style-xsl/F-8 docbook-xsl-non-constant-expressions.patch, NONE, 1.1 docbook-style-xsl.spec, 1.39, 1.40 docbook-xsl-marginleft.patch, 1.5, 1.6 docbook-xsl-pagesetup.patch, 1.1, 1.2
Ondrej Vasik (ovasik)
fedora-extras-commits at redhat.com
Wed Dec 5 14:43:57 UTC 2007
Author: ovasik
Update of /cvs/extras/rpms/docbook-style-xsl/F-8
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31461
Modified Files:
docbook-style-xsl.spec docbook-xsl-marginleft.patch
docbook-xsl-pagesetup.patch
Added Files:
docbook-xsl-non-constant-expressions.patch
Log Message:
changes for passivetex handling(#366441,#307001), dir only with version(without release - #307001) + a bit of specfile rpmlint cleanup
docbook-xsl-non-constant-expressions.patch:
--- NEW FILE docbook-xsl-non-constant-expressions.patch ---
diff -ur docbook-xsl-1.73.2-orig/fo/param.xsl docbook-xsl-1.73.2/fo/param.xsl
--- docbook-xsl-1.73.2-orig/fo/param.xsl 2007-12-03 15:49:14.000000000 +0100
+++ docbook-xsl-1.73.2/fo/param.xsl 2007-12-04 15:49:46.000000000 +0100
@@ -23,8 +23,8 @@
<xsl:attribute name="keep-with-next.within-column">always</xsl:attribute>
<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">center</xsl:attribute>
</xsl:attribute-set>
@@ -331,8 +331,8 @@
<xsl:attribute name="font-weight">bold</xsl:attribute>
<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="start-indent">0pt</xsl:attribute>
</xsl:attribute-set>
<xsl:attribute-set name="index.entry.properties">
Index: docbook-style-xsl.spec
===================================================================
RCS file: /cvs/extras/rpms/docbook-style-xsl/F-8/docbook-style-xsl.spec,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- docbook-style-xsl.spec 7 Sep 2007 12:23:48 -0000 1.39
+++ docbook-style-xsl.spec 5 Dec 2007 14:43:24 -0000 1.40
@@ -1,11 +1,11 @@
Name: docbook-style-xsl
Version: 1.73.2
-Release: 2%{?dist}
+Release: 3%{?dist}
Group: Applications/Text
-Summary: Norman Walsh's XSL stylesheets for DocBook XML.
+Summary: Norman Walsh's XSL stylesheets for DocBook XML
-License: Distributable
+License: Freely redistributable without restriction
URL: http://docbook.sourceforge.net/projects/xsl/
Provides: docbook-xsl = %{version}
@@ -17,16 +17,17 @@
# PassiveTeX before 1.21 can't handle the newer stylesheets.
Conflicts: passivetex < 1.21
-BuildRoot: %{_tmppath}/%{name}-%{version}
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
BuildArch: noarch
-Source0: http://prdownloads.sourceforge.net/docbook/docbook-xsl-%{version}.tar.gz
+Source0: http://downloads.sourceforge.net/docbook/docbook-xsl-%{version}.tar.gz
Source1: %{name}.Makefile
-Source2: http://prdownloads.sourceforge.net/docbook/docbook-xsl-doc-%{version}.tar.bz2
+Source2: http://downloads.sourceforge.net/docbook/docbook-xsl-doc-%{version}.tar.bz2
Patch1: docbook-xsl-pagesetup.patch
Patch2: docbook-xsl-marginleft.patch
Patch3: docbook-xsl-newmethods.patch
+Patch4: docbook-xsl-non-constant-expressions.patch
%description
@@ -42,7 +43,9 @@
%patch1 -p1 -b .pagesetup
%patch2 -p1 -b .marginleft
%patch3 -p1 -b .newmethods
+%patch4 -p1 -b .nonconstant
cp %{SOURCE1} Makefile
+
for f in $(find -name "*'*")
do
mv -v "$f" $(echo "$f" | tr -d "'")
@@ -55,8 +58,8 @@
%install
DESTDIR=$RPM_BUILD_ROOT
rm -rf $DESTDIR
-make install BINDIR=$DESTDIR/usr/bin DESTDIR=$DESTDIR/usr/share/sgml/docbook/xsl-stylesheets-%{version}-%{release}
-ln -s xsl-stylesheets-%{version}-%{release} \
+make install BINDIR=$DESTDIR/usr/bin DESTDIR=$DESTDIR/usr/share/sgml/docbook/xsl-stylesheets-%{version}
+ln -s xsl-stylesheets-%{version} \
$DESTDIR/usr/share/sgml/docbook/xsl-stylesheets
# Don't ship the extensions (bug #177256).
@@ -74,7 +77,7 @@
%doc README
%doc TODO
%doc doc
-/usr/share/sgml/docbook/xsl-stylesheets-%{version}-%{release}
+/usr/share/sgml/docbook/xsl-stylesheets-%{version}
/usr/share/sgml/docbook/xsl-stylesheets
@@ -82,25 +85,34 @@
CATALOG=/etc/xml/catalog
/usr/bin/xmlcatalog --noout --add "rewriteSystem" \
"http://docbook.sourceforge.net/release/xsl/%{version}" \
- "file:///usr/share/sgml/docbook/xsl-stylesheets-%{version}-%{release}" $CATALOG
+ "file:///usr/share/sgml/docbook/xsl-stylesheets-%{version}" $CATALOG
/usr/bin/xmlcatalog --noout --add "rewriteURI" \
"http://docbook.sourceforge.net/release/xsl/%{version}" \
- "file:///usr/share/sgml/docbook/xsl-stylesheets-%{version}-%{release}" $CATALOG
+ "file:///usr/share/sgml/docbook/xsl-stylesheets-%{version}" $CATALOG
/usr/bin/xmlcatalog --noout --add "rewriteSystem" \
"http://docbook.sourceforge.net/release/xsl/current" \
- "file:///usr/share/sgml/docbook/xsl-stylesheets-%{version}-%{release}" $CATALOG
+ "file:///usr/share/sgml/docbook/xsl-stylesheets-%{version}" $CATALOG
/usr/bin/xmlcatalog --noout --add "rewriteURI" \
"http://docbook.sourceforge.net/release/xsl/current" \
- "file:///usr/share/sgml/docbook/xsl-stylesheets-%{version}-%{release}" $CATALOG
+ "file:///usr/share/sgml/docbook/xsl-stylesheets-%{version}" $CATALOG
%postun
CATALOG=/etc/xml/catalog
/usr/bin/xmlcatalog --noout --del \
- "file:///usr/share/sgml/docbook/xsl-stylesheets-%{version}-%{release}" $CATALOG
+ "file:///usr/share/sgml/docbook/xsl-stylesheets-%{version}" $CATALOG
%changelog
+* Wed Dec 05 2007 Ondrej Vasik <ovasik at redhat.com> 1.73.2-3
+- change a few non-constant expressions to constant that
+ could now be handled by passivetex(#366441)
+- fixed docbook-xsl-pagesetup.patch to follow Norman Walsh's
+ documentation for nonpassivetex processing(#307001)
+ (use passivetex.extensions = 1 option in param.xsl for
+ processing with passivetex)
+- no longer using release in xsl-stylesheets dir(#389231)
+
* Fri Sep 7 2007 Ondrej Vasik <ovasik at redhat.com> 1.73.2-2
- Added PreReq of libxml2(#253962)
docbook-xsl-marginleft.patch:
Index: docbook-xsl-marginleft.patch
===================================================================
RCS file: /cvs/extras/rpms/docbook-style-xsl/F-8/docbook-xsl-marginleft.patch,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- docbook-xsl-marginleft.patch 9 Feb 2005 14:56:45 -0000 1.5
+++ docbook-xsl-marginleft.patch 5 Dec 2007 14:43:24 -0000 1.6
@@ -104,8 +104,8 @@
<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, 'pt')"/></xsl:attribute>
-+ <xsl:attribute name="space-before.maximum"><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*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="start-indent">0pt</xsl:attribute>
</xsl:attribute-set>
docbook-xsl-pagesetup.patch:
Index: docbook-xsl-pagesetup.patch
===================================================================
RCS file: /cvs/extras/rpms/docbook-style-xsl/F-8/docbook-xsl-pagesetup.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- docbook-xsl-pagesetup.patch 3 Jan 2006 13:47:31 -0000 1.1
+++ docbook-xsl-pagesetup.patch 5 Dec 2007 14:43:24 -0000 1.2
@@ -1,74 +1,228 @@
---- docbook-xsl-1.69.1/fo/pagesetup.xsl.orig 2005-12-10 14:08:28.000000000 -0600
-+++ docbook-xsl-1.69.1/fo/pagesetup.xsl 2006-01-01 19:49:28.000000000 -0600
-@@ -1491,32 +1491,29 @@
-
- <fo:table-column column-number="1">
- <xsl:attribute name="column-width">
-- <xsl:text>proportional-column-width(</xsl:text>
- <xsl:call-template name="header.footer.width">
- <xsl:with-param name="location">header</xsl:with-param>
- <xsl:with-param name="position" select="$column1"/>
- </xsl:call-template>
-- <xsl:text>)</xsl:text>
-+ <xsl:text>%</xsl:text>
- </xsl:attribute>
- </fo:table-column>
- <fo:table-column column-number="2">
- <xsl:attribute name="column-width">
-- <xsl:text>proportional-column-width(</xsl:text>
- <xsl:call-template name="header.footer.width">
- <xsl:with-param name="location">header</xsl:with-param>
- <xsl:with-param name="position" select="2"/>
- </xsl:call-template>
-- <xsl:text>)</xsl:text>
-+ <xsl:text>%</xsl:text>
- </xsl:attribute>
- </fo:table-column>
- <fo:table-column column-number="3">
- <xsl:attribute name="column-width">
-- <xsl:text>proportional-column-width(</xsl:text>
- <xsl:call-template name="header.footer.width">
- <xsl:with-param name="location">header</xsl:with-param>
- <xsl:with-param name="position" select="$column3"/>
- </xsl:call-template>
-- <xsl:text>)</xsl:text>
-+ <xsl:text>%</xsl:text>
- </xsl:attribute>
- </fo:table-column>
-
-@@ -1812,32 +1809,29 @@
+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 @@
+ <xsl:with-param name="gentext-key" select="$gentext-key"/>
+ </xsl:call-template>
+
+- <fo:table-column column-number="1">
+- <xsl:attribute name="column-width">
+- <xsl:text>proportional-column-width(</xsl:text>
+- <xsl:call-template name="header.footer.width">
+- <xsl:with-param name="location">header</xsl:with-param>
+- <xsl:with-param name="position" select="$column1"/>
+- </xsl:call-template>
+- <xsl:text>)</xsl:text>
+- </xsl:attribute>
+- </fo:table-column>
+- <fo:table-column column-number="2">
+- <xsl:attribute name="column-width">
+- <xsl:text>proportional-column-width(</xsl:text>
+- <xsl:call-template name="header.footer.width">
+- <xsl:with-param name="location">header</xsl:with-param>
+- <xsl:with-param name="position" select="2"/>
+- </xsl:call-template>
+- <xsl:text>)</xsl:text>
+- </xsl:attribute>
+- </fo:table-column>
+- <fo:table-column column-number="3">
+- <xsl:attribute name="column-width">
+- <xsl:text>proportional-column-width(</xsl:text>
+- <xsl:call-template name="header.footer.width">
+- <xsl:with-param name="location">header</xsl:with-param>
+- <xsl:with-param name="position" select="$column3"/>
+- </xsl:call-template>
+- <xsl:text>)</xsl:text>
+- </xsl:attribute>
+- </fo:table-column>
++ <xsl:choose>
++ <xsl:when test="$passivetex.extensions != 0">
++ <fo:table-column column-number="1">
++ <xsl:attribute name="column-width">
++ <xsl:call-template name="header.footer.width">
++ <xsl:with-param name="location">header</xsl:with-param>
++ <xsl:with-param name="position" select="$column1"/>
++ </xsl:call-template>
++ <xsl:text>%</xsl:text>
++ </xsl:attribute>
++ </fo:table-column>
++ </xsl:when>
++ <xsl:otherwise>
++ <fo:table-column column-number="1">
++ <xsl:attribute name="column-width">
++ <xsl:text>proportional-column-width(</xsl:text>
++ <xsl:call-template name="header.footer.width">
++ <xsl:with-param name="location">header</xsl:with-param>
++ <xsl:with-param name="position" select="$column1"/>
++ </xsl:call-template>
++ <xsl:text>)</xsl:text>
++ </xsl:attribute>
++ </fo:table-column>
++ </xsl:otherwise>
++ </xsl:choose>
++ <xsl:choose>
++ <xsl:when test="$passivetex.extensions != 0">
++ <fo:table-column column-number="2">
++ <xsl:attribute name="column-width">
++ <xsl:call-template name="header.footer.width">
++ <xsl:with-param name="location">header</xsl:with-param>
++ <xsl:with-param name="position" select="2"/>
++ </xsl:call-template>
++ <xsl:text>%</xsl:text>
++ </xsl:attribute>
++ </fo:table-column>
++ </xsl:when>
++ <xsl:otherwise>
++ <fo:table-column column-number="2">
++ <xsl:attribute name="column-width">
++ <xsl:text>proportional-column-width(</xsl:text>
++ <xsl:call-template name="header.footer.width">
++ <xsl:with-param name="location">header</xsl:with-param>
++ <xsl:with-param name="position" select="2"/>
++ </xsl:call-template>
++ <xsl:text>)</xsl:text>
++ </xsl:attribute>
++ </fo:table-column>
++ </xsl:otherwise>
++ </xsl:choose>
++ <xsl:choose>
++ <xsl:when test="$passivetex.extensions != 0">
++ <fo:table-column column-number="3">
++ <xsl:attribute name="column-width">
++ <xsl:call-template name="header.footer.width">
++ <xsl:with-param name="location">header</xsl:with-param>
++ <xsl:with-param name="position" select="$column3"/>
++ </xsl:call-template>
++ <xsl:text>%</xsl:text>
++ </xsl:attribute>
++ </fo:table-column>
++ </xsl:when>
++ <xsl:otherwise>
++ <fo:table-column column-number="3">
++ <xsl:attribute name="column-width">
++ <xsl:text>proportional-column-width(</xsl:text>
++ <xsl:call-template name="header.footer.width">
++ <xsl:with-param name="location">header</xsl:with-param>
++ <xsl:with-param name="position" select="$column3"/>
++ </xsl:call-template>
++ <xsl:text>)</xsl:text>
++ </xsl:attribute>
++ </fo:table-column>
++ </xsl:otherwise>
++ </xsl:choose>
+
+ <fo:table-body>
+ <fo:table-row>
+ <xsl:attribute name="block-progression-dimension.minimum">
+@@ -2003,36 +2046,81 @@
+ <xsl:with-param name="sequence" select="$sequence"/>
+ <xsl:with-param name="gentext-key" select="$gentext-key"/>
</xsl:call-template>
- <fo:table-column column-number="1">
- <xsl:attribute name="column-width">
+- <fo:table-column column-number="1">
+- <xsl:attribute name="column-width">
- <xsl:text>proportional-column-width(</xsl:text>
- <xsl:call-template name="header.footer.width">
- <xsl:with-param name="location">footer</xsl:with-param>
- <xsl:with-param name="position" select="$column1"/>
- </xsl:call-template>
-- <xsl:text>)</xsl:text>
-+ <xsl:text>%</xsl:text>
- </xsl:attribute>
- </fo:table-column>
- <fo:table-column column-number="2">
- <xsl:attribute name="column-width">
-- <xsl:text>proportional-column-width(</xsl:text>
- <xsl:call-template name="header.footer.width">
- <xsl:with-param name="location">footer</xsl:with-param>
- <xsl:with-param name="position" select="2"/>
- </xsl:call-template>
-- <xsl:text>)</xsl:text>
-+ <xsl:text>%</xsl:text>
- </xsl:attribute>
- </fo:table-column>
- <fo:table-column column-number="3">
- <xsl:attribute name="column-width">
-- <xsl:text>proportional-column-width(</xsl:text>
- <xsl:call-template name="header.footer.width">
- <xsl:with-param name="location">footer</xsl:with-param>
- <xsl:with-param name="position" select="$column3"/>
- </xsl:call-template>
-- <xsl:text>)</xsl:text>
-+ <xsl:text>%</xsl:text>
- </xsl:attribute>
- </fo:table-column>
+- <xsl:call-template name="header.footer.width">
+- <xsl:with-param name="location">footer</xsl:with-param>
+- <xsl:with-param name="position" select="$column1"/>
+- </xsl:call-template>
+- <xsl:text>)</xsl:text>
+- </xsl:attribute>
+- </fo:table-column>
+- <fo:table-column column-number="2">
+- <xsl:attribute name="column-width">
+- <xsl:text>proportional-column-width(</xsl:text>
+- <xsl:call-template name="header.footer.width">
+- <xsl:with-param name="location">footer</xsl:with-param>
+- <xsl:with-param name="position" select="2"/>
+- </xsl:call-template>
+- <xsl:text>)</xsl:text>
+- </xsl:attribute>
+- </fo:table-column>
+- <fo:table-column column-number="3">
+- <xsl:attribute name="column-width">
+- <xsl:text>proportional-column-width(</xsl:text>
+- <xsl:call-template name="header.footer.width">
+- <xsl:with-param name="location">footer</xsl:with-param>
+- <xsl:with-param name="position" select="$column3"/>
+- </xsl:call-template>
+- <xsl:text>)</xsl:text>
+- </xsl:attribute>
+- </fo:table-column>
++ <xsl:choose>
++ <xsl:when test="$passivetex.extensions != 0">
++ <fo:table-column column-number="1">
++ <xsl:attribute name="column-width">
++ <xsl:call-template name="header.footer.width">
++ <xsl:with-param name="location">footer</xsl:with-param>
++ <xsl:with-param name="position" select="$column1"/>
++ </xsl:call-template>
++ <xsl:text>%</xsl:text>
++ </xsl:attribute>
++ </fo:table-column>
++ </xsl:when>
++ <xsl:otherwise>
++ <fo:table-column column-number="1">
++ <xsl:attribute name="column-width">
++ <xsl:text>proportional-column-width(</xsl:text>
++ <xsl:call-template name="header.footer.width">
++ <xsl:with-param name="location">footer</xsl:with-param>
++ <xsl:with-param name="position" select="$column1"/>
++ </xsl:call-template>
++ <xsl:text>)</xsl:text>
++ </xsl:attribute>
++ </fo:table-column>
++ </xsl:otherwise>
++ </xsl:choose>
++ <xsl:choose>
++ <xsl:when test="$passivetex.extensions != 0">
++ <fo:table-column column-number="2">
++ <xsl:attribute name="column-width">
++ <xsl:call-template name="header.footer.width">
++ <xsl:with-param name="location">footer</xsl:with-param>
++ <xsl:with-param name="position" select="2"/>
++ </xsl:call-template>
++ <xsl:text>%</xsl:text>
++ </xsl:attribute>
++ </fo:table-column>
++ </xsl:when>
++ <xsl:otherwise>
++ <fo:table-column column-number="2">
++ <xsl:attribute name="column-width">
++ <xsl:text>proportional-column-width(</xsl:text>
++ <xsl:call-template name="header.footer.width">
++ <xsl:with-param name="location">footer</xsl:with-param>
++ <xsl:with-param name="position" select="2"/>
++ </xsl:call-template>
++ <xsl:text>)</xsl:text>
++ </xsl:attribute>
++ </fo:table-column>
++ </xsl:otherwise>
++ </xsl:choose>
++ <xsl:choose>
++ <xsl:when test="$passivetex.extensions != 0">
++ <fo:table-column column-number="3">
++ <xsl:attribute name="column-width">
++ <xsl:call-template name="header.footer.width">
++ <xsl:with-param name="location">footer</xsl:with-param>
++ <xsl:with-param name="position" select="$column3"/>
++ </xsl:call-template>
++ <xsl:text>%</xsl:text>
++ </xsl:attribute>
++ </fo:table-column>
++ </xsl:when>
++ <xsl:otherwise>
++ <fo:table-column column-number="3">
++ <xsl:attribute name="column-width">
++ <xsl:text>proportional-column-width(</xsl:text>
++ <xsl:call-template name="header.footer.width">
++ <xsl:with-param name="location">footer</xsl:with-param>
++ <xsl:with-param name="position" select="$column3"/>
++ </xsl:call-template>
++ <xsl:text>)</xsl:text>
++ </xsl:attribute>
++ </fo:table-column>
++ </xsl:otherwise>
++ </xsl:choose>
+ <fo:table-body>
+ <fo:table-row>
More information about the fedora-extras-commits
mailing list