docs-common/packaging bookinfo.xsl, 1.1, 1.2 rpm-info.dtd, 1.1, 1.2 spec.xsl, 1.3, 1.4
Tommy Reynolds (jtr)
fedora-docs-commits at redhat.com
Sat Nov 26 21:44:32 UTC 2005
Author: jtr
Update of /cvs/docs/docs-common/packaging
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12984/docs-common/packaging
Modified Files:
bookinfo.xsl rpm-info.dtd spec.xsl
Log Message:
Removed top-level "<release>" element. Added "release" and "role='rpm'"
attributes to the changelog info. Changelog elements marked "role='rpm'"
only appear in the RPM %changelog.
Index: bookinfo.xsl
===================================================================
RCS file: /cvs/docs/docs-common/packaging/bookinfo.xsl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- bookinfo.xsl 25 Nov 2005 20:52:52 -0000 1.1
+++ bookinfo.xsl 26 Nov 2005 21:44:24 -0000 1.2
@@ -6,68 +6,68 @@
<xsl:param name="doctype" select="'bookinfo'"/>
<xsl:template match="/">
- <xsl:element name="{$doctype}">
- <title>
- <xsl:call-template name="get-title"/>
- </title>
- <copyright>
- <year>
- <xsl:value-of select="/rpm-info/copyright/year"/>
- </year>
- <xsl:for-each select="/rpm-info/copyright/holder">
- <holder>
- <xsl:value-of select="node()"/>
- </holder>
- </xsl:for-each>
- </copyright>
- <authorgroup>
- <xsl:for-each select="/rpm-info/author">
- <author>
- <xsl:call-template name="human"/>
- </author>
- </xsl:for-each>
- <xsl:for-each select="/rpm-info/translator">
- <othercredit>
- <xsl:call-template name="human"/>
- <personalblurb>Translator</personalblurb>
- </othercredit>
- </xsl:for-each>
- <xsl:for-each select="/rpm-info/editor">
- <editor>
- <xsl:call-template name="human"/>
- </editor>
- </xsl:for-each>
- </authorgroup>
- <xsl:text disable-output-escaping="yes">&LEGALNOTICE;</xsl:text>
- <revhistory>
- <xsl:for-each select="/rpm-info/changelog/revision">
- <revision>
- <revnumber><xsl:value-of select="@version"/></revnumber>
- <date><xsl:value-of select="@date"/></date>
- <authorinitials><xsl:value-of select="author/@initials"/></authorinitials>
- <revdescription>
- <para>
- <xsl:value-of select="details"/>
- </para>
- </revdescription>
- </revision>
- </xsl:for-each>
- </revhistory>
- </xsl:element>
+ <xsl:element name="{$doctype}">
+ <title>
+ <xsl:call-template name="get-title"/>
+ </title>
+ <copyright>
+ <year>
+ <xsl:value-of select="/rpm-info/copyright/year"/>
+ </year>
+ <xsl:for-each select="/rpm-info/copyright/holder">
+ <holder>
+ <xsl:value-of select="node()"/>
+ </holder>
+ </xsl:for-each>
+ </copyright>
+ <authorgroup>
+ <xsl:for-each select="/rpm-info/author">
+ <author>
+ <xsl:call-template name="human"/>
+ </author>
+ </xsl:for-each>
+ <xsl:for-each select="/rpm-info/translator">
+ <othercredit>
+ <xsl:call-template name="human"/>
+ <personalblurb>Translator</personalblurb>
+ </othercredit>
+ </xsl:for-each>
+ <xsl:for-each select="/rpm-info/editor">
+ <editor>
+ <xsl:call-template name="human"/>
+ </editor>
+ </xsl:for-each>
+ </authorgroup>
+ <xsl:text disable-output-escaping="yes">&LEGALNOTICE;</xsl:text>
+ <revhistory>
+ <xsl:for-each select="/rpm-info/changelog/revision[@role != 'rpm']">
+ <revision>
+ <revnumber><xsl:value-of select="@version"/></revnumber>
+ <date><xsl:value-of select="@date"/></date>
+ <authorinitials><xsl:value-of select="author/@initials"/></authorinitials>
+ <revdescription>
+ <para>
+ <xsl:value-of select="details"/>
+ </para>
+ </revdescription>
+ </revision>
+ </xsl:for-each>
+ </revhistory>
+ </xsl:element>
</xsl:template>
<xsl:template name="get-title">
- <xsl:for-each select="/rpm-info/titles/translation">
- <xsl:choose>
- <xsl:when test="@lang = $lang">
- <xsl:value-of select="title"/>
- </xsl:when>
- </xsl:choose>
- </xsl:for-each>
+ <xsl:for-each select="/rpm-info/titles/translation">
+ <xsl:choose>
+ <xsl:when test="@lang = $lang">
+ <xsl:value-of select="title"/>
+ </xsl:when>
+ </xsl:choose>
+ </xsl:for-each>
</xsl:template>
<xsl:template name="human">
- <surname><xsl:value-of select="@surname"/></surname>
- <firstname><xsl:value-of select="@firstname"/></firstname>
+ <surname><xsl:value-of select="@surname"/></surname>
+ <firstname><xsl:value-of select="@firstname"/></firstname>
</xsl:template>
</xsl:stylesheet>
Index: rpm-info.dtd
===================================================================
RCS file: /cvs/docs/docs-common/packaging/rpm-info.dtd,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- rpm-info.dtd 25 Nov 2005 20:52:52 -0000 1.1
+++ rpm-info.dtd 26 Nov 2005 21:44:24 -0000 1.2
@@ -1,16 +1,11 @@
-<!--
- DTD for the Fedora Docs Project RPM Information file "rpm-info.xml"
--->
-
-<!ELEMENT rpm-info (release,author+,translator*,editor*,
- license,copyright+,titles,changelog) >
+<!ELEMENT rpm-info (author+,translator*,editor*, license,copyright+,titles,changelog) >
<!ELEMENT release EMPTY >
<!ATTLIST release rel CDATA #REQUIRED >
-<!ELEMENT license (rights,license.version) >
+<!ELEMENT license (rights,version) >
<!ELEMENT rights (#PCDATA) >
-<!ELEMENT license.version (#PCDATA) >
+<!ELEMENT version (#PCDATA) >
<!ELEMENT copyright (year,holder+) >
<!ELEMENT year (#PCDATA) >
@@ -21,8 +16,7 @@
<!ELEMENT translation (title,desc)* >
<!ATTLIST translation lang CDATA #REQUIRED >
-<!ELEMENT title (#PCDATA) >
-<!ELEMENT version (#PCDATA) >
+<!ELEMENT title (#PCDATA) >
<!ELEMENT desc (#PCDATA) >
<!ELEMENT changelog (revision+) >
@@ -31,6 +25,8 @@
<!ELEMENT revision (author+,editor*,details) >
<!ATTLIST revision date CDATA #REQUIRED >
<!ATTLIST revision version CDATA #REQUIRED >
+<!ATTLIST revision release CDATA #REQUIRED >
+<!ATTLIST revision role (doc|rpm) "doc" >
<!ELEMENT author EMPTY >
<!ATTLIST author wholename CDATA #REQUIRED >
Index: spec.xsl
===================================================================
RCS file: /cvs/docs/docs-common/packaging/spec.xsl,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- spec.xsl 26 Nov 2005 18:29:13 -0000 1.3
+++ spec.xsl 26 Nov 2005 21:44:24 -0000 1.4
@@ -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/release/@rel"/>
-License: <xsl:value-of select="/rpm-info/license/rights"/>
+Release: <xsl:value-of select="/rpm-info/changelog/revision[1]/@release"/>
+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
Source1: %{name}.desktop
@@ -64,7 +64,7 @@
%changelog
<xsl:for-each select="/rpm-info/changelog/revision">
-* <xsl:value-of select="@date"/> - <xsl:value-of select="author/@wholename"/> <<xsl:value-of select="author/@email"/>> - <xsl:value-of select="@version"/>
+* <xsl:value-of select="@date"/> - <xsl:value-of select="author/@wholename"/> <<xsl:value-of select="author/@email"/>> - <xsl:value-of select="@version"/>
- <xsl:value-of select="details"/>
</xsl:for-each>
</xsl:template>
More information about the Fedora-docs-commits
mailing list