From 6094513beb64774c32722dd3aba2640c5135a597 Mon Sep 17 00:00:00 2001
From: Ondrej Vasik <ovasik@fedoraproject.org>
Date: Dec 05 2007 14:43:24 +0000
Subject: changes for passivetex handling(#366441,#307001), dir only with

    version(without release - #307001) + a bit of specfile rpmlint cleanup

---

diff --git a/docbook-style-xsl.spec b/docbook-style-xsl.spec
index 6664776..81bb16f 100644
--- a/docbook-style-xsl.spec
+++ b/docbook-style-xsl.spec
@@ -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 @@ PreReq: libxml2 >= 2.4.8
 # 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 @@ popd
 %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 @@ done
 %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 @@ rm -rf $DESTDIR
 %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 @@ rm -rf $DESTDIR
 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@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@redhat.com> 1.73.2-2
 - Added PreReq of libxml2(#253962)
 
diff --git a/docbook-xsl-marginleft.patch b/docbook-xsl-marginleft.patch
index e7a5d83..7ae08ae 100644
--- a/docbook-xsl-marginleft.patch
+++ b/docbook-xsl-marginleft.patch
@@ -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>
diff --git a/docbook-xsl-non-constant-expressions.patch b/docbook-xsl-non-constant-expressions.patch
new file mode 100644
index 0000000..53db07e
--- /dev/null
+++ b/docbook-xsl-non-constant-expressions.patch
@@ -0,0 +1,25 @@
+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">
diff --git a/docbook-xsl-pagesetup.patch b/docbook-xsl-pagesetup.patch
index d7b6cd5..f7fa3a4 100644
--- a/docbook-xsl-pagesetup.patch
+++ b/docbook-xsl-pagesetup.patch
@@ -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">
+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: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: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: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: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: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 @@
+-        </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: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: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: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: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: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: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>