[virt-tools-list] [libosinfo 2/2] Rename RHEL OS metadata file as par latest changes

[Zeeshan Ali]

From: "Zeeshan Ali (Khattak)" <zeeshanak at gnome.org>

---
 data/oses/Makefile.am |    2 +-
 data/oses/rhel-6.xml  |   48 ------------------------------------------------
 data/oses/rhel.xml    |   48 ++++++++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 49 insertions(+), 49 deletions(-)
 delete mode 100644 data/oses/rhel-6.xml
 create mode 100644 data/oses/rhel.xml

diff --git a/data/oses/Makefile.am b/data/oses/Makefile.am
index 672a711..3ff8f4a 100644
--- a/data/oses/Makefile.am
+++ b/data/oses/Makefile.am
@@ -1,5 +1,5 @@
 
 databasedir = $(pkgdatadir)/data/oses/
-database_DATA = fedora.xml rhel-6.xml centos.xml
+database_DATA = fedora.xml rhel.xml centos.xml
 
 EXTRA_DIST = $(database_DATA)
diff --git a/data/oses/rhel-6.xml b/data/oses/rhel-6.xml
deleted file mode 100644
index 9218fc9..0000000
--- a/data/oses/rhel-6.xml
+++ /dev/null
@@ -1,48 +0,0 @@
-<libosinfo version="0.0.1">
-
-  <os id="http://redhat.com/rhel/4.8">
-    <short-id>rhel-4.8</short-id>
-    <name>Red Hat Enterprise Linux 4.8</name>
-    <version>4.8</version>
-    <vendor>Red Hat, Inc</vendor>
-  </os>
-
-  <os id="http://redhat.com/rhel/4.9">
-    <short-id>rhel-4.9</short-id>
-    <name>Red Hat Enterprise Linux 4.9</name>
-    <version>4.9</version>
-    <vendor>Red Hat, Inc</vendor>
-    <upgrades id="http://redhat.com/rhel/4.8"/>
-  </os>
-
-  <os id="http://redhat.com/rhel/5.6">
-    <short-id>rhel-5.6</short-id>
-    <name>Red Hat Enterprise Linux 5.6</name>
-    <version>5.6</version>
-    <vendor>Red Hat, Inc</vendor>
-  </os>
-
-  <os id="http://redhat.com/rhel/5.7">
-    <short-id>rhel-5.7</short-id>
-    <name>Red Hat Enterprise Linux 5.7</name>
-    <version>5.7</version>
-    <vendor>Red Hat, Inc</vendor>
-    <upgrades id="http://redhat.com/rhel/5.6"/>
-  </os>
-
-  <os id="http://redhat.com/rhel/6.0">
-    <short-id>rhel-6.0</short-id>
-    <name>Red Hat Enterprise Linux 6.0</name>
-    <version>6.0</version>
-    <vendor>Red Hat, Inc</vendor>
-  </os>
-
-  <os id="http://redhat.com/rhel/6.1">
-    <short-id>rhel-6.1</short-id>
-    <name>Red Hat Enterprise Linux 6.1</name>
-    <version>6.1</version>
-    <vendor>Red Hat, Inc</vendor>
-    <upgrades id="http://redhat.com/rhel/6.0"/>
-  </os>
-
-</libosinfo>
diff --git a/data/oses/rhel.xml b/data/oses/rhel.xml
new file mode 100644
index 0000000..9218fc9
--- /dev/null
+++ b/data/oses/rhel.xml
@@ -0,0 +1,48 @@
+<libosinfo version="0.0.1">
+
+  <os id="http://redhat.com/rhel/4.8">
+    <short-id>rhel-4.8</short-id>
+    <name>Red Hat Enterprise Linux 4.8</name>
+    <version>4.8</version>
+    <vendor>Red Hat, Inc</vendor>
+  </os>
+
+  <os id="http://redhat.com/rhel/4.9">
+    <short-id>rhel-4.9</short-id>
+    <name>Red Hat Enterprise Linux 4.9</name>
+    <version>4.9</version>
+    <vendor>Red Hat, Inc</vendor>
+    <upgrades id="http://redhat.com/rhel/4.8"/>
+  </os>
+
+  <os id="http://redhat.com/rhel/5.6">
+    <short-id>rhel-5.6</short-id>
+    <name>Red Hat Enterprise Linux 5.6</name>
+    <version>5.6</version>
+    <vendor>Red Hat, Inc</vendor>
+  </os>
+
+  <os id="http://redhat.com/rhel/5.7">
+    <short-id>rhel-5.7</short-id>
+    <name>Red Hat Enterprise Linux 5.7</name>
+    <version>5.7</version>
+    <vendor>Red Hat, Inc</vendor>
+    <upgrades id="http://redhat.com/rhel/5.6"/>
+  </os>
+
+  <os id="http://redhat.com/rhel/6.0">
+    <short-id>rhel-6.0</short-id>
+    <name>Red Hat Enterprise Linux 6.0</name>
+    <version>6.0</version>
+    <vendor>Red Hat, Inc</vendor>
+  </os>
+
+  <os id="http://redhat.com/rhel/6.1">
+    <short-id>rhel-6.1</short-id>
+    <name>Red Hat Enterprise Linux 6.1</name>
+    <version>6.1</version>
+    <vendor>Red Hat, Inc</vendor>
+    <upgrades id="http://redhat.com/rhel/6.0"/>
+  </os>
+
+</libosinfo>
-- 
1.7.5.2