Add sort-and-valiidate.sh to make it easy to prep for commit

sort-and-validate.sh

@@ -0,0 +1,9 @@
+#!/bin/sh
+# Run this to validate and sort all xml files
+# Depends on pungi package and xsltproc
+
+for i in *.xml; do
+	xsltproc --novalid -o "$i.sorted" /usr/share/pungi/comps-cleanup.xsl $i
+	mv $i.sorted $i
+done
+

virtualmin-centos-7-comps.xml

@@ -40,7 +40,6 @@
       <packagereq type="mandatory">iptables</packagereq>
       <packagereq type="mandatory">mod_ssl</packagereq>
       <packagereq type="mandatory">openssl</packagereq>
-      <packagereq type="default">perl-Config-IniFiles</packagereq>
       <packagereq type="mandatory">perl-Crypt-SSLeay</packagereq>
       <packagereq type="mandatory">perl-DBD-MySQL</packagereq>
       <packagereq type="mandatory">perl-JSON-PP</packagereq>
@@ -77,6 +76,7 @@
       <packagereq type="default">mariadb-devel</packagereq>
       <packagereq type="default">mariadb-server</packagereq>
       <packagereq type="default">mod_fcgid</packagereq>
+      <packagereq type="default">perl-Config-IniFiles</packagereq>
       <packagereq type="default">php-opcache</packagereq>
       <packagereq type="default">php-xml</packagereq>
       <packagereq type="default">php-xmlrpc</packagereq>
@@ -105,15 +105,12 @@
     <name>Virtualmin LAMP Stack Minimal</name>
     <description>Virtualmin with Apache, MariaDB, and PHP/Perl/Python/Ruby for low-memory systems</description>
     <packagelist>
-      <packagereq type="default">bind</packagereq>
-      <packagereq type="default">bind-utils</packagereq>
       <packagereq type="mandatory">ca-certificates</packagereq>
       <packagereq type="mandatory">httpd</packagereq>
       <packagereq type="mandatory">httpd-itk</packagereq>
       <packagereq type="mandatory">iptables</packagereq>
       <packagereq type="mandatory">mod_ssl</packagereq>
       <packagereq type="mandatory">openssl</packagereq>
-      <packagereq type="default">perl-Config-IniFiles</packagereq>
       <packagereq type="mandatory">perl-Crypt-SSLeay</packagereq>
       <packagereq type="mandatory">perl-DBD-MySQL</packagereq>
       <packagereq type="mandatory">perl-JSON-PP</packagereq>
@@ -132,11 +129,9 @@
       <packagereq type="mandatory">php-pear</packagereq>
       <packagereq type="mandatory">python</packagereq>
       <packagereq type="mandatory">quota</packagereq>
-      <packagereq type="optional">awstats</packagereq>
+      <packagereq type="default">bind</packagereq>
+      <packagereq type="default">bind-utils</packagereq>
       <packagereq type="default">clamav</packagereq>
-      <packagereq type="optional">clamav-scanner-systemd</packagereq>
-      <packagereq type="optional">clamav-server</packagereq>
-      <packagereq type="optional">clamav-server-systemd</packagereq>
       <packagereq type="default">cyrus-sasl</packagereq>
       <packagereq type="default">cyrus-sasl-gssapi</packagereq>
       <packagereq type="default">dkim-milter</packagereq>
@@ -150,24 +145,29 @@
       <packagereq type="default">mariadb-devel</packagereq>
       <packagereq type="default">mariadb-server</packagereq>
       <packagereq type="default">mod_fcgid</packagereq>
+      <packagereq type="default">perl-Config-IniFiles</packagereq>
       <packagereq type="default">php-opcache</packagereq>
       <packagereq type="default">php-xml</packagereq>
       <packagereq type="default">php-xmlrpc</packagereq>
       <packagereq type="default">postgrey</packagereq>
       <packagereq type="default">procmail-wrapper</packagereq>
       <packagereq type="default">proftpd</packagereq>
-      <packagereq type="optional">ruby</packagereq>
-      <packagereq type="optional">ruby-devel</packagereq>
-      <packagereq type="optional">rubygems</packagereq>
       <packagereq type="default">spamassassin</packagereq>
-      <packagereq type="optional">webalizer</packagereq>
+      <packagereq type="optional">awstats</packagereq>
+      <packagereq type="optional">clamav-scanner-systemd</packagereq>
+      <packagereq type="optional">clamav-server</packagereq>
+      <packagereq type="optional">clamav-server-systemd</packagereq>
       <packagereq type="optional">perl-DBD-Pg</packagereq>
       <packagereq type="optional">php-odbc</packagereq>
       <packagereq type="optional">php-pgsql</packagereq>
       <packagereq type="optional">php-snmp</packagereq>
       <packagereq type="optional">postgresql</packagereq>
       <packagereq type="optional">postgresql-devel</packagereq>
       <packagereq type="optional">postgresql-server</packagereq>
+      <packagereq type="optional">ruby</packagereq>
+      <packagereq type="optional">ruby-devel</packagereq>
+      <packagereq type="optional">rubygems</packagereq>
+      <packagereq type="optional">webalizer</packagereq>
     </packagelist>
   </group>
   <group>
@@ -183,7 +183,6 @@
       <packagereq type="mandatory">iptables</packagereq>
       <packagereq type="mandatory">nginx</packagereq>
       <packagereq type="mandatory">openssl</packagereq>
-      <packagereq type="default">perl-Config-IniFiles</packagereq>
       <packagereq type="mandatory">perl-Crypt-SSLeay</packagereq>
       <packagereq type="mandatory">perl-DBD-MySQL</packagereq>
       <packagereq type="mandatory">perl-JSON-PP</packagereq>
@@ -220,6 +219,7 @@
       <packagereq type="default">mariadb</packagereq>
       <packagereq type="default">mariadb-devel</packagereq>
       <packagereq type="default">mariadb-server</packagereq>
+      <packagereq type="default">perl-Config-IniFiles</packagereq>
       <packagereq type="default">php-odbc</packagereq>
       <packagereq type="default">php-opcache</packagereq>
       <packagereq type="default">php-xml</packagereq>
@@ -248,13 +248,10 @@
     <name>Virtualmin LEMP Stack Minimal</name>
     <description>Virtualmin with nginx, MariaDB, and PHP/Perl/Python/Ruby for low-memory systems</description>
     <packagelist>
-      <packagereq type="default">bind</packagereq>
-      <packagereq type="default">bind-utils</packagereq>
       <packagereq type="mandatory">ca-certificates</packagereq>
-      <packagereq type="mandatory">nginx</packagereq>
       <packagereq type="mandatory">iptables</packagereq>
+      <packagereq type="mandatory">nginx</packagereq>
       <packagereq type="mandatory">openssl</packagereq>
-      <packagereq type="default">perl-Config-IniFiles</packagereq>
       <packagereq type="mandatory">perl-Crypt-SSLeay</packagereq>
       <packagereq type="mandatory">perl-DBD-MySQL</packagereq>
       <packagereq type="mandatory">perl-JSON-PP</packagereq>
@@ -273,11 +270,9 @@
       <packagereq type="mandatory">php-pear</packagereq>
       <packagereq type="mandatory">python</packagereq>
       <packagereq type="mandatory">quota</packagereq>
-      <packagereq type="optional">awstats</packagereq>
+      <packagereq type="default">bind</packagereq>
+      <packagereq type="default">bind-utils</packagereq>
       <packagereq type="default">clamav</packagereq>
-      <packagereq type="optional">clamav-scanner-systemd</packagereq>
-      <packagereq type="optional">clamav-server</packagereq>
-      <packagereq type="optional">clamav-server-systemd</packagereq>
       <packagereq type="default">cyrus-sasl</packagereq>
       <packagereq type="default">cyrus-sasl-gssapi</packagereq>
       <packagereq type="default">dkim-milter</packagereq>
@@ -291,24 +286,29 @@
       <packagereq type="default">mariadb-devel</packagereq>
       <packagereq type="default">mariadb-server</packagereq>
       <packagereq type="default">mod_fcgid</packagereq>
+      <packagereq type="default">perl-Config-IniFiles</packagereq>
       <packagereq type="default">php-opcache</packagereq>
       <packagereq type="default">php-xml</packagereq>
       <packagereq type="default">php-xmlrpc</packagereq>
       <packagereq type="default">postgrey</packagereq>
       <packagereq type="default">procmail-wrapper</packagereq>
       <packagereq type="default">proftpd</packagereq>
-      <packagereq type="optional">ruby</packagereq>
-      <packagereq type="optional">ruby-devel</packagereq>
-      <packagereq type="optional">rubygems</packagereq>
       <packagereq type="default">spamassassin</packagereq>
-      <packagereq type="optional">webalizer</packagereq>
+      <packagereq type="optional">awstats</packagereq>
+      <packagereq type="optional">clamav-scanner-systemd</packagereq>
+      <packagereq type="optional">clamav-server</packagereq>
+      <packagereq type="optional">clamav-server-systemd</packagereq>
       <packagereq type="optional">perl-DBD-Pg</packagereq>
       <packagereq type="optional">php-odbc</packagereq>
       <packagereq type="optional">php-pgsql</packagereq>
       <packagereq type="optional">php-snmp</packagereq>
       <packagereq type="optional">postgresql</packagereq>
       <packagereq type="optional">postgresql-devel</packagereq>
       <packagereq type="optional">postgresql-server</packagereq>
+      <packagereq type="optional">ruby</packagereq>
+      <packagereq type="optional">ruby-devel</packagereq>
+      <packagereq type="optional">rubygems</packagereq>
+      <packagereq type="optional">webalizer</packagereq>
     </packagelist>
   </group>
 </comps>

virtualmin-core-comps.xml

@@ -1,22 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE comps PUBLIC "-//Red Hat, Inc.//DTD Comps info//EN" "comps.dtd">
 <comps>
-
   <group>
-   <id>virtualmincore</id>
-   <default>false</default>
-   <uservisible>true</uservisible>
-   <display_order>1024</display_order>
-   <name>Virtualmin Core</name>
-   <description>Virtualmin core dependencies, including Webmin and Virtualmin and several popular plugins</description>
+    <id>virtualmincore</id>
+    <default>false</default>
+    <uservisible>true</uservisible>
+    <display_order>1024</display_order>
+    <name>Virtualmin Core</name>
+    <description>Virtualmin core dependencies, including Webmin and Virtualmin and several popular plugins</description>
     <packagelist>
+      <packagereq type="mandatory">perl-Log-Log4perl</packagereq>
+      <packagereq type="mandatory">perl-Module-Load</packagereq>
+      <packagereq type="mandatory">perl-parent</packagereq>
+      <packagereq type="mandatory">virtualmin-config</packagereq>
+      <packagereq type="mandatory">wbm-virtual-server</packagereq>
       <packagereq type="mandatory">webmin</packagereq>
       <packagereq type="default">usermin</packagereq>
-      <packagereq type="mandatory">virtualmin-config</packagereq>
       <packagereq type="default">wbm-jailkit</packagereq>
       <packagereq type="default">wbm-php-pear</packagereq>
       <packagereq type="default">wbm-ruby-gems</packagereq>
-      <packagereq type="mandatory">wbm-virtual-server</packagereq>
       <packagereq type="default">wbm-virtualmin-awstats</packagereq>
       <packagereq type="default">wbm-virtualmin-dav</packagereq>
       <packagereq type="default">wbm-virtualmin-git</packagereq>
@@ -25,9 +27,6 @@
       <packagereq type="default">wbm-virtualmin-registrar</packagereq>
       <packagereq type="default">wbm-virtualmin-slavedns</packagereq>
       <packagereq type="default">wbm-virtualmin-sqlite</packagereq>
-      <packagereq type="mandatory">perl-Module-Load</packagereq>
-      <packagereq type="mandatory">perl-Log-Log4perl</packagereq>
-      <packagereq type="mandatory">perl-parent</packagereq>
     </packagelist>
   </group>
 </comps>