docs-common/packaging bookinfo.xsl, 1.10, 1.11 doc-version.xsl, 1.1, 1.2 info2rpminfo.xsl, 1.5, 1.6 omf.xsl, 1.1, 1.2 spec.xsl, 1.12, 1.13 rpm-info.dtd, 1.11, 1.12

[Paul W. Frields (pfrields)]

Author: pfrields

Update of /cvs/docs/docs-common/packaging
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8352/docs-common/packaging

Modified Files:
	bookinfo.xsl doc-version.xsl info2rpminfo.xsl omf.xsl spec.xsl 
	rpm-info.dtd 
Log Message:
Slight DTD change per discussion, all XSL checked and verified


Index: bookinfo.xsl
===================================================================
RCS file: /cvs/docs/docs-common/packaging/bookinfo.xsl,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- bookinfo.xsl	7 Jan 2006 03:14:41 -0000	1.10
+++ bookinfo.xsl	7 Jan 2006 04:54:47 -0000	1.11
@@ -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"/>


Index: doc-version.xsl
===================================================================
RCS file: /cvs/docs/docs-common/packaging/doc-version.xsl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- doc-version.xsl	6 Jan 2006 19:18:32 -0000	1.1
+++ doc-version.xsl	7 Jan 2006 04:54:47 -0000	1.2
@@ -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>


Index: info2rpminfo.xsl
===================================================================
RCS file: /cvs/docs/docs-common/packaging/info2rpminfo.xsl,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- info2rpminfo.xsl	7 Jan 2006 01:18:06 -0000	1.5
+++ info2rpminfo.xsl	7 Jan 2006 04:54:47 -0000	1.6
@@ -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">


Index: omf.xsl
===================================================================
RCS file: /cvs/docs/docs-common/packaging/omf.xsl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- omf.xsl	25 Nov 2005 20:52:52 -0000	1.1
+++ omf.xsl	7 Jan 2006 04:54:47 -0000	1.2
@@ -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>


Index: spec.xsl
===================================================================
RCS file: /cvs/docs/docs-common/packaging/spec.xsl,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- spec.xsl	30 Dec 2005 16:56:33 -0000	1.12
+++ spec.xsl	7 Jan 2006 04:54:47 -0000	1.13
@@ -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 @@
 	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>


Index: rpm-info.dtd
===================================================================
RCS file: /cvs/docs/docs-common/packaging/rpm-info.dtd,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- rpm-info.dtd	2 Jan 2006 20:49:58 -0000	1.11
+++ rpm-info.dtd	7 Jan 2006 04:54:47 -0000	1.12
@@ -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+)				>