Author: pfrields
Update of /cvs/docs/docs-common/packaging
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22621
Modified Files:
rpm-info.dtd
Log Message:
Updated DTD to hopefully simplify life a little, or maybe just for fun
Index: rpm-info.dtd
===================================================================
RCS file: /cvs/docs/docs-common/packaging/rpm-info.dtd,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- rpm-info.dtd 26 Nov 2005 21:44:24 -0000 1.2
+++ rpm-info.dtd 27 Nov 2005 17:58:25 -0000 1.3
@@ -19,33 +19,28 @@
<!ELEMENT title (#PCDATA) >
<!ELEMENT desc (#PCDATA) >
-<!ELEMENT changelog (revision+) >
+<!ELEMENT changelog ((docrevision|pkgrevision)+) >
<!ATTLIST changelog order (newest-first) #REQUIRED >
-<!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 >
-<!ATTLIST author email CDATA #REQUIRED >
-<!ATTLIST author surname CDATA #REQUIRED >
-<!ATTLIST author firstname CDATA #REQUIRED >
-<!ATTLIST author initials CDATA #REQUIRED >
-
-<!ELEMENT editor EMPTY >
-<!ATTLIST editor wholename CDATA #REQUIRED >
-<!ATTLIST editor email CDATA #REQUIRED >
-<!ATTLIST editor surname CDATA #REQUIRED >
-<!ATTLIST editor firstname CDATA #REQUIRED >
-
-
-<!ELEMENT translator EMPTY >
-<!ATTLIST translator wholename CDATA #REQUIRED >
-<!ATTLIST translator email CDATA #REQUIRED >
-<!ATTLIST translator surname CDATA #REQUIRED >
-<!ATTLIST translator firstname CDATA #REQUIRED >
+<!ELEMENT docrevision (date,docversion,initials,details+) >
+<!ELEMENT docversion (#PCDATA) >
+
+<!ELEMENT pkgrevision (date,pkgversion,pkgrelease,wholename,email,details+)
>
+<!-- pkgversion will often key off docversion, but not necessarily -->
+<!ELEMENT pkgversion (#PCDATA) >
+<!ELEMENT pkgrelease (#PCDATA) >
+
+<!-- used in both docrevision and pkgrevision elements -->
+<!ELEMENT date (#PCDATA) >
+<!ELEMENT details (#PCDATA) >
+
+<!ELEMENT author (wholename,email,surname,firstname,initials) >
+<!ELEMENT editor (wholename,email,surname,firstname) >
+<!ELEMENT translator (wholename,email,surname,firstname) >
+
+<!ELEMENT wholename (#PCDATA) >
+<!ELEMENT email (#PCDATA) >
+<!ELEMENT surname (#PCDATA) >
+<!ELEMENT firstname (#PCDATA) >
+<!ELEMENT initials (#PCDATA) >
-<!ELEMENT details (#PCDATA) >
Show replies by date