[Libosinfo] [PATCH] sles: Add SLE12 information and other cleanups

[Charles Arnold]

This patch includes entries for sles12 and sled12.
Renamed Suse as SUSE because this is the official spelling.
Renamed vendor as SUSE because Novell has nothing to
do with SUSE.

diff --git a/data/oses/suse.xml.in b/data/oses/suse.xml.in
index 90aeb7f..33329b9 100644
--- a/data/oses/suse.xml.in
+++ b/data/oses/suse.xml.in
@@ -2,18 +2,18 @@
 
   <os id="http://suse.com/sles/9">
     <short-id>sles9</short-id>
-    <_name>Suse Linux Enterprise Server 9</_name>
+    <_name>SUSE Linux Enterprise Server 9</_name>
     <version>9</version>
-    <_vendor>Novell</_vendor>
+    <_vendor>SUSE</_vendor>
     <family>linux</family>
     <distro>sles</distro>
   </os>
 
   <os id="http://suse.com/sles/10">
     <short-id>sles10</short-id>
-    <_name>Suse Linux Enterprise Server 10</_name>
+    <_name>SUSE Linux Enterprise Server 10</_name>
     <version>10</version>
-    <_vendor>Novell</_vendor>
+    <_vendor>SUSE</_vendor>
     <family>linux</family>
     <distro>sles</distro>
     <upgrades id="http://suse.com/sles/9"/>
@@ -21,9 +21,9 @@
 
   <os id="http://suse.com/sles/11">
     <short-id>sles11</short-id>
-    <_name>Suse Linux Enterprise Server 11</_name>
+    <_name>SUSE Linux Enterprise Server 11</_name>
     <version>11</version>
-    <_vendor>Novell</_vendor>
+    <_vendor>SUSE</_vendor>
     <family>linux</family>
     <distro>sles</distro>
     <upgrades id="http://suse.com/sles/10"/>
@@ -34,20 +34,35 @@
     </devices>
   </os>
 
+  <os id="http://suse.com/sles/12">
+    <short-id>sles12</short-id>
+    <_name>SUSE Linux Enterprise Server 12</_name>
+    <version>12</version>
+    <_vendor>SUSE</_vendor>
+    <family>linux</family>
+    <distro>sles</distro>
+    <upgrades id="http://suse.com/sles/11"/>
+
+    <devices>
+      <device id="http://pciids.sourceforge.net/v2.2/pci.ids/1af4/1000"/>
+      <device id="http://pciids.sourceforge.net/v2.2/pci.ids/1af4/1001"/>
+    </devices>
+  </os>
+
   <os id="http://suse.com/sled/9">
     <short-id>sled9</short-id>
-    <_name>Suse Linux Enterprise Desktop 9</_name>
+    <_name>SUSE Linux Enterprise Desktop 9</_name>
     <version>9</version>
-    <_vendor>Novell</_vendor>
+    <_vendor>SUSE</_vendor>
     <family>linux</family>
     <distro>sled</distro>
   </os>
 
   <os id="http://suse.com/sled/10">
     <short-id>sled10</short-id>
-    <_name>Suse Linux Enterprise Desktop 10</_name>
+    <_name>SUSE Linux Enterprise Desktop 10</_name>
     <version>10</version>
-    <_vendor>Novell</_vendor>
+    <_vendor>SUSE</_vendor>
     <family>linux</family>
     <distro>sled</distro>
     <upgrades id="http://suse.com/sled/9"/>
@@ -66,9 +81,9 @@
 
   <os id="http://suse.com/sled/11">
     <short-id>sled11</short-id>
-    <_name>Suse Linux Enterprise Desktop 11</_name>
+    <_name>SUSE Linux Enterprise Desktop 11</_name>
     <version>11</version>
-    <_vendor>Novell</_vendor>
+    <_vendor>SUSE</_vendor>
     <family>linux</family>
     <distro>sled</distro>
     <upgrades id="http://suse.com/sled/10"/>
@@ -85,4 +100,25 @@
     </resources>
   </os>
 
+  <os id="http://suse.com/sled/12">
+    <short-id>sled12</short-id>
+    <_name>SUSE Linux Enterprise Desktop 12</_name>
+    <version>12</version>
+    <_vendor>SUSE</_vendor>
+    <family>linux</family>
+    <distro>sled</distro>
+    <upgrades id="http://suse.com/sled/11"/>
+
+    <resources arch="all">
+      <minimum>
+        <cpu>500000000</cpu>
+        <ram>536870912</ram>
+        <storage>3221225472</storage>
+      </minimum>
+      <recommended>
+        <ram>1073741824</ram>
+      </recommended>
+    </resources>
+  </os>
+
 </libosinfo>