--- loncom/build/lpml.dtd	2001/05/06 22:53:30	1.1
+++ loncom/build/lpml.dtd	2001/06/20 12:32:54	1.8
@@ -29,30 +29,82 @@
         --
         >
 
+<!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)>
 <!ELEMENT build (#PCDATA)>
+
+<!-- 
+The trigger attribute of the build element is meant
+to only have one of two possible values:
+  "always run", or
+  "run if dependencies change"
+
+Note that you must type this text exactly in for the
+attribute value to be understood and processed correctly
+by the lpml "make build" parser.
+-->
+<!ELEMENT lpml (file|category|fileglob|directory|rpm|link)+>
+<!ATTLIST build>
+   trigger CDATA #REQUIRED
+>
 <!ELEMENT dependencies (#PCDATA)>
 <!ELEMENT note (#PCDATA)>
 
-<!ELEMENT category (chmod,chown,distribution?)>
+<!ELEMENT category (chmod,chown)>
 <!ATTLIST category
     type CDATA #REQUIRED
     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?,dependencies?)>
+<!ELEMENT link (source,target,categoryname,description?,
+                note?,build?,status?)>
 
-<!ELEMENT file (source,target,categoryname,description?,distribution?)>
 <!ELEMENT fileglob (glob,sourcedir,targetdir,categoryname,
-                    description?,distribution?)>
+                    description?,filenames?)>
+<!ELEMENT filenames (#PCDATA)>
+
+<!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)>
+
+