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.

3 files changed, 66 insertions, 70 deletions

diff --git a/packaging/bookinfo.xsl b/packaging/bookinfo.xsl
index 2cc636f..fb740b7 100644
--- a/packaging/bookinfo.xsl
+++ b/packaging/bookinfo.xsl
@@ -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">&amp;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">&amp;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>
diff --git a/packaging/rpm-info.dtd b/packaging/rpm-info.dtd
index 960d862..0081a14 100644
--- a/packaging/rpm-info.dtd
+++ b/packaging/rpm-info.dtd
@@ -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 		>
diff --git a/packaging/spec.xsl b/packaging/spec.xsl
index 948ab54..9b5d126 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/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 @@ done
 
 %changelog
 <xsl:for-each select="/rpm-info/changelog/revision">
-* <xsl:value-of select="@date"/> - <xsl:value-of select="author/@wholename"/> &lt;<xsl:value-of select="author/@email"/>&gt; - <xsl:value-of select="@version"/> 
+* <xsl:value-of select="@date"/> - <xsl:value-of select="author/@wholename"/> &lt;<xsl:value-of select="author/@email"/>&gt; - <xsl:value-of select="@version"/>
 - <xsl:value-of select="details"/>
 </xsl:for-each>
 </xsl:template>