diff --git a/.gitignore b/.gitignore
index b69f085..fd08e33 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-SOURCES/libosinfo-0.2.11.tar.gz
+SOURCES/libosinfo-0.2.12.tar.gz
diff --git a/.libosinfo.metadata b/.libosinfo.metadata
index 7f0ca42..026cfaf 100644
--- a/.libosinfo.metadata
+++ b/.libosinfo.metadata
@@ -1 +1 @@
-5123247ce495136df8cae6bf889b70c43ab33f17 SOURCES/libosinfo-0.2.11.tar.gz
+29882e2d50570c6e188249f13aac59b6611d2443 SOURCES/libosinfo-0.2.12.tar.gz
diff --git a/SOURCES/add-rhel-5.9.11-and-rhel-6.6-info.patch b/SOURCES/add-rhel-5.9.11-and-rhel-6.6-info.patch
deleted file mode 100644
index f3c2a07..0000000
--- a/SOURCES/add-rhel-5.9.11-and-rhel-6.6-info.patch
+++ /dev/null
@@ -1,385 +0,0 @@
-From 3dcfa43b221b9e5a04878a37f91727696deadd57 Mon Sep 17 00:00:00 2001
-From: Satoru Satoh <ssato@redhat.com>
-Date: Thu, 6 Nov 2014 15:33:27 +0100
-Subject: [PATCH] Add rhel-5.9..11 and rhel-6.6 info
-
----
- data/oses/rhel.xml.in                              | 133 +++++++++++++++++++++
- .../rhel5.10/rhel-server-5.10-i386-dvd.iso.txt     |  29 +++++
- .../rhel5.10/rhel-server-5.10-x86_64-dvd.iso.txt   |  29 +++++
- .../rhel5.11/rhel-server-5.11-x86_64-dvd.iso.txt   |  29 +++++
- .../rhel/rhel5.9/rhel-server-5.9-i386-dvd.iso.txt  |  29 +++++
- .../rhel5.9/rhel-server-5.9-x86_64-dvd.iso.txt     |  29 +++++
- .../rhel6.6/rhel-server-6.6-x86_64-dvd.iso.txt     |  29 +++++
- 7 files changed, 307 insertions(+)
- create mode 100644 test/isodata/rhel/rhel5.10/rhel-server-5.10-i386-dvd.iso.txt
- create mode 100644 test/isodata/rhel/rhel5.10/rhel-server-5.10-x86_64-dvd.iso.txt
- create mode 100644 test/isodata/rhel/rhel5.11/rhel-server-5.11-x86_64-dvd.iso.txt
- create mode 100644 test/isodata/rhel/rhel5.9/rhel-server-5.9-i386-dvd.iso.txt
- create mode 100644 test/isodata/rhel/rhel5.9/rhel-server-5.9-x86_64-dvd.iso.txt
- create mode 100644 test/isodata/rhel/rhel6.6/rhel-server-6.6-x86_64-dvd.iso.txt
-
-diff --git a/data/oses/rhel.xml.in b/data/oses/rhel.xml.in
-index 9b5f6bb..921396a 100644
---- a/data/oses/rhel.xml.in
-+++ b/data/oses/rhel.xml.in
-@@ -658,6 +658,89 @@
-     </media>
-   </os>
- 
-+  <os id="http://redhat.com/rhel/5.9">
-+    <short-id>rhel5.9</short-id>
-+    <_name>Red Hat Enterprise Linux 5.9</_name>
-+    <version>5.9</version>
-+    <_vendor>Red Hat, Inc</_vendor>
-+    <family>linux</family>
-+    <distro>rhel</distro>
-+    <codename>Tikanga</codename>
-+    <upgrades id="http://redhat.com/rhel/5.8"/>
-+    <derives-from id="http://redhat.com/rhel/5.8"/>
-+
-+    <release-date>2013-01-07</release-date>
-+    <eol-date>2020-03-31</eol-date>
-+
-+    <media arch="i686">
-+      <iso>
-+        <system-id>LINUX</system-id>
-+        <volume-id>.*RHEL/5.9 i386.*</volume-id>
-+      </iso>
-+    </media>
-+    <media arch="x86_64">
-+      <iso>
-+        <system-id>LINUX</system-id>
-+        <volume-id>.*RHEL/5.9 x86_64.*</volume-id>
-+      </iso>
-+    </media>
-+  </os>
-+
-+  <os id="http://redhat.com/rhel/5.10">
-+    <short-id>rhel5.10</short-id>
-+    <_name>Red Hat Enterprise Linux 5.10</_name>
-+    <version>5.10</version>
-+    <_vendor>Red Hat, Inc</_vendor>
-+    <family>linux</family>
-+    <distro>rhel</distro>
-+    <codename>Tikanga</codename>
-+    <upgrades id="http://redhat.com/rhel/5.9"/>
-+    <derives-from id="http://redhat.com/rhel/5.9"/>
-+
-+    <release-date>2013-10-01</release-date>
-+    <eol-date>2020-03-31</eol-date>
-+
-+    <media arch="i686">
-+      <iso>
-+        <system-id>LINUX</system-id>
-+        <volume-id>.*RHEL/5.10 i386.*</volume-id>
-+      </iso>
-+    </media>
-+    <media arch="x86_64">
-+      <iso>
-+        <system-id>LINUX</system-id>
-+        <volume-id>.*RHEL/5.10 x86_64.*</volume-id>
-+      </iso>
-+    </media>
-+  </os>
-+
-+  <os id="http://redhat.com/rhel/5.11">
-+    <short-id>rhel5.11</short-id>
-+    <_name>Red Hat Enterprise Linux 5.11</_name>
-+    <version>5.11</version>
-+    <_vendor>Red Hat, Inc</_vendor>
-+    <family>linux</family>
-+    <distro>rhel</distro>
-+    <codename>Tikanga</codename>
-+    <upgrades id="http://redhat.com/rhel/5.10"/>
-+    <derives-from id="http://redhat.com/rhel/5.10"/>
-+
-+    <release-date>2014-09-16</release-date>
-+    <eol-date>2020-03-31</eol-date>
-+
-+    <media arch="i686">
-+      <iso>
-+        <system-id>LINUX</system-id>
-+        <volume-id>.*RHEL/5.11 i386.*</volume-id>
-+      </iso>
-+    </media>
-+    <media arch="x86_64">
-+      <iso>
-+        <system-id>LINUX</system-id>
-+        <volume-id>.*RHEL/5.11 x86_64.*</volume-id>
-+      </iso>
-+    </media>
-+  </os>
- 
-   <!-- RHEL-6 Santiago -->
- 
-@@ -965,6 +1048,56 @@
-     </installer>
-   </os>
- 
-+  <os id="http://redhat.com/rhel/6.6">
-+    <short-id>rhel6.6</short-id>
-+    <_name>Red Hat Enterprise Linux 6.6</_name>
-+    <version>6.6</version>
-+    <_vendor>Red Hat, Inc</_vendor>
-+    <family>linux</family>
-+    <distro>rhel</distro>
-+    <codename>Santiago</codename>
-+    <upgrades id="http://redhat.com/rhel/6.5"/>
-+    <derives-from id="http://redhat.com/rhel/6.5"/>
-+
-+    <release-date>2014-10-14</release-date>
-+    <eol-date>2023-11-30</eol-date>
-+
-+    <media arch="i686">
-+      <iso>
-+        <system-id>LINUX</system-id>
-+        <volume-id>RHEL-6.6 .*.i386.*</volume-id>
-+      </iso>
-+      <kernel>isolinux/vmlinuz</kernel>
-+      <initrd>isolinux/initrd.img</initrd>
-+    </media>
-+    <media arch="x86_64">
-+      <iso>
-+        <system-id>LINUX</system-id>
-+        <volume-id>.*RHEL-6.6 .*.x86_64.*</volume-id>
-+      </iso>
-+      <kernel>isolinux/vmlinuz</kernel>
-+      <initrd>isolinux/initrd.img</initrd>
-+    </media>
-+
-+    <resources arch="all">
-+      <minimum>
-+        <n-cpus>1</n-cpus>
-+        <ram>536870912</ram>
-+      </minimum>
-+
-+      <recommended>
-+        <cpu>400000000</cpu>
-+        <ram>1073741824</ram>
-+        <storage>9663676416</storage>
-+      </recommended>
-+    </resources>
-+
-+    <installer>
-+      <script id='http://redhat.com/scripts/rhel/jeos'/>
-+      <script id='http://redhat.com/scripts/rhel/desktop'/>
-+    </installer>
-+  </os>
-+
-   <!-- If you add a new 6.x entry here, please don't forget to update the
-        'upgrades' node under 'rhel7.0' entry below. -->
- 
-diff --git a/test/isodata/rhel/rhel5.10/rhel-server-5.10-i386-dvd.iso.txt b/test/isodata/rhel/rhel5.10/rhel-server-5.10-i386-dvd.iso.txt
-new file mode 100644
-index 0000000..735a453
---- /dev/null
-+++ b/test/isodata/rhel/rhel5.10/rhel-server-5.10-i386-dvd.iso.txt
-@@ -0,0 +1,29 @@
-+CD-ROM is in ISO 9660 format
-+System id: LINUX
-+Volume id: RHEL/5.10 i386 DVD
-+Volume set id: RHEL/5.10 i386
-+Publisher id: 
-+Data preparer id: 
-+Application id: RHEL/5.10 i386
-+Copyright File id: 
-+Abstract File id: 
-+Bibliographic File id: 
-+Volume set size is: 1
-+Volume set sequence number is: 1
-+Logical block size is: 2048
-+Volume size is: 1830701
-+El Torito VD version 1 found, boot catalog is in sector 429
-+Joliet with UCS level 3 found
-+Rock Ridge signatures version 1 found
-+Eltorito validation header:
-+    Hid 1
-+    Arch 0 (x86)
-+    ID ''
-+    Key 55 AA
-+    Eltorito defaultboot header:
-+        Bootid 88 (bootable)
-+        Boot media 0 (No Emulation Boot)
-+        Load segment 0
-+        Sys type 0
-+        Nsect 4
-+        Bootoff 1AE 430
-diff --git a/test/isodata/rhel/rhel5.10/rhel-server-5.10-x86_64-dvd.iso.txt b/test/isodata/rhel/rhel5.10/rhel-server-5.10-x86_64-dvd.iso.txt
-new file mode 100644
-index 0000000..21551cf
---- /dev/null
-+++ b/test/isodata/rhel/rhel5.10/rhel-server-5.10-x86_64-dvd.iso.txt
-@@ -0,0 +1,29 @@
-+CD-ROM is in ISO 9660 format
-+System id: LINUX
-+Volume id: RHEL/5.10 x86_64 DVD
-+Volume set id: RHEL/5.10 x86_64
-+Publisher id: 
-+Data preparer id: 
-+Application id: RHEL/5.10 x86_64
-+Copyright File id: 
-+Abstract File id: 
-+Bibliographic File id: 
-+Volume set size is: 1
-+Volume set sequence number is: 1
-+Logical block size is: 2048
-+Volume size is: 2137751
-+El Torito VD version 1 found, boot catalog is in sector 553
-+Joliet with UCS level 3 found
-+Rock Ridge signatures version 1 found
-+Eltorito validation header:
-+    Hid 1
-+    Arch 0 (x86)
-+    ID ''
-+    Key 55 AA
-+    Eltorito defaultboot header:
-+        Bootid 88 (bootable)
-+        Boot media 0 (No Emulation Boot)
-+        Load segment 0
-+        Sys type 0
-+        Nsect 4
-+        Bootoff 22A 554
-diff --git a/test/isodata/rhel/rhel5.11/rhel-server-5.11-x86_64-dvd.iso.txt b/test/isodata/rhel/rhel5.11/rhel-server-5.11-x86_64-dvd.iso.txt
-new file mode 100644
-index 0000000..58cde74
---- /dev/null
-+++ b/test/isodata/rhel/rhel5.11/rhel-server-5.11-x86_64-dvd.iso.txt
-@@ -0,0 +1,29 @@
-+CD-ROM is in ISO 9660 format
-+System id: LINUX
-+Volume id: RHEL/5.11 x86_64 DVD
-+Volume set id: RHEL/5.11 x86_64
-+Publisher id: 
-+Data preparer id: 
-+Application id: RHEL/5.11 x86_64
-+Copyright File id: 
-+Abstract File id: 
-+Bibliographic File id: 
-+Volume set size is: 1
-+Volume set sequence number is: 1
-+Logical block size is: 2048
-+Volume size is: 2170464
-+El Torito VD version 1 found, boot catalog is in sector 554
-+Joliet with UCS level 3 found
-+Rock Ridge signatures version 1 found
-+Eltorito validation header:
-+    Hid 1
-+    Arch 0 (x86)
-+    ID ''
-+    Key 55 AA
-+    Eltorito defaultboot header:
-+        Bootid 88 (bootable)
-+        Boot media 0 (No Emulation Boot)
-+        Load segment 0
-+        Sys type 0
-+        Nsect 4
-+        Bootoff 22B 555
-diff --git a/test/isodata/rhel/rhel5.9/rhel-server-5.9-i386-dvd.iso.txt b/test/isodata/rhel/rhel5.9/rhel-server-5.9-i386-dvd.iso.txt
-new file mode 100644
-index 0000000..d83edc9
---- /dev/null
-+++ b/test/isodata/rhel/rhel5.9/rhel-server-5.9-i386-dvd.iso.txt
-@@ -0,0 +1,29 @@
-+CD-ROM is in ISO 9660 format
-+System id: LINUX
-+Volume id: RHEL/5.9 i386 DVD
-+Volume set id: RHEL/5.9 i386
-+Publisher id: 
-+Data preparer id: 
-+Application id: RHEL/5.9 i386
-+Copyright File id: 
-+Abstract File id: 
-+Bibliographic File id: 
-+Volume set size is: 1
-+Volume set sequence number is: 1
-+Logical block size is: 2048
-+Volume size is: 1796811
-+El Torito VD version 1 found, boot catalog is in sector 426
-+Joliet with UCS level 3 found
-+Rock Ridge signatures version 1 found
-+Eltorito validation header:
-+    Hid 1
-+    Arch 0 (x86)
-+    ID ''
-+    Key 55 AA
-+    Eltorito defaultboot header:
-+        Bootid 88 (bootable)
-+        Boot media 0 (No Emulation Boot)
-+        Load segment 0
-+        Sys type 0
-+        Nsect 4
-+        Bootoff 1AB 427
-diff --git a/test/isodata/rhel/rhel5.9/rhel-server-5.9-x86_64-dvd.iso.txt b/test/isodata/rhel/rhel5.9/rhel-server-5.9-x86_64-dvd.iso.txt
-new file mode 100644
-index 0000000..54f4374
---- /dev/null
-+++ b/test/isodata/rhel/rhel5.9/rhel-server-5.9-x86_64-dvd.iso.txt
-@@ -0,0 +1,29 @@
-+CD-ROM is in ISO 9660 format
-+System id: LINUX
-+Volume id: RHEL/5.9 x86_64 DVD
-+Volume set id: RHEL/5.9 x86_64
-+Publisher id: 
-+Data preparer id: 
-+Application id: RHEL/5.9 x86_64
-+Copyright File id: 
-+Abstract File id: 
-+Bibliographic File id: 
-+Volume set size is: 1
-+Volume set sequence number is: 1
-+Logical block size is: 2048
-+Volume size is: 2098662
-+El Torito VD version 1 found, boot catalog is in sector 549
-+Joliet with UCS level 3 found
-+Rock Ridge signatures version 1 found
-+Eltorito validation header:
-+    Hid 1
-+    Arch 0 (x86)
-+    ID ''
-+    Key 55 AA
-+    Eltorito defaultboot header:
-+        Bootid 88 (bootable)
-+        Boot media 0 (No Emulation Boot)
-+        Load segment 0
-+        Sys type 0
-+        Nsect 4
-+        Bootoff 226 550
-diff --git a/test/isodata/rhel/rhel6.6/rhel-server-6.6-x86_64-dvd.iso.txt b/test/isodata/rhel/rhel6.6/rhel-server-6.6-x86_64-dvd.iso.txt
-new file mode 100644
-index 0000000..90222af
---- /dev/null
-+++ b/test/isodata/rhel/rhel6.6/rhel-server-6.6-x86_64-dvd.iso.txt
-@@ -0,0 +1,29 @@
-+CD-ROM is in ISO 9660 format
-+System id: LINUX
-+Volume id: RHEL-6.6 Server.x86_64
-+Volume set id: 
-+Publisher id: 
-+Data preparer id: 
-+Application id: GENISOIMAGE ISO 9660/HFS FILESYSTEM CREATOR (C) 1993 E.YOUNGDALE (C) 1997-2006 J.PEARSON/J.SCHILLING (C) 2006-2007 CDRKIT TEAM
-+Copyright File id: 
-+Abstract File id: 
-+Bibliographic File id: 
-+Volume set size is: 1
-+Volume set sequence number is: 1
-+Logical block size is: 2048
-+Volume size is: 1846398
-+El Torito VD version 1 found, boot catalog is in sector 990
-+Joliet with UCS level 3 found
-+Rock Ridge signatures version 1 found
-+Eltorito validation header:
-+    Hid 1
-+    Arch 0 (x86)
-+    ID ''
-+    Key 55 AA
-+    Eltorito defaultboot header:
-+        Bootid 88 (bootable)
-+        Boot media 0 (No Emulation Boot)
-+        Load segment 0
-+        Sys type 0
-+        Nsect 4
-+        Bootoff 1CD6D 118125
--- 
-2.1.0
-
diff --git a/SOURCES/fedora-Add-F21-info.patch b/SOURCES/fedora-Add-F21-info.patch
deleted file mode 100644
index 67504dd..0000000
--- a/SOURCES/fedora-Add-F21-info.patch
+++ /dev/null
@@ -1,367 +0,0 @@
-From b29c83584843a1e4081efa8369c66ded142869eb Mon Sep 17 00:00:00 2001
-From: Cole Robinson <crobinso@redhat.com>
-Date: Sun, 21 Sep 2014 15:41:51 -0400
-Subject: [PATCH] fedora: Add F21 info
-
-This is a squash of 4 patches from upstream:
-
------------
-oses: Add Fedora21
-
-This just adds a plain Fedora21 entry. F21 is going to have different
-versions like 'Workstation' and 'Server' but we don't seem to distinguish
-for other distros so I just stuck with the pattern here.
-
-This currently doesn't work for detecting Workstation media, since their
-volume IDs are truncated. Bug tracking that:
-
-https://bugzilla.redhat.com/show_bug.cgi?id=1145264
-
------------
-fedora: Mark F21 as released
-
-F21 was release on Dec 3, 2014. Add release date for F21 and update
-release status.
-
------------
-schema: Allow variants for install trees
-
-Allow install trees to be associated with specific variants of the OS.
-
------------
-fedora: Add/update media & tree info for F21
-
-Fedora now has variants and simply updating the ISO URLs is not a good
-way forward. This patch adds information about media/tree of each
-variant seperately.
-
-Unfortunately, there is no installer media for Workstation variant and
-even though Server netiso is actually generic enough to let user install
-Workstation as well, both netiso and full installer ISO have the exact
-same volume-id so we can't simply assign netiso a (fake) generic variant
-and be done with it. :( For more details:
-
-https://bugzilla.redhat.com/show_bug.cgi?id=1178787
-
------------
-Allow tree/media elements in any order
-
-Put all child elements for <tree> and <media> inside an
-<interleave> to allow them to appear in any order
----
- data/oses/fedora.xml.in                            | 168 ++++++++++++++++++++-
- data/schemas/libosinfo.rng                         |  50 +++---
- .../Fedora-Server-DVD-x86_64-21_Alpha_TC7.iso.txt  |  29 ++++
- 3 files changed, 221 insertions(+), 26 deletions(-)
- create mode 100644 test/isodata/fedora/fedora21/Fedora-Server-DVD-x86_64-21_Alpha_TC7.iso.txt
-
-diff --git a/data/oses/fedora.xml.in b/data/oses/fedora.xml.in
-index 27cdd4a..0c01ab9 100644
---- a/data/oses/fedora.xml.in
-+++ b/data/oses/fedora.xml.in
-@@ -1533,6 +1533,161 @@
-     </installer>
-   </os>
- 
-+  <os id="http://fedoraproject.org/fedora/21">
-+    <short-id>fedora21</short-id>
-+    <_name>Fedora 21</_name>
-+    <version>21</version>
-+    <_vendor>Fedora Project</_vendor>
-+    <family>linux</family>
-+    <distro>fedora</distro>
-+    <upgrades id="http://fedoraproject.org/fedora/20"/>
-+    <derives-from id="http://fedoraproject.org/fedora/20"/>
-+
-+    <release-date>2014-12-03</release-date>
-+
-+    <variant id="workstation">
-+      <_name>Fedora 21 Workstation</_name>
-+    </variant>
-+    <variant id="server">
-+      <_name>Fedora 21 Server</_name>
-+    </variant>
-+    <variant id="cloud">
-+      <_name>Fedora 21 Cloud</_name>
-+    </variant>
-+
-+    <!-- Workstation -->
-+
-+    <!-- NOTE: There is no installer media for Workstation and even though Server
-+               netiso is actually generic enough to let user install
-+               Workstation as well, both netiso and full installer ISO have the
-+               exact same volume-id so we can't simply assign netiso a (fake)
-+               generic variant and be done with it. :( For more details:
-+
-+              https://bugzilla.redhat.com/show_bug.cgi?id=1178787
-+    !-->
-+
-+    <media arch="i686" live="true">
-+      <variant id="workstation"/>
-+      <url>http://download.fedoraproject.org/pub/fedora/linux/releases/21/Workstation/i386/iso/Fedora-Live-Workstation-i686-21-5.iso</url>
-+      <iso>
-+        <volume-id>Fedora-Live-WS-i686-21.*</volume-id>
-+        <system-id>LINUX</system-id>
-+      </iso>
-+      <kernel>isolinux/vmlinuz0</kernel>
-+      <initrd>isolinux/initrd0.img</initrd>
-+    </media>
-+    <media arch="x86_64" live="true">
-+      <variant id="workstation"/>
-+      <url>http://download.fedoraproject.org/pub/fedora/linux/releases/21/Workstation/x86_64/iso/Fedora-Live-Workstation-x86_64-21-5.iso</url>
-+      <iso>
-+        <volume-id>Fedora-Live-WS-x86_64-21.*</volume-id>
-+        <system-id>LINUX</system-id>
-+      </iso>
-+      <kernel>isolinux/vmlinuz0</kernel>
-+      <initrd>isolinux/initrd0.img</initrd>
-+    </media>
-+
-+    <!-- Server -->
-+
-+    <media arch="i686">
-+      <variant id="server"/>
-+      <url>http://download.fedoraproject.org/pub/fedora/linux/releases/21/Server/i386/iso/Fedora-Server-DVD-i386-21.iso</url>
-+      <iso>
-+        <volume-id>Fedora-S.*21.*-i386</volume-id>
-+        <system-id>LINUX</system-id>
-+      </iso>
-+      <kernel>isolinux/vmlinuz</kernel>
-+      <initrd>isolinux/initrd.img</initrd>
-+    </media>
-+    <media arch="x86_64">
-+      <variant id="server"/>
-+      <url>http://download.fedoraproject.org/pub/fedora/linux/releases/21/Server/x86_64/iso/Fedora-Server-DVD-x86_64-21.iso</url>
-+      <iso>
-+        <volume-id>Fedora-S.*-21.*-x86_64</volume-id>
-+        <system-id>LINUX</system-id>
-+      </iso>
-+      <kernel>isolinux/vmlinuz</kernel>
-+      <initrd>isolinux/initrd.img</initrd>
-+    </media>
-+
-+    <tree arch="i686">
-+      <variant id="server"/>
-+      <url>http://download.fedoraproject.org/pub/fedora/linux/releases/21/Server/i386/os/</url>
-+      <treeinfo>
-+        <family>Fedora</family>
-+        <version>21</version>
-+        <arch>i386</arch>
-+      </treeinfo>
-+    </tree>
-+    <tree arch="x86_64">
-+      <url>http://download.fedoraproject.org/pub/fedora/linux/releases/21/Server/x86_64/os/</url>
-+      <variant id="server"/>
-+      <treeinfo>
-+        <family>Fedora</family>
-+        <version>21</version>
-+        <arch>x86_64</arch>
-+      </treeinfo>
-+    </tree>
-+
-+    <!-- Cloud -->
-+
-+    <media arch="i686">
-+      <variant id="cloud"/>
-+      <url>http://download.fedoraproject.org/pub/fedora/linux/releases/21/Cloud/i386/iso/Fedora-Cloud-netinst-i386-21.iso</url>
-+      <iso>
-+        <volume-id>Fedora-C.*21.*-i386</volume-id>
-+        <system-id>LINUX</system-id>
-+      </iso>
-+      <kernel>isolinux/vmlinuz</kernel>
-+      <initrd>isolinux/initrd.img</initrd>
-+    </media>
-+    <media arch="x86_64">
-+      <variant id="cloud"/>
-+      <url>http://download.fedoraproject.org/pub/fedora/linux/releases/21/Cloud/x86_64/iso/Fedora-Cloud-netinst-x86_64-21.iso</url>
-+      <iso>
-+        <volume-id>Fedora-C.*-21.*-x86_64</volume-id>
-+        <system-id>LINUX</system-id>
-+      </iso>
-+      <kernel>isolinux/vmlinuz</kernel>
-+      <initrd>isolinux/initrd.img</initrd>
-+    </media>
-+
-+    <tree arch="i686">
-+      <url>http://download.fedoraproject.org/pub/fedora/linux/releases/21/Cloud/i386/os/</url>
-+      <variant id="cloud"/>
-+      <treeinfo>
-+        <family>Fedora</family>
-+        <version>21</version>
-+        <arch>i386</arch>
-+      </treeinfo>
-+    </tree>
-+    <tree arch="x86_64">
-+      <url>http://download.fedoraproject.org/pub/fedora/linux/releases/21/Cloud/x86_64/os/</url>
-+      <variant id="cloud"/>
-+      <treeinfo>
-+        <family>Fedora</family>
-+        <version>21</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>
-+    </resources>
-+
-+    <!-- Lets uncomment these after testing them -->
-+    <!--<installer>
-+      <script id='http://fedoraproject.org/scripts/fedora/jeos'/>
-+      <script id='http://fedoraproject.org/scripts/fedora/desktop'/>
-+    </installer>-->
-+  </os>
-+
-+
-   <!-- Generic entry for future Fedora releases. Please update the 'upgrades',
-        'derives-from', 'volume-id' and 'resources' nodes accordingly each time
-        you add a new (specific) entry for a new release. -->
-@@ -1543,19 +1698,19 @@
-     <_vendor>Fedora Project</_vendor>
-     <family>linux</family>
-     <distro>fedora</distro>
--    <upgrades id="http://fedoraproject.org/fedora/20"/>
--    <derives-from id="http://fedoraproject.org/fedora/20"/>
-+    <upgrades id="http://fedoraproject.org/fedora/21"/>
-+    <derives-from id="http://fedoraproject.org/fedora/21"/>
-     <release-status>prerelease</release-status>
- 
-     <media arch="i686">
-       <iso>
--        <volume-id>Fedora ([2-9][1-9]|[0-9]{3,}).* i386</volume-id>
-+        <volume-id>Fedora.*-([2-9][1-9]|[0-9]{3,}).*-i386</volume-id>
-         <system-id>LINUX</system-id>
-       </iso>
-     </media>
-     <media arch="x86_64">
-       <iso>
--        <volume-id>Fedora ([2-9][1-9]|[0-9]{3,}).* x86_64</volume-id>
-+        <volume-id>Fedora.*-([2-9][1-9]|[0-9]{3,}).*-x86_64</volume-id>
-         <system-id>LINUX</system-id>
-       </iso>
-       <kernel>isolinux/vmlinuz</kernel>
-@@ -1584,4 +1739,9 @@
-       </minimum>
-     </resources>
-   </os>
-+
-+  <!-- Do not add entry here, the last entry should always be fedora-unknown.
-+       And if adding a new entry, make sure to update fedora-unknown as
-+       mentioned in the comment above. -->
-+
- </libosinfo>
-diff --git a/data/schemas/libosinfo.rng b/data/schemas/libosinfo.rng
-index e693674..1580d9a 100644
---- a/data/schemas/libosinfo.rng
-+++ b/data/schemas/libosinfo.rng
-@@ -337,22 +337,22 @@
-           <ref name='num'/>
-         </attribute>
-       </optional>
--      <optional>
--        <element name='variant'>
--          <attribute name='id'>
--          </attribute>
--        </element>
--      </optional>
--      <optional>
--        <element name='url'>
--          <ref name='url'/>
--        </element>
--      </optional>
--      <optional>
--        <ref name='iso'/>
--      </optional>
-       <interleave>
-         <optional>
-+          <element name='variant'>
-+            <attribute name='id'>
-+            </attribute>
-+          </element>
-+        </optional>
-+        <optional>
-+          <element name='url'>
-+            <ref name='url'/>
-+          </element>
-+        </optional>
-+        <optional>
-+          <ref name='iso'/>
-+        </optional>
-+        <optional>
-           <element name='initrd'>
-             <text/>
-           </element>
-@@ -414,16 +414,22 @@
-       <attribute name='arch'>
-         <ref name='archnames'/>
-       </attribute>
--      <optional>
--        <element name='url'>
--          <ref name='url'/>
--        </element>
--      </optional>
--      <optional>
--        <ref name='treeinfo'/>
--      </optional>
-       <interleave>
-         <optional>
-+          <element name='variant'>
-+            <attribute name='id'>
-+            </attribute>
-+          </element>
-+        </optional>
-+        <optional>
-+          <element name='url'>
-+            <ref name='url'/>
-+          </element>
-+        </optional>
-+        <optional>
-+          <ref name='treeinfo'/>
-+        </optional>
-+        <optional>
-           <element name='initrd'>
-             <text/>
-           </element>
-diff --git a/test/isodata/fedora/fedora21/Fedora-Server-DVD-x86_64-21_Alpha_TC7.iso.txt b/test/isodata/fedora/fedora21/Fedora-Server-DVD-x86_64-21_Alpha_TC7.iso.txt
-new file mode 100644
-index 0000000..f4e9436
---- /dev/null
-+++ b/test/isodata/fedora/fedora21/Fedora-Server-DVD-x86_64-21_Alpha_TC7.iso.txt
-@@ -0,0 +1,29 @@
-+CD-ROM is in ISO 9660 format
-+System id: LINUX
-+Volume id: Fedora-S-21_A_T7-x86_64
-+Volume set id: 
-+Publisher id: 
-+Data preparer id: 
-+Application id: GENISOIMAGE ISO 9660/HFS FILESYSTEM CREATOR (C) 1993 E.YOUNGDALE (C) 1997-2006 J.PEARSON/J.SCHILLING (C) 2006-2007 CDRKIT TEAM
-+Copyright File id: 
-+Abstract File id: 
-+Bibliographic File id: 
-+Volume set size is: 1
-+Volume set sequence number is: 1
-+Logical block size is: 2048
-+Volume size is: 979923
-+El Torito VD version 1 found, boot catalog is in sector 439
-+Joliet with UCS level 3 found
-+Rock Ridge signatures version 1 found
-+Eltorito validation header:
-+    Hid 1
-+    Arch 0 (x86)
-+    ID ''
-+    Key 55 AA
-+    Eltorito defaultboot header:
-+        Bootid 88 (bootable)
-+        Boot media 0 (No Emulation Boot)
-+        Load segment 0
-+        Sys type 0
-+        Nsect 4
-+        Bootoff 1B8 440
--- 
-2.1.0
-
diff --git a/SOURCES/fedora-script-Don-t-specify-interface.patch b/SOURCES/fedora-script-Don-t-specify-interface.patch
deleted file mode 100644
index 9616e3e..0000000
--- a/SOURCES/fedora-script-Don-t-specify-interface.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From ca7b31c7b14ceffaad8589aae1006237d76b5f2e Mon Sep 17 00:00:00 2001
-From: "Zeeshan Ali (Khattak)" <zeeshanak@gnome.org>
-Date: Mon, 26 Jan 2015 16:07:24 +0000
-Subject: [PATCH] fedora,script: Don't specify interface
-
-Its not guaranteed that we'll have 'eth0' available or that it will be
-named 'eth0' by kernel. Since kickstart allows us not to specify the
-name of the interface, lets omit that and let kickstart choose the best
-device for us.
----
- data/install-scripts/fedora.xml | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/data/install-scripts/fedora.xml b/data/install-scripts/fedora.xml
-index 76f28da..c4264e5 100644
---- a/data/install-scripts/fedora.xml
-+++ b/data/install-scripts/fedora.xml
-@@ -104,7 +104,7 @@ langsupport --default <xsl:value-of select="config/l10n-language"/> <xsl:value-o
- mouse generic3ps/2 --device psaux
- </xsl:if>
- skipx
--network --device eth0 --bootproto dhcp
-+network --bootproto dhcp
- rootpw <xsl:value-of select="config/admin-password"/>
- firewall --disabled
- authconfig --enableshadow --enablemd5
-@@ -254,7 +254,7 @@ install
- cdrom
- keyboard '<xsl:call-template name="keyboard"/>'
- lang <xsl:value-of select="config/l10n-language"/>
--network --onboot yes --device eth0 --bootproto dhcp --noipv6 --hostname=<xsl:value-of select="config/hostname"/>
-+network --onboot yes --bootproto dhcp --noipv6 --hostname=<xsl:value-of select="config/hostname"/>
- rootpw dummyPa55w0rd # Actual password set (or unset) in %post below
- firewall --disabled
- authconfig --enableshadow --enablemd5
--- 
-2.1.0
-
diff --git a/SOURCES/rhel-Add-data-about-RHEL-7.1-7.2.patch b/SOURCES/rhel-Add-data-about-RHEL-7.1-7.2.patch
new file mode 100644
index 0000000..49a6404
--- /dev/null
+++ b/SOURCES/rhel-Add-data-about-RHEL-7.1-7.2.patch
@@ -0,0 +1,388 @@
+From c431a9017a306c89e4ffda6ac3e9c7a6ed9a10c3 Mon Sep 17 00:00:00 2001
+From: "Zeeshan Ali (Khattak)" <zeeshanak@gnome.org>
+Date: Tue, 7 Jul 2015 21:05:32 +0100
+Subject: [PATCH] rhel: Add data about RHEL 7.1 & 7.2
+
+---
+ data/oses/rhel.xml.in                              | 182 +++++++++++++++++++++
+ .../rhel-atomic-installer-7.1-0.x86_64.iso.txt     |  29 ++++
+ .../rhel-atomic-installer-7.1-1.x86_64.iso.txt     |  29 ++++
+ .../RHEL-7.1-20150219.1-Client-x86_64-dvd1.iso.txt |  29 ++++
+ .../RHEL-7.1-20150219.1-Server-x86_64-dvd1.iso.txt |  29 ++++
+ ...-7.1-20150219.1-Workstation-x86_64-dvd1.iso.txt |  29 ++++
+ 6 files changed, 327 insertions(+)
+ create mode 100644 test/isodata/rhel/rhel-atomic-7.1/rhel-atomic-installer-7.1-0.x86_64.iso.txt
+ create mode 100644 test/isodata/rhel/rhel-atomic-7.1/rhel-atomic-installer-7.1-1.x86_64.iso.txt
+ create mode 100644 test/isodata/rhel/rhel7.1/RHEL-7.1-20150219.1-Client-x86_64-dvd1.iso.txt
+ create mode 100644 test/isodata/rhel/rhel7.1/RHEL-7.1-20150219.1-Server-x86_64-dvd1.iso.txt
+ create mode 100644 test/isodata/rhel/rhel7.1/RHEL-7.1-20150219.1-Workstation-x86_64-dvd1.iso.txt
+
+diff --git a/data/oses/rhel.xml.in b/data/oses/rhel.xml.in
+index 23cc0f2..650b779 100644
+--- a/data/oses/rhel.xml.in
++++ b/data/oses/rhel.xml.in
+@@ -1221,4 +1221,186 @@
+       </recommended>
+     </resources>
+   </os>
++
++  <os id="http://redhat.com/rhel/7.1">
++    <short-id>rhel7.1</short-id>
++    <_name>Red Hat Enterprise Linux 7.1</_name>
++    <version>7.1</version>
++    <_vendor>Red Hat, Inc</_vendor>
++    <family>linux</family>
++    <distro>rhel</distro>
++    <upgrades id="http://redhat.com/rhel/7.0"/>
++    <derives-from id="http://redhat.com/rhel/7.0"/>
++
++    <media arch="i686">
++      <iso>
++        <system-id>LINUX</system-id>
++        <volume-id>.*RHEL-7.1.*i386.*</volume-id>
++      </iso>
++      <kernel>isolinux/vmlinuz</kernel>
++      <initrd>isolinux/initrd.img</initrd>
++    </media>
++    <media arch="x86_64">
++      <iso>
++        <system-id>LINUX</system-id>
++        <volume-id>.*RHEL-7.1.*x86_64.*</volume-id>
++      </iso>
++      <kernel>isolinux/vmlinuz</kernel>
++      <initrd>isolinux/initrd.img</initrd>
++    </media>
++
++    <resources arch="ppc64">
++      <minimum>
++        <n-cpus>1</n-cpus>
++        <cpu>1000000000</cpu>
++        <ram>2147483648</ram>
++        <storage>10737418240</storage>
++      </minimum>
++
++      <recommended>
++        <cpu>400000000</cpu>
++        <ram>2147483648</ram>
++        <storage>21474836480</storage>
++      </recommended>
++    </resources>
++
++    <resources arch="all">
++      <minimum>
++        <n-cpus>1</n-cpus>
++        <cpu>1000000000</cpu>
++        <ram>1073741824</ram>
++        <storage>10737418240</storage>
++      </minimum>
++
++      <recommended>
++        <cpu>400000000</cpu>
++        <ram>1073741824</ram>
++        <storage>9663676416</storage>
++      </recommended>
++    </resources>
++
++    <installer>
++      <script id='http://redhat.com/scripts/rhel/jeos'/>
++      <script id='http://redhat.com/scripts/rhel/desktop'/>
++    </installer>
++  </os>
++
++  <os id="http://redhat.com/rhel-atomic/7.1">
++    <short-id>rhel-atomic-7.1</short-id>
++    <_name>Red Hat Enterprise Linux Atomic Host 7.1</_name>
++    <version>7.1</version>
++    <_vendor>Red Hat, Inc</_vendor>
++    <family>linux</family>
++    <distro>rhel</distro>
++    <upgrades id="http://redhat.com/rhel-atomic/7.0"/>
++    <derives-from id="http://redhat.com/rhel-atomic/7.0"/>
++
++    <!-- 7.1-0 -->
++    <media arch="x86_64">
++      <iso>
++        <system-id>LINUX</system-id>
++        <volume-id>RHEL.*Atomic.*7 x86_64.*</volume-id>
++        <volume-size>652435456</volume-size>
++      </iso>
++      <kernel>isolinux/vmlinuz</kernel>
++      <initrd>isolinux/initrd.img</initrd>
++    </media>
++
++    <!-- 7.1-1 -->
++    <media arch="x86_64">
++      <iso>
++        <system-id>LINUX</system-id>
++        <volume-id>RHEL.*Atomic.*7 x86_64.*</volume-id>
++        <volume-size>654243840</volume-size>
++      </iso>
++      <kernel>isolinux/vmlinuz</kernel>
++      <initrd>isolinux/initrd.img</initrd>
++    </media>
++
++    <resources arch="all">
++      <minimum>
++        <n-cpus>1</n-cpus>
++        <cpu>1000000000</cpu>
++        <ram>1073741824</ram>
++        <storage>10737418240</storage>
++      </minimum>
++
++      <recommended>
++        <cpu>400000000</cpu>
++        <ram>1073741824</ram>
++        <storage>9663676416</storage>
++      </recommended>
++    </resources>
++  </os>
++
++  <os id="http://redhat.com/rhel/7.2">
++    <short-id>rhel7.1</short-id>
++    <_name>Red Hat Enterprise Linux 7.2</_name>
++    <version>7.2</version>
++    <_vendor>Red Hat, Inc</_vendor>
++    <family>linux</family>
++    <distro>rhel</distro>
++    <upgrades id="http://redhat.com/rhel/7.1"/>
++    <derives-from id="http://redhat.com/rhel/7.1"/>
++
++    <media arch="i686">
++      <iso>
++        <system-id>LINUX</system-id>
++        <volume-id>.*RHEL-7.2.*i386.*</volume-id>
++      </iso>
++      <kernel>isolinux/vmlinuz</kernel>
++      <initrd>isolinux/initrd.img</initrd>
++    </media>
++    <media arch="x86_64">
++      <iso>
++        <system-id>LINUX</system-id>
++        <volume-id>.*RHEL-7.2.*x86_64.*</volume-id>
++      </iso>
++      <kernel>isolinux/vmlinuz</kernel>
++      <initrd>isolinux/initrd.img</initrd>
++    </media>
++    <media arch="aarch64">
++      <iso>
++        <system-id>LINUX</system-id>
++        <volume-id>.*RHEL-7.2.*aarch64.*</volume-id>
++      </iso>
++       <kernel>isolinux/vmlinuz</kernel>
++       <initrd>isolinux/initrd.img</initrd>
++     </media>
++
++    <resources arch="ppc64">
++      <minimum>
++        <n-cpus>1</n-cpus>
++        <cpu>1000000000</cpu>
++        <ram>2147483648</ram>
++        <storage>10737418240</storage>
++      </minimum>
++
++      <recommended>
++        <cpu>400000000</cpu>
++        <ram>2147483648</ram>
++        <storage>21474836480</storage>
++      </recommended>
++    </resources>
++
++    <resources arch="all">
++      <minimum>
++        <n-cpus>1</n-cpus>
++        <cpu>1000000000</cpu>
++        <ram>1073741824</ram>
++        <storage>10737418240</storage>
++      </minimum>
++
++      <recommended>
++        <cpu>400000000</cpu>
++        <ram>1073741824</ram>
++        <storage>9663676416</storage>
++      </recommended>
++    </resources>
++
++    <installer>
++      <script id='http://redhat.com/scripts/rhel/jeos'/>
++      <script id='http://redhat.com/scripts/rhel/desktop'/>
++    </installer>
++  </os>
+ </libosinfo>
+diff --git a/test/isodata/rhel/rhel-atomic-7.1/rhel-atomic-installer-7.1-0.x86_64.iso.txt b/test/isodata/rhel/rhel-atomic-7.1/rhel-atomic-installer-7.1-0.x86_64.iso.txt
+new file mode 100644
+index 0000000..10fb7ce
+--- /dev/null
++++ b/test/isodata/rhel/rhel-atomic-7.1/rhel-atomic-installer-7.1-0.x86_64.iso.txt
+@@ -0,0 +1,29 @@
++CD-ROM is in ISO 9660 format
++System id: LINUX
++Volume id: RHEL Atomic Host 7 x86_64
++Volume set id: 
++Publisher id: 
++Data preparer id: 
++Application id: GENISOIMAGE ISO 9660/HFS FILESYSTEM CREATOR (C) 1993 E.YOUNGDALE (C) 1997-2006 J.PEARSON/J.SCHILLING (C) 2006-2007 CDRKIT TEAM
++Copyright File id: 
++Abstract File id: 
++Bibliographic File id: 
++Volume set size is: 1
++Volume set sequence number is: 1
++Logical block size is: 2048
++Volume size is: 318572
++El Torito VD version 1 found, boot catalog is in sector 46
++Joliet with UCS level 3 found
++Rock Ridge signatures version 1 found
++Eltorito validation header:
++    Hid 1
++    Arch 0 (x86)
++    ID ''
++    Key 55 AA
++    Eltorito defaultboot header:
++        Bootid 88 (bootable)
++        Boot media 0 (No Emulation Boot)
++        Load segment 0
++        Sys type 0
++        Nsect 4
++        Bootoff 456D 17773
+diff --git a/test/isodata/rhel/rhel-atomic-7.1/rhel-atomic-installer-7.1-1.x86_64.iso.txt b/test/isodata/rhel/rhel-atomic-7.1/rhel-atomic-installer-7.1-1.x86_64.iso.txt
+new file mode 100644
+index 0000000..f6569fa
+--- /dev/null
++++ b/test/isodata/rhel/rhel-atomic-7.1/rhel-atomic-installer-7.1-1.x86_64.iso.txt
+@@ -0,0 +1,29 @@
++CD-ROM is in ISO 9660 format
++System id: LINUX
++Volume id: RHEL Atomic Host 7 x86_64
++Volume set id: 
++Publisher id: 
++Data preparer id: 
++Application id: GENISOIMAGE ISO 9660/HFS FILESYSTEM CREATOR (C) 1993 E.YOUNGDALE (C) 1997-2006 J.PEARSON/J.SCHILLING (C) 2006-2007 CDRKIT TEAM
++Copyright File id: 
++Abstract File id: 
++Bibliographic File id: 
++Volume set size is: 1
++Volume set sequence number is: 1
++Logical block size is: 2048
++Volume size is: 319455
++El Torito VD version 1 found, boot catalog is in sector 46
++Joliet with UCS level 3 found
++Rock Ridge signatures version 1 found
++Eltorito validation header:
++    Hid 1
++    Arch 0 (x86)
++    ID ''
++    Key 55 AA
++    Eltorito defaultboot header:
++        Bootid 88 (bootable)
++        Boot media 0 (No Emulation Boot)
++        Load segment 0
++        Sys type 0
++        Nsect 4
++        Bootoff 458B 17803
+diff --git a/test/isodata/rhel/rhel7.1/RHEL-7.1-20150219.1-Client-x86_64-dvd1.iso.txt b/test/isodata/rhel/rhel7.1/RHEL-7.1-20150219.1-Client-x86_64-dvd1.iso.txt
+new file mode 100644
+index 0000000..92b8597
+--- /dev/null
++++ b/test/isodata/rhel/rhel7.1/RHEL-7.1-20150219.1-Client-x86_64-dvd1.iso.txt
+@@ -0,0 +1,29 @@
++CD-ROM is in ISO 9660 format
++System id: LINUX
++Volume id: RHEL-7.1 Client.x86_64
++Volume set id: 
++Publisher id: 
++Data preparer id: 
++Application id: GENISOIMAGE ISO 9660/HFS FILESYSTEM CREATOR (C) 1993 E.YOUNGDALE (C) 1997-2006 J.PEARSON/J.SCHILLING (C) 2006-2007 CDRKIT TEAM
++Copyright File id: 
++Abstract File id: 
++Bibliographic File id: 
++Volume set size is: 1
++Volume set sequence number is: 1
++Logical block size is: 2048
++Volume size is: 1870122
++El Torito VD version 1 found, boot catalog is in sector 986
++Joliet with UCS level 3 found
++Rock Ridge signatures version 1 found
++Eltorito validation header:
++    Hid 1
++    Arch 0 (x86)
++    ID ''
++    Key 55 AA
++    Eltorito defaultboot header:
++        Bootid 88 (bootable)
++        Boot media 0 (No Emulation Boot)
++        Load segment 0
++        Sys type 0
++        Nsect 4
++        Bootoff 2AE29 175657
+diff --git a/test/isodata/rhel/rhel7.1/RHEL-7.1-20150219.1-Server-x86_64-dvd1.iso.txt b/test/isodata/rhel/rhel7.1/RHEL-7.1-20150219.1-Server-x86_64-dvd1.iso.txt
+new file mode 100644
+index 0000000..8aba100
+--- /dev/null
++++ b/test/isodata/rhel/rhel7.1/RHEL-7.1-20150219.1-Server-x86_64-dvd1.iso.txt
+@@ -0,0 +1,29 @@
++CD-ROM is in ISO 9660 format
++System id: LINUX
++Volume id: RHEL-7.1 Server.x86_64
++Volume set id: 
++Publisher id: 
++Data preparer id: 
++Application id: GENISOIMAGE ISO 9660/HFS FILESYSTEM CREATOR (C) 1993 E.YOUNGDALE (C) 1997-2006 J.PEARSON/J.SCHILLING (C) 2006-2007 CDRKIT TEAM
++Copyright File id: 
++Abstract File id: 
++Bibliographic File id: 
++Volume set size is: 1
++Volume set sequence number is: 1
++Logical block size is: 2048
++Volume size is: 1899146
++El Torito VD version 1 found, boot catalog is in sector 1102
++Joliet with UCS level 3 found
++Rock Ridge signatures version 1 found
++Eltorito validation header:
++    Hid 1
++    Arch 0 (x86)
++    ID ''
++    Key 55 AA
++    Eltorito defaultboot header:
++        Bootid 88 (bootable)
++        Boot media 0 (No Emulation Boot)
++        Load segment 0
++        Sys type 0
++        Nsect 4
++        Bootoff 2AE9E 175774
+diff --git a/test/isodata/rhel/rhel7.1/RHEL-7.1-20150219.1-Workstation-x86_64-dvd1.iso.txt b/test/isodata/rhel/rhel7.1/RHEL-7.1-20150219.1-Workstation-x86_64-dvd1.iso.txt
+new file mode 100644
+index 0000000..dea75a5
+--- /dev/null
++++ b/test/isodata/rhel/rhel7.1/RHEL-7.1-20150219.1-Workstation-x86_64-dvd1.iso.txt
+@@ -0,0 +1,29 @@
++CD-ROM is in ISO 9660 format
++System id: LINUX
++Volume id: RHEL-7.1 Workstation.x86_64
++Volume set id: 
++Publisher id: 
++Data preparer id: 
++Application id: GENISOIMAGE ISO 9660/HFS FILESYSTEM CREATOR (C) 1993 E.YOUNGDALE (C) 1997-2006 J.PEARSON/J.SCHILLING (C) 2006-2007 CDRKIT TEAM
++Copyright File id: 
++Abstract File id: 
++Bibliographic File id: 
++Volume set size is: 1
++Volume set sequence number is: 1
++Logical block size is: 2048
++Volume size is: 2152803
++El Torito VD version 1 found, boot catalog is in sector 1121
++Joliet with UCS level 3 found
++Rock Ridge signatures version 1 found
++Eltorito validation header:
++    Hid 1
++    Arch 0 (x86)
++    ID ''
++    Key 55 AA
++    Eltorito defaultboot header:
++        Bootid 88 (bootable)
++        Boot media 0 (No Emulation Boot)
++        Load segment 0
++        Sys type 0
++        Nsect 4
++        Bootoff 2AEB0 175792
+-- 
+2.4.3
+
diff --git a/SOURCES/rm-unsigned-drivers-from-unsecure-locations.patch b/SOURCES/rm-unsigned-drivers-from-unsecure-locations.patch
index 08e7766..18c9a01 100644
--- a/SOURCES/rm-unsigned-drivers-from-unsecure-locations.patch
+++ b/SOURCES/rm-unsigned-drivers-from-unsecure-locations.patch
@@ -1,4 +1,4 @@
-From 82400512c295254334997782964a9ee034c9c63e Mon Sep 17 00:00:00 2001
+From 1cef68622dbc3674a61b583c69c3016cbc0af041 Mon Sep 17 00:00:00 2001
 From: "Zeeshan Ali (Khattak)" <zeeshanak@gnome.org>
 Date: Thu, 9 Jan 2014 16:24:25 +0000
 Subject: [PATCH] Remove unsigned drivers from unsecure locations
@@ -8,7 +8,7 @@ Subject: [PATCH] Remove unsigned drivers from unsecure locations
  1 file changed, 84 deletions(-)
 
 diff --git a/data/oses/windows.xml.in b/data/oses/windows.xml.in
-index 285fb28..eb1e760 100644
+index 3aa912b..4b0586f 100644
 --- a/data/oses/windows.xml.in
 +++ b/data/oses/windows.xml.in
 @@ -381,50 +381,6 @@
@@ -17,7 +17,7 @@ index 285fb28..eb1e760 100644
      </installer>
 -
 -    <!-- virtio block device driver -->
--    <driver arch="i686" location="http://zeenix.fedorapeople.org/drivers/win-tools-1/preinst/winxp/x86" pre-installable="true" signed="false">
+-    <driver arch="i686" location="https://zeenix.fedorapeople.org/drivers/win-tools-1/preinst/winxp/x86" pre-installable="true" signed="false">
 -      <file>viostor.cat</file>
 -      <file>viostor.inf</file>
 -      <file>viostor.sys</file>
@@ -26,7 +26,7 @@ index 285fb28..eb1e760 100644
 -      <device id="http://pciids.sourceforge.net/v2.2/pci.ids/1af4/1001"/>
 -    </driver>
 -
--    <driver arch="x86_64" location="http://zeenix.fedorapeople.org/drivers/win-tools-1/preinst/winxp/amd64" pre-installable="true" signed="false">
+-    <driver arch="x86_64" location="https://zeenix.fedorapeople.org/drivers/win-tools-1/preinst/winxp/amd64" pre-installable="true" signed="false">
 -      <file>viostor.cat</file>
 -      <file>viostor.inf</file>
 -      <file>viostor.sys</file>
@@ -36,7 +36,7 @@ index 285fb28..eb1e760 100644
 -    </driver>
 -
 -    <!-- All virtio and QXL device drivers, and spice-vdagent -->
--    <driver arch="i686" location="http://zeenix.fedorapeople.org/drivers/win-tools/postinst" signed="false">
+-    <driver arch="i686" location="https://zeenix.fedorapeople.org/drivers/win-tools/postinst" signed="false">
 -      <file>spice-guest-tools-0.65.exe</file>
 -      <file>spice-guest-tools-0.65.cmd</file>
 -      <file>redhat09.cer</file>
@@ -48,7 +48,7 @@ index 285fb28..eb1e760 100644
 -      <device id="http://pciids.sourceforge.net/v2.2/pci.ids/1b36/0100"/>
 -    </driver>
 -
--    <driver arch="x86_64" location="http://zeenix.fedorapeople.org/drivers/win-tools/postinst" signed="false">
+-    <driver arch="x86_64" location="https://zeenix.fedorapeople.org/drivers/win-tools/postinst" signed="false">
 -      <file>spice-guest-tools-0.65.exe</file>
 -      <file>spice-guest-tools-0.65.cmd</file>
 -      <file>redhat09.cer</file>
@@ -68,14 +68,14 @@ index 285fb28..eb1e760 100644
      </installer>
 -
 -    <!-- virtio block device driver -->
--    <driver arch="i686" location="http://zeenix.fedorapeople.org/drivers/win-tools-1/preinst/win7/x86" pre-installable="true" signed="false">
+-    <driver arch="i686" location="https://zeenix.fedorapeople.org/drivers/win-tools-1/preinst/win7/x86" pre-installable="true" signed="false">
 -      <file>viostor.cat</file>
 -      <file>viostor.inf</file>
 -      <file>viostor.sys</file>
 -      <device id="http://pciids.sourceforge.net/v2.2/pci.ids/1af4/1001"/>
 -    </driver>
 -
--    <driver arch="x86_64" location="http://zeenix.fedorapeople.org/drivers/win-tools-1/preinst/win7/amd64" pre-installable="true" signed="false">
+-    <driver arch="x86_64" location="https://zeenix.fedorapeople.org/drivers/win-tools-1/preinst/win7/amd64" pre-installable="true" signed="false">
 -      <file>viostor.cat</file>
 -      <file>viostor.inf</file>
 -      <file>viostor.sys</file>
@@ -83,7 +83,7 @@ index 285fb28..eb1e760 100644
 -    </driver>
 -
 -    <!-- All virtio and QXL device drivers, and spice-vdagent -->
--    <driver arch="i686" location="http://zeenix.fedorapeople.org/drivers/win-tools/postinst" signed="false">
+-    <driver arch="i686" location="https://zeenix.fedorapeople.org/drivers/win-tools/postinst" signed="false">
 -      <file>spice-guest-tools-0.65.exe</file>
 -      <file>spice-guest-tools-0.65.cmd</file>
 -      <file>redhat09.cer</file>
@@ -95,7 +95,7 @@ index 285fb28..eb1e760 100644
 -      <device id="http://pciids.sourceforge.net/v2.2/pci.ids/1b36/0100"/>
 -    </driver>
 -
--    <driver arch="x86_64" location="http://zeenix.fedorapeople.org/drivers/win-tools/postinst" signed="false">
+-    <driver arch="x86_64" location="https://zeenix.fedorapeople.org/drivers/win-tools/postinst" signed="false">
 -      <file>spice-guest-tools-0.65.exe</file>
 -      <file>spice-guest-tools-0.65.cmd</file>
 -      <file>redhat09.cer</file>
@@ -110,5 +110,5 @@ index 285fb28..eb1e760 100644
  
    <os id="http://microsoft.com/win/8">
 -- 
-1.9.3
+2.1.0
 
diff --git a/SPECS/libosinfo.spec b/SPECS/libosinfo.spec
index 587d436..7f720ac 100644
--- a/SPECS/libosinfo.spec
+++ b/SPECS/libosinfo.spec
@@ -17,11 +17,12 @@
 
 Summary: A library for managing OS information for virtualization
 Name: libosinfo
-Version: 0.2.11
-Release: 4%{?dist}%{?extra_release}
+Version: 0.2.12
+Release: 3%{?dist}%{?extra_release}
 License: LGPLv2+
 Group: Development/Libraries
 Source: https://fedorahosted.org/releases/l/i/%{name}/%{name}-%{version}.tar.gz
+
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 URL: http://libosinfo.org/
 BuildRequires: intltool
@@ -45,14 +46,9 @@ Requires: udev
 # Don't advertise unsigned drivers from unsecure locations
 Patch0: rm-unsigned-drivers-from-unsecure-locations.patch
 
-# https://bugzilla.redhat.com/show_bug.cgi?id=1168199
-# virt-manager can not recognize rhel6.6
-Patch1: add-rhel-5.9.11-and-rhel-6.6-info.patch
-
-# https://bugzilla.redhat.com/show_bug.cgi?id=1169415
-# F20 express installation does not work & F21 not recognised
-Patch2: fedora-script-Don-t-specify-interface.patch
-Patch3: fedora-Add-F21-info.patch
+# https://bugzilla.redhat.com/show_bug.cgi?id=1197236
+# libosinfo support for RHELSA (7.2)
+Patch1: rhel-Add-data-about-RHEL-7.1-7.2.patch
 
 %description
 libosinfo is a library that allows virtualization provisioning tools to
@@ -87,10 +83,9 @@ This package provides the Vala bindings for libosinfo library.
 
 %prep
 %setup -q
+
 %patch0 -p1 -b .rm-unsigned-drivers-from-unsecure-locations
-%patch1 -p1 -b .add-rhel-5.9.11-and-rhel-6.6-info
-%patch2 -p1 -b .fedora-script-Don-t-specify-interface
-%patch3 -p1 -b .fedora-Add-F21-info
+%patch1 -p1 -b .rhel-Add-data-about-RHEL-7.1-7.2
 
 %build
 %if %{with_gir}
@@ -177,6 +172,19 @@ rm -fr %{buildroot}
 %{_datadir}/vala/vapi/libosinfo-1.0.vapi
 
 %changelog
+* Wed Aug 19 2015 Zeeshan Ali <zeenix@redhat.com> - 0.2.12-3
+- Bump relase to get the new build out. (#1197236).
+
+* Wed Aug 19 2015 Zeeshan Ali <zeenix@redhat.com> - 0.2.12-2
+- Add data about RHEL 7.1 & 7.2 (#1197236).
+
+* Thu May 28 2015 Zeeshan Ali <zeenix@redhat.com> - 0.2.12-1
+- Update to 0.2.12 (#1174552).
+- Remove now redundant patches.
+
+* Sat May 16 2015 Zeeshan Ali <zeenix@redhat.com> - 0.2.11-5
+- Merge RHELSA branch (#1197236).
+
 * Mon Jan 26 2015 Zeeshan Ali <zeenix@redhat.com> - 0.2.11-4
 - Add/update F21 info (#1169415).