Author: pfrields
Update of /cvs/docs/docs-common/packaging In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12620/packaging
Modified Files: bookinfo.xsl insert-changelog.xsl Log Message: Use new rule to locate docs-common and rely on this for most building, instead of a possibly nonexistent FDPDIR. This should make a module inclusion or a full repository checkout equally workable.
Index: bookinfo.xsl =================================================================== RCS file: /cvs/docs/docs-common/packaging/bookinfo.xsl,v retrieving revision 1.29 retrieving revision 1.30 diff -u -r1.29 -r1.30 --- bookinfo.xsl 25 Nov 2006 01:24:43 -0000 1.29 +++ bookinfo.xsl 12 Mar 2007 00:08:35 -0000 1.30 @@ -4,7 +4,7 @@ <xsl:param name="lang" select="'en'"/> <xsl:param name="doctype" select="'bookinfo'"/> <xsl:param name="who" select="''"/> - <xsl:param name="fdpdir" select="'../..'"/> + <xsl:param name="fdpcommondir" select="'..'"/> <xsl:param name="legalbase" select="'legalnotice-opl'"/>
<xsl:output encoding="UTF-8" indent="yes" method="xml" @@ -71,7 +71,7 @@ <xsl:element name="xi:include" namespace="http://www.w3.org/2001/XInclude%22%3E<xsl:attribute name="href"><xsl:value-of - select="$fdpdir"/>/docs-common/common/<xsl:value-of + select="$fdpcommondir"/>/common/<xsl:value-of select="$legalbase"/>-<xsl:value-of select="$lang"/>.xml</xsl:attribute></xsl:element> </xsl:when> @@ -79,7 +79,7 @@ <xsl:element name="xi:include" namespace="http://www.w3.org/2001/XInclude%22%3E<xsl:attribute name="href">xsl:value-of - select="$fdpdir"//docs-common/common/legalnotice-xsl:value-of + select="$fdpcommondir"//common/legalnotice-<xsl:value-of select="$lang"/>.xml</xsl:attribute></xsl:element> </xsl:otherwise> </xsl:choose>
Index: insert-changelog.xsl =================================================================== RCS file: /cvs/docs/docs-common/packaging/insert-changelog.xsl,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- insert-changelog.xsl 11 Mar 2007 20:43:13 -0000 1.7 +++ insert-changelog.xsl 12 Mar 2007 00:08:35 -0000 1.8 @@ -16,11 +16,11 @@
<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform%22%3E
- <xsl:param name="fdpdir" select="'../..'"/> + <xsl:param name="fdpcommondir" select="'..'"/>
<xsl:output encoding="UTF-8" indent="yes" method="xml" omit-xml-declaration="no" standalone="no" version="1.0" - doctype-system="{$fdpdir}/docs-common/packaging/rpm-info.dtd"/> + doctype-system="{$fdpcommondir}/packaging/rpm-info.dtd"/>
<xsl:template match="/"> xsl:apply-templates/