[Libosinfo] [osinfo-db PATCH] centos7: Add CentOS 7 entry

[Fabiano Fidêncio]

"centos7" is the preferred way to display and advertise CentOS 7, mainly
because CentOS does not support pointing releases at all.

After talking with Jim Perrin, a CentOS board member, we've decided that
the change from centos7.0 to centos7 would be the way to go.

As we can't break backward compatibility, we can't just rename
centos-7.0.xml.in to centos-7.xml.in and adjust the bits accordingly.
Knowing that, the path to take is creating a new centos-7.xml.in entry
that contains exactly the same content of centos-7.0.xml.in, adjust the
bits in the new entry and change centos-7.0 to "clone" centos-7.

Although this is not the most elegant solution, it ensures we properly
advertise CentOS in the way its community wants and also do not break
backward compatibility.

Signed-off-by: Fabiano Fidêncio <fabiano at fidencio.org>
---
 data/os/centos.org/centos-7.0.xml.in |  4 +-
 data/os/centos.org/centos-7.xml.in   | 86 ++++++++++++++++++++++++++++++++++++
 2 files changed, 89 insertions(+), 1 deletion(-)
 create mode 100644 data/os/centos.org/centos-7.xml.in

diff --git a/data/os/centos.org/centos-7.0.xml.in b/data/os/centos.org/centos-7.0.xml.in
index 7fc6d8d..bbfeb48 100644
--- a/data/os/centos.org/centos-7.0.xml.in
+++ b/data/os/centos.org/centos-7.0.xml.in
@@ -1,6 +1,8 @@
 <libosinfo version="0.0.1">
 <!-- Licensed under the GNU General Public License version 2 or later.
      See http://www.gnu.org/licenses/ for a copy of the license text -->
+
+  <!-- Please, keep both centos-7.xml.in and centos-7.0.xml.in in sync -->
   <os id="http://centos.org/centos/7.0">
     <short-id>centos7.0</short-id>
     <_name>CentOS 7.0</_name>
@@ -9,7 +11,7 @@
     <family>linux</family>
     <distro>centos</distro>
     <upgrades id="http://centos.org/centos/6.5"/>
-    <clones id="http://redhat.com/rhel/7.6"/>
+    <clones id="http://centos.org/centos/7"/>
 
     <release-date>2014-07-07</release-date>
 
diff --git a/data/os/centos.org/centos-7.xml.in b/data/os/centos.org/centos-7.xml.in
new file mode 100644
index 0000000..382bbc6
--- /dev/null
+++ b/data/os/centos.org/centos-7.xml.in
@@ -0,0 +1,86 @@
+<libosinfo version="0.0.1">
+<!-- Licensed under the GNU General Public License version 2 or later.
+     See http://www.gnu.org/licenses/ for a copy of the license text -->
+
+  <!-- Please, keep both centos-7.xml.in and centos-7.0.xml.in in sync -->
+  <os id="http://centos.org/centos/7">
+    <short-id>centos7</short-id>
+    <_name>CentOS 7</_name>
+    <version>7</version>
+    <_vendor>CentOS</_vendor>
+    <family>linux</family>
+    <distro>centos</distro>
+    <upgrades id="http://centos.org/centos/6.6"/>
+    <clones id="http://redhat.com/rhel/7.6"/>
+
+    <release-date>2014-07-07</release-date>
+
+    <variant id="live-gnome">
+      <_name>CentOS 7 (GNOME)</_name>
+    </variant>
+    <variant id="live-kde">
+      <_name>CentOS 7 (KDE)</_name>
+    </variant>
+
+    <media arch="x86_64">
+      <url>https://buildlogs.centos.org/rolling/7/isos/x86_64/CentOS-7-x86_64-DVD.iso</url>
+      <iso>
+        <system-id>LINUX</system-id>
+        <volume-id>CentOS 7 x86_64</volume-id>
+      </iso>
+      <kernel>isolinux/vmlinuz</kernel>
+      <initrd>isolinux/initrd.img</initrd>
+    </media>
+
+    <media arch="x86_64" live="true">
+      <variant id="live-gnome"/>
+      <url>https://buildlogs.centos.org/rolling/7/isos/x86_64/CentOS-7-x86_64-LiveGNOME.iso</url>
+      <iso>
+        <system-id>LINUX</system-id>
+        <volume-id>CentOS-7-x86_64-LiveGNOME*</volume-id>
+      </iso>
+      <kernel>isolinux/vmlinuz0</kernel>
+      <initrd>isolinux/initrd0.img</initrd>
+    </media>
+
+    <media arch="x86_64" live="true">
+      <variant id="live-kde"/>
+      <url>https://buildlogs.centos.org/rolling/7/isos/x86_64/CentOS-7-x86_64-LiveKDE.iso</url>
+      <iso>
+        <system-id>LINUX</system-id>
+        <volume-id>CentOS-7-x86_64-LiveKDE*</volume-id>
+      </iso>
+      <kernel>isolinux/vmlinuz0</kernel>
+      <initrd>isolinux/initrd0.img</initrd>
+    </media>
+
+    <tree arch="x86_64">
+      <url>http://mirror.centos.org/centos-7/7/os/x86_64/</url>
+      <treeinfo>
+        <family>CentOS</family>
+        <version>^7$</version>
+        <arch>x86_64</arch>
+      </treeinfo>
+    </tree>
+
+    <resources arch="all">
+      <minimum>
+        <n-cpus>1</n-cpus>
+        <cpu>1000000000</cpu>
+        <ram>1073741824</ram>
+        <storage>10737418240</storage>
+      </minimum>
+
+      <recommended>
+        <cpu>1000000000</cpu>
+        <ram>1073741824</ram>
+        <storage>10737418240</storage>
+      </recommended>
+    </resources>
+
+    <installer>
+      <script id='http://centos.org/centos/kickstart/jeos'/>
+      <script id='http://centos.org/centos/kickstart/desktop'/>
+    </installer>
+  </os>
+</libosinfo>
-- 
1.8.3.1