docs-common/packaging rpm-info.dtd,1.7,1.8

Author: jtr

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

Modified Files:
	rpm-info.dtd 
Log Message:
Add optional "othername" attribute to <worker>.
Use colophon to specify the copyright holder.
Allow optional translators and editors to be listed in any order 
after the author specification.



Index: rpm-info.dtd
===================================================================
RCS file: /cvs/docs/docs-common/packaging/rpm-info.dtd,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- rpm-info.dtd	29 Dec 2005 17:32:16 -0000	1.7
+++ rpm-info.dtd	30 Dec 2005 02:45:07 -0000	1.8
@@ -1,4 +1,4 @@
-<!ELEMENT rpm-info		(colophon,author+,translator*,editor*,
license,copyright+,titles,changelog)	>
+<!ELEMENT rpm-info		(colophon,author+,(translator|editor)*,
license,copyright+,titles,changelog)	>
 
 <!ELEMENT release		EMPTY					>
 <!ATTLIST release	rel	CDATA		#REQUIRED		>
@@ -9,7 +9,8 @@
 
 <!ELEMENT copyright		(year,holder+)				>
 <!ELEMENT year			(#PCDATA)				>
-<!ELEMENT holder		(#PCDATA)				>
+<!ELEMENT holder		EMPTY					>
+<!ATTLIST holder	worker	IDREF		#REQUIRED		>
 
 <!ELEMENT titles	 	(translation+) 				>
 
@@ -37,6 +38,7 @@
 <!ATTLIST worker  	surname   CDATA   	#REQUIRED 		>
 <!ATTLIST worker  	firstname CDATA   	#REQUIRED 		>
 <!ATTLIST worker  	initials  CDATA		#REQUIRED 		>
+<!ATTLIST worker	othername CDATA		""			>
 
 <!ELEMENT author		EMPTY					>
 <!ATTLIST author	worker	  IDREF		#REQUIRED		>