--- loncom/build/lpml.dtd	2001/05/06 22:53:30	1.1
+++ loncom/build/lpml.dtd	2001/05/15 20:59:34	1.6
@@ -29,12 +29,19 @@
         --
         >
 
+<!ELEMENT categoryname (#PCDATA)>
 <!ELEMENT targetroot (#PCDATA)>
 <!ELEMENT sourceroot (#PCDATA)>
 
 <!ELEMENT target (#PCDATA)>
+<!ATTLIST target
+    dist CDATA #REQUIRED
+    >
 <!ELEMENT source (#PCDATA)>
 <!ELEMENT targetdir (#PCDATA)>
+<!ATTLIST targetdir
+    dist CDATA #REQUIRED
+    >
 <!ELEMENT sourcedir (#PCDATA)>
 <!ELEMENT glob (#PCDATA)>
 <!ELEMENT distribution (#PCDATA)>
@@ -48,11 +55,41 @@
     name CDATA #REQUIRED
     >
 <!ELEMENT chown (#PCDATA)>
+<!ATTLIST chown
+    dist CDATA #REQUIRED
+    >
 <!ELEMENT chmod (#PCDATA)>
-<!ELEMENT distribution (#PCDATA)>
+<!ATTLIST chmod
+    dist CDATA #REQUIRED
+    >
 
-<!ELEMENT directory (targetdir,categoryname,description?,distribution?)>
+<!ELEMENT directory (targetdir,categoryname,description?)>
+<!ATTLIST directory
+    dist CDATA #REQUIRED
+    >
+
+<!ELEMENT file (source,target+,categoryname,description?,
+                note?,build?,status?)>
+<!ELEMENT link (source,target,categoryname,description?,
+                note?,build?,status?)>
 
-<!ELEMENT file (source,target,categoryname,description?,distribution?)>
 <!ELEMENT fileglob (glob,sourcedir,targetdir,categoryname,
                     description?,distribution?)>
+
+<!ELEMENT rpm (rpmSummary,rpmName,rpmVersion,rpmRelease,rpmVendor,
+               rpmBuildRoot,rpmCopyright,rpmGroup,rpmSource,rpmAutoReqProv,
+               rpmdescription,rpmpre)>
+<!ELEMENT rpmSummary (#PCDATA)>
+<!ELEMENT rpmName (#PCDATA)>
+<!ELEMENT rpmVersion (#PCDATA)>
+<!ELEMENT rpmRelease (#PCDATA)>
+<!ELEMENT rpmVendor (#PCDATA)>
+<!ELEMENT rpmBuildRoot (#PCDATA)>
+<!ELEMENT rpmCopyright (#PCDATA)>
+<!ELEMENT rpmGroup (#PCDATA)>
+<!ELEMENT rpmSource (#PCDATA)>
+<!ELEMENT rpmAutoReqProv (#PCDATA)>
+<!ELEMENT rpmdescription (#PCDATA)>
+<!ELEMENT rpmpre (#PCDATA)>
+
+