Add bliss, jinput, meataxe, symmetrica, vinci, why3, and xgap to F17 and F18.

comps-f17.xml.in

@@ -1228,6 +1228,7 @@
       <packagereq type="optional">utrac</packagereq>
       <packagereq type="optional">virtaal</packagereq>
       <packagereq type="optional">why</packagereq>
+      <packagereq type="optional">why3</packagereq>
       <packagereq type="optional">wxGlade</packagereq>
       <packagereq type="optional">xbsql</packagereq>
       <packagereq type="optional">xfce4-dev-tools</packagereq>
@@ -1634,6 +1635,7 @@
       <packagereq type="optional">automaton</packagereq>
       <packagereq type="optional">automaton-javadoc</packagereq>
       <packagereq type="optional">blas</packagereq>
+      <packagereq type="optional">bliss</packagereq>
       <packagereq type="optional">bowtie</packagereq>
       <packagereq type="optional">bwa</packagereq>
       <packagereq type="optional">cantor</packagereq>
@@ -1706,6 +1708,7 @@
       <packagereq type="optional">Macaulay2</packagereq>
       <packagereq type="optional">malaga</packagereq>
       <packagereq type="optional">maxima-gui</packagereq>
+      <packagereq type="optional">meataxe</packagereq>
       <packagereq type="optional">minisat2</packagereq>
       <packagereq type="optional">mona</packagereq>
       <packagereq type="optional">mona-devel</packagereq>
@@ -1753,18 +1756,21 @@
       <packagereq type="optional">stix-sizes-fonts</packagereq>
       <packagereq type="optional">stix-variants-fonts</packagereq>
       <packagereq type="optional">stp</packagereq>
+      <packagereq type="optional">symmetrica</packagereq>
       <packagereq type="optional">tcd-utils</packagereq>
       <packagereq type="optional">TeXmacs</packagereq>
       <packagereq type="optional">tgif</packagereq>
       <packagereq type="optional">tideEditor</packagereq>
       <packagereq type="optional">vaspview</packagereq>
       <packagereq type="optional">veusz</packagereq>
+      <packagereq type="optional">vinci</packagereq>
       <packagereq type="optional">wcstools</packagereq>
       <packagereq type="optional">wgrib</packagereq>
       <packagereq type="optional">wgrib2</packagereq>
       <packagereq type="optional">wise2</packagereq>
       <packagereq type="optional">wvs-data</packagereq>
       <packagereq type="optional">xdrawchem</packagereq>
+      <packagereq type="optional">xgap</packagereq>
       <packagereq type="optional">xtide</packagereq>
       <packagereq type="optional">zenon</packagereq>
     </packagelist>
@@ -3637,6 +3643,7 @@
       <packagereq type="optional">findbugs</packagereq>
       <packagereq type="optional">findbugs-tools</packagereq>
       <packagereq type="optional">jcip-annotations</packagereq>
+      <packagereq type="optional">jinput</packagereq>
       <packagereq type="optional">jsr-305</packagereq>
       <packagereq type="optional">pmd</packagereq>
     </packagelist>
@@ -3792,7 +3799,7 @@
       <packagereq type="optional">basket</packagereq>
       <packagereq type="optional">bespin</packagereq>
       <packagereq type="optional">bibletime</packagereq>
-      <packagereq type="optional">colord-kde</packagereq>      
+      <packagereq type="optional">colord-kde</packagereq>
       <packagereq type="optional">compiz-kde</packagereq>
       <packagereq type="optional">crystal</packagereq>
       <packagereq type="optional">filelight</packagereq>

comps-f18.xml.in

@@ -1064,6 +1064,7 @@
       <packagereq type="optional">utrac</packagereq>
       <packagereq type="optional">virtaal</packagereq>
       <packagereq type="optional">why</packagereq>
+      <packagereq type="optional">why3</packagereq>
       <packagereq type="optional">wxGlade</packagereq>
       <packagereq type="optional">xbsql</packagereq>
       <packagereq type="optional">xfce4-dev-tools</packagereq>
@@ -1460,6 +1461,7 @@
       <packagereq type="optional">automaton</packagereq>
       <packagereq type="optional">automaton-javadoc</packagereq>
       <packagereq type="optional">blas</packagereq>
+      <packagereq type="optional">bliss</packagereq>
       <packagereq type="optional">bowtie</packagereq>
       <packagereq type="optional">bwa</packagereq>
       <packagereq type="optional">cantor</packagereq>
@@ -1532,6 +1534,7 @@
       <packagereq type="optional">Macaulay2</packagereq>
       <packagereq type="optional">malaga</packagereq>
       <packagereq type="optional">maxima-gui</packagereq>
+      <packagereq type="optional">meataxe</packagereq>
       <packagereq type="optional">minisat2</packagereq>
       <packagereq type="optional">mona</packagereq>
       <packagereq type="optional">mona-devel</packagereq>
@@ -1579,18 +1582,21 @@
       <packagereq type="optional">stix-sizes-fonts</packagereq>
       <packagereq type="optional">stix-variants-fonts</packagereq>
       <packagereq type="optional">stp</packagereq>
+      <packagereq type="optional">symmetrica</packagereq>
       <packagereq type="optional">tcd-utils</packagereq>
       <packagereq type="optional">TeXmacs</packagereq>
       <packagereq type="optional">tgif</packagereq>
       <packagereq type="optional">tideEditor</packagereq>
       <packagereq type="optional">vaspview</packagereq>
       <packagereq type="optional">veusz</packagereq>
+      <packagereq type="optional">vinci</packagereq>
       <packagereq type="optional">wcstools</packagereq>
       <packagereq type="optional">wgrib</packagereq>
       <packagereq type="optional">wgrib2</packagereq>
       <packagereq type="optional">wise2</packagereq>
       <packagereq type="optional">wvs-data</packagereq>
       <packagereq type="optional">xdrawchem</packagereq>
+      <packagereq type="optional">xgap</packagereq>
       <packagereq type="optional">xtide</packagereq>
       <packagereq type="optional">zenon</packagereq>
     </packagelist>
@@ -3278,6 +3284,7 @@
       <packagereq type="optional">findbugs</packagereq>
       <packagereq type="optional">findbugs-tools</packagereq>
       <packagereq type="optional">jcip-annotations</packagereq>
+      <packagereq type="optional">jinput</packagereq>
       <packagereq type="optional">jsr-305</packagereq>
       <packagereq type="optional">pmd</packagereq>
     </packagelist>
@@ -3412,7 +3419,7 @@
       <packagereq type="optional">basket</packagereq>
       <packagereq type="optional">bespin</packagereq>
       <packagereq type="optional">bibletime</packagereq>
-      <packagereq type="optional">colord-kde</packagereq>      
+      <packagereq type="optional">colord-kde</packagereq>
       <packagereq type="optional">compiz-kde</packagereq>
       <packagereq type="optional">crystal</packagereq>
       <packagereq type="optional">filelight</packagereq>