diff options
| author | Paul W. Frields <stickster@gmail.com> | 2006-01-07 04:54:47 +0000 |
|---|---|---|
| committer | Paul W. Frields <stickster@gmail.com> | 2006-01-07 04:54:47 +0000 |
| commit | 2ea6f30eca3df0fc6d80f1c1d8f2faebde378660 (patch) | |
| tree | 666ff6be0ee2c82e3705c3c6b9e3082367b0048b /packaging | |
| parent | 6ad363c7b75ce63bae3998b8708525e53d46cbc9 (diff) | |
| download | fedora-doc-utils-2ea6f30eca3df0fc6d80f1c1d8f2faebde378660.tar.gz fedora-doc-utils-2ea6f30eca3df0fc6d80f1c1d8f2faebde378660.tar.xz fedora-doc-utils-2ea6f30eca3df0fc6d80f1c1d8f2faebde378660.zip | |
Slight DTD change per discussion, all XSL checked and verified
Diffstat (limited to 'packaging')
| -rw-r--r-- | packaging/bookinfo.xsl | 2 | ||||
| -rw-r--r-- | packaging/doc-version.xsl | 2 | ||||
| -rw-r--r-- | packaging/info2rpminfo.xsl | 3 | ||||
| -rw-r--r-- | packaging/omf.xsl | 5 | ||||
| -rw-r--r-- | packaging/rpm-info.dtd | 3 | ||||
| -rw-r--r-- | packaging/spec.xsl | 6 |
6 files changed, 8 insertions, 13 deletions
diff --git a/packaging/bookinfo.xsl b/packaging/bookinfo.xsl index 2684860..b5b16d2 100644 --- a/packaging/bookinfo.xsl +++ b/packaging/bookinfo.xsl @@ -55,7 +55,7 @@ <xsl:for-each select="/rpm-info/changelog/revision[@role != 'rpm']"> <xsl:element name="revision"> <xsl:element name="revnumber"> - <xsl:value-of select="@version"/> + <xsl:value-of select="@number"/> </xsl:element> <xsl:element name="date"> <xsl:value-of select="@date"/> diff --git a/packaging/doc-version.xsl b/packaging/doc-version.xsl index b9b888e..3c3c4f3 100644 --- a/packaging/doc-version.xsl +++ b/packaging/doc-version.xsl @@ -5,6 +5,6 @@ <!-- Note: do not indent this file! Any whitespace here will be reproduced in the output --> -<xsl:template match="/"><xsl:value-of select="/rpm-info/changelog/revision[1]/@version"/> +<xsl:template match="/"><xsl:value-of select="/rpm-info/changelog/revision[@role='doc'][1]/@version"/> </xsl:template> </xsl:stylesheet> diff --git a/packaging/info2rpminfo.xsl b/packaging/info2rpminfo.xsl index 25c6dd1..f6c0d73 100644 --- a/packaging/info2rpminfo.xsl +++ b/packaging/info2rpminfo.xsl @@ -93,8 +93,7 @@ <xsl:attribute-set name="revision-atts"> <xsl:attribute name="date"><xsl:value-of select="date"/></xsl:attribute> - <xsl:attribute name="version"><xsl:value-of select="revnumber"/></xsl:attribute> - <xsl:attribute name="release">1</xsl:attribute><!-- For now, a hack --> + <xsl:attribute name="number"><xsl:value-of select="revnumber"/></xsl:attribute> </xsl:attribute-set> <xsl:attribute-set name="revision-worker-atts"> diff --git a/packaging/omf.xsl b/packaging/omf.xsl index b0aedca..8ffcb4b 100644 --- a/packaging/omf.xsl +++ b/packaging/omf.xsl @@ -23,10 +23,7 @@ <date> <xsl:value-of select="/rpm-info/changelog/revision[1]/@date"/> </date> - <version - identifier="{/rpm-info/changelog/revision[1]/@version}" - date="{/rpm-info/changelog/revision[1]/@date}" - description="{$docbase}-{/rpm-info/changelog/revision[1]/@version} ({/rpm-info/changelog/revision[1]/@date})" + <version identifier="{/rpm-info/changelog/revision[@role = 'doc'][1]/@number}" date="{/rpm-info/changelog/revision[@role = 'doc'][1]/@date}" description="{$docbase}-{/rpm-info/changelog/revision[@role = 'doc'][1]/@version} ({/rpm-info/changelog/revision[@role = 'doc'][1]/@date})" /> <subject category="General|Linux|Distributions|Other"/> <description> diff --git a/packaging/rpm-info.dtd b/packaging/rpm-info.dtd index 33e2166..19de2bd 100644 --- a/packaging/rpm-info.dtd +++ b/packaging/rpm-info.dtd @@ -24,8 +24,7 @@ <!ELEMENT revision (author+,editor*,details+) > <!ATTLIST revision date CDATA #REQUIRED > -<!ATTLIST revision version CDATA #REQUIRED > -<!ATTLIST revision release CDATA #REQUIRED > +<!ATTLIST revision number CDATA #REQUIRED > <!ATTLIST revision role (doc|rpm) "doc" > <!ELEMENT colophon (worker+) > diff --git a/packaging/spec.xsl b/packaging/spec.xsl index d081484..c131617 100644 --- a/packaging/spec.xsl +++ b/packaging/spec.xsl @@ -15,8 +15,8 @@ Summary: Fedora Documentation: %{docbase} Name: fedora-doc-%{docbase} -Version: <xsl:value-of select="/rpm-info/changelog/revision[1]/@version"/> -Release: <xsl:value-of select="/rpm-info/changelog/revision[1]/@release"/> +Version: <xsl:value-of select="/rpm-info/changelog/revision[@role = 'doc'][1]/@number"/> +Release: <xsl:value-of select="/rpm-info/changelog/revision[@role = 'rpm'][1]/@number"/> License: <xsl:value-of select="/rpm-info/license/rights"/> (Version <xsl:value-of select="/rpm-info/license/version"/>) Url: http://fedora.redhat.com/projects/docs Source0: %{docbase}-%{version}.src.tar.gz @@ -132,7 +132,7 @@ popd test="@role='rpm'">* <xsl:value-of select="@date"/> - <xsl:call-template name="packager"><xsl:with-param name="who" select="author/@worker"/></xsl:call-template> - <xsl:value-of - select="@version"/>-<xsl:value-of select="@release"/> + select="following-sibling::revision[@role='doc']/@number"/>-<xsl:value-of select="@number"/> - <xsl:value-of select="details"/> </xsl:if></xsl:for-each> |