diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..b69f085
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+SOURCES/libosinfo-0.2.11.tar.gz
diff --git a/.libosinfo.metadata b/.libosinfo.metadata
new file mode 100644
index 0000000..7f0ca42
--- /dev/null
+++ b/.libosinfo.metadata
@@ -0,0 +1 @@
+5123247ce495136df8cae6bf889b70c43ab33f17 SOURCES/libosinfo-0.2.11.tar.gz
diff --git a/README.md b/README.md
deleted file mode 100644
index 0e7897f..0000000
--- a/README.md
+++ /dev/null
@@ -1,5 +0,0 @@
-The master branch has no content
- 
-Look at the c7 branch if you are working with CentOS-7, or the c4/c5/c6 branch for CentOS-4, 5 or 6
- 
-If you find this file in a distro specific branch, it means that no content has been checked in yet
diff --git a/SOURCES/0004-oses-Detect-RHEL-Server-for-AArch64-as-RHEL-7.0.patch b/SOURCES/0004-oses-Detect-RHEL-Server-for-AArch64-as-RHEL-7.0.patch
new file mode 100644
index 0000000..a9e8484
--- /dev/null
+++ b/SOURCES/0004-oses-Detect-RHEL-Server-for-AArch64-as-RHEL-7.0.patch
@@ -0,0 +1,81 @@
+From: Cole Robinson <crobinso@redhat.com>
+Date: Tue, 2 Dec 2014 11:22:06 -0500
+Subject: [PATCH libosinfo] oses: Detect RHEL Server for AArch64 as RHEL 7.0
+
+RHELSA will be it's own release for a short while, but long term it's
+expected to just be another RHEL architecture. So piggyback on the rhel7.0
+entry for now. If needed we can add a toplevel rhelsa entry later.
+---
+ data/oses/rhel.xml.in                              |  9 +++++++
+ data/schemas/libosinfo.rng                         |  1 +
+ ...ELSA-1.5-20141017.1-Server-aarch64-dvd1.iso.txt | 29 ++++++++++++++++++++++
+ 3 files changed, 39 insertions(+)
+ create mode 100644 test/isodata/rhel/rhel7.0/RHELSA-1.5-20141017.1-Server-aarch64-dvd1.iso.txt
+
+diff --git a/data/oses/rhel.xml.in b/data/oses/rhel.xml.in
+index 791d470..23cc0f2 100644
+--- a/data/oses/rhel.xml.in
++++ b/data/oses/rhel.xml.in
+@@ -1135,6 +1135,15 @@
+       <initrd>isolinux/initrd.img</initrd>
+     </media>
+ 
++    <media arch="aarch64">
++      <iso>
++        <system-id>LINUX</system-id>
++        <volume-id>RHELSA-.* Server\.aarch64</volume-id>
++      </iso>
++       <kernel>isolinux/vmlinuz</kernel>
++       <initrd>isolinux/initrd.img</initrd>
++     </media>
++
+     <resources arch="ppc64">
+       <minimum>
+         <n-cpus>1</n-cpus>
+diff --git a/data/schemas/libosinfo.rng b/data/schemas/libosinfo.rng
+index 1580d9a..f8ca4d4 100644
+--- a/data/schemas/libosinfo.rng
++++ b/data/schemas/libosinfo.rng
+@@ -695,6 +695,7 @@
+   </define>
+   <define name='archnames'>
+     <choice>
++      <value>aarch64</value>
+       <value>alpha</value>
+       <value>armv7l</value>
+       <value>cris</value>
+diff --git a/test/isodata/rhel/rhel7.0/RHELSA-1.5-20141017.1-Server-aarch64-dvd1.iso.txt b/test/isodata/rhel/rhel7.0/RHELSA-1.5-20141017.1-Server-aarch64-dvd1.iso.txt
+new file mode 100644
+index 0000000..6f017e9
+--- /dev/null
++++ b/test/isodata/rhel/rhel7.0/RHELSA-1.5-20141017.1-Server-aarch64-dvd1.iso.txt
+@@ -0,0 +1,29 @@
++CD-ROM is in ISO 9660 format
++System id: LINUX
++Volume id: RHELSA-1.5 Server.aarch64
++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: 1417692
++El Torito VD version 1 found, boot catalog is in sector 523
++Joliet with UCS level 3 found
++Rock Ridge signatures version 1 found
++Eltorito validation header:
++    Hid 1
++    Arch 239 (Unknown Arch)
++    ID ''
++    Key 55 AA
++    Eltorito defaultboot header:
++        Bootid 88 (bootable)
++        Boot media 0 (No Emulation Boot)
++        Load segment 0
++        Sys type 0
++        Nsect 29E8
++        Bootoff 1DED2 122578
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
new file mode 100644
index 0000000..f3c2a07
--- /dev/null
+++ b/SOURCES/add-rhel-5.9.11-and-rhel-6.6-info.patch
@@ -0,0 +1,385 @@
+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
new file mode 100644
index 0000000..67504dd
--- /dev/null
+++ b/SOURCES/fedora-Add-F21-info.patch
@@ -0,0 +1,367 @@
+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
new file mode 100644
index 0000000..9616e3e
--- /dev/null
+++ b/SOURCES/fedora-script-Don-t-specify-interface.patch
@@ -0,0 +1,38 @@
+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/rm-unsigned-drivers-from-unsecure-locations.patch b/SOURCES/rm-unsigned-drivers-from-unsecure-locations.patch
new file mode 100644
index 0000000..08e7766
--- /dev/null
+++ b/SOURCES/rm-unsigned-drivers-from-unsecure-locations.patch
@@ -0,0 +1,114 @@
+From 82400512c295254334997782964a9ee034c9c63e 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
+
+---
+ data/oses/windows.xml.in | 84 ------------------------------------------------
+ 1 file changed, 84 deletions(-)
+
+diff --git a/data/oses/windows.xml.in b/data/oses/windows.xml.in
+index 285fb28..eb1e760 100644
+--- a/data/oses/windows.xml.in
++++ b/data/oses/windows.xml.in
+@@ -381,50 +381,6 @@
+       <script id='http://microsoft.com/windows/reg/desktop'/>
+       <script id='http://microsoft.com/windows/cmd/desktop'/>
+     </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">
+-      <file>viostor.cat</file>
+-      <file>viostor.inf</file>
+-      <file>viostor.sys</file>
+-      <!-- For now we require this for pre-installation but we should probably generate this too -->
+-      <file>txtsetup.oem</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/winxp/amd64" pre-installable="true" signed="false">
+-      <file>viostor.cat</file>
+-      <file>viostor.inf</file>
+-      <file>viostor.sys</file>
+-      <!-- For now we require this for pre-installation but we should probably generate this too -->
+-      <file>txtsetup.oem</file>
+-      <device id="http://pciids.sourceforge.net/v2.2/pci.ids/1af4/1001"/>
+-    </driver>
+-
+-    <!-- All virtio and QXL device drivers, and spice-vdagent -->
+-    <driver arch="i686" location="http://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>
+-      <file>redhat10.cer</file>
+-      <device id="http://pciids.sourceforge.net/v2.2/pci.ids/1af4/1000"/>
+-      <device id="http://pciids.sourceforge.net/v2.2/pci.ids/1af4/1001"/>
+-      <device id="http://pciids.sourceforge.net/v2.2/pci.ids/1af4/1002"/>
+-      <device id="http://pciids.sourceforge.net/v2.2/pci.ids/1af4/1003"/>
+-      <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">
+-      <file>spice-guest-tools-0.65.exe</file>
+-      <file>spice-guest-tools-0.65.cmd</file>
+-      <file>redhat09.cer</file>
+-      <file>redhat10.cer</file>
+-      <device id="http://pciids.sourceforge.net/v2.2/pci.ids/1af4/1000"/>
+-      <device id="http://pciids.sourceforge.net/v2.2/pci.ids/1af4/1001"/>
+-      <device id="http://pciids.sourceforge.net/v2.2/pci.ids/1af4/1002"/>
+-      <device id="http://pciids.sourceforge.net/v2.2/pci.ids/1af4/1003"/>
+-      <device id="http://pciids.sourceforge.net/v2.2/pci.ids/1b36/0100"/>
+-    </driver>
+   </os>
+ 
+   <os id="http://microsoft.com/win/2k3">
+@@ -872,46 +828,6 @@
+       <script id='http://microsoft.com/windows/unattend/desktop'/>
+       <script id='http://microsoft.com/windows/cmd/desktop'/>
+     </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">
+-      <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">
+-      <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>
+-
+-    <!-- All virtio and QXL device drivers, and spice-vdagent -->
+-    <driver arch="i686" location="http://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>
+-      <file>redhat10.cer</file>
+-      <device id="http://pciids.sourceforge.net/v2.2/pci.ids/1af4/1000"/>
+-      <device id="http://pciids.sourceforge.net/v2.2/pci.ids/1af4/1001"/>
+-      <device id="http://pciids.sourceforge.net/v2.2/pci.ids/1af4/1002"/>
+-      <device id="http://pciids.sourceforge.net/v2.2/pci.ids/1af4/1003"/>
+-      <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">
+-      <file>spice-guest-tools-0.65.exe</file>
+-      <file>spice-guest-tools-0.65.cmd</file>
+-      <file>redhat09.cer</file>
+-      <file>redhat10.cer</file>
+-      <device id="http://pciids.sourceforge.net/v2.2/pci.ids/1af4/1000"/>
+-      <device id="http://pciids.sourceforge.net/v2.2/pci.ids/1af4/1001"/>
+-      <device id="http://pciids.sourceforge.net/v2.2/pci.ids/1af4/1002"/>
+-      <device id="http://pciids.sourceforge.net/v2.2/pci.ids/1af4/1003"/>
+-      <device id="http://pciids.sourceforge.net/v2.2/pci.ids/1b36/0100"/>
+-    </driver>
+   </os>
+ 
+   <os id="http://microsoft.com/win/8">
+-- 
+1.9.3
+
diff --git a/SPECS/libosinfo.spec b/SPECS/libosinfo.spec
new file mode 100644
index 0000000..5fcd70a
--- /dev/null
+++ b/SPECS/libosinfo.spec
@@ -0,0 +1,309 @@
+# -*- rpm-spec -*-
+
+# Plugin isn't ready for real world use yet - it needs
+# a security audit at very least
+%define with_plugin 0
+
+%define with_gir 0
+
+%if 0%{?fedora} >= 15 || 0%{?rhel} >= 7
+%define with_gir 1
+%endif
+
+%define with_udev 1
+%if 0%{?fedora} >= 19 || 0%{?rhel} >= 7
+%define with_udev 0
+%endif
+
+Summary: A library for managing OS information for virtualization
+Name: libosinfo
+Version: 0.2.11
+Release: 7%{?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
+BuildRequires: glib2-devel
+BuildRequires: check-devel
+BuildRequires: libxml2-devel >= 2.6.0
+BuildRequires: libxslt-devel >= 1.0.0
+BuildRequires: vala
+BuildRequires: vala-tools
+BuildRequires: libsoup-devel
+BuildRequires: /usr/bin/pod2man
+%if %{with_gir}
+BuildRequires: gobject-introspection-devel
+%endif
+Requires: hwdata
+%if %{with_udev}
+Requires: udev
+%endif
+
+# https://bugzilla.redhat.com/show_bug.cgi?id=1032524
+# 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=1172817
+# Detect rhelsa as rhel7.0
+Patch14: 0004-oses-Detect-RHEL-Server-for-AArch64-as-RHEL-7.0.patch
+
+%description
+libosinfo is a library that allows virtualization provisioning tools to
+determine the optimal device settings for a hypervisor/operating system
+combination.
+
+%package devel
+Summary: Libraries, includes, etc. to compile with the libosinfo library
+Group: Development/Libraries
+Requires: %{name} = %{version}-%{release}
+Requires: pkgconfig
+Requires: glib2-devel
+
+%description devel
+libosinfo is a library that allows virtualization provisioning tools to
+determine the optimal device settings for a hypervisor/operating system
+combination.
+
+Libraries, includes, etc. to compile with the libosinfo library
+
+%package vala
+Summary: Vala bindings
+Group: Development/Libraries
+Requires: %{name} = %{version}-%{release}
+
+%description vala
+libosinfo is a library that allows virtualization provisioning tools to
+determine the optimal device settings for a hypervisor/operating system
+combination.
+
+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
+%patch14 -p1 -b .detect-rhelsa-as-rhel7
+
+%build
+%if %{with_gir}
+%define gir_arg --enable-introspection=yes
+%else
+%define gir_arg --enable-introspection=no
+%endif
+
+%if %{with_udev}
+%define udev_arg --enable-udev=yes
+%else
+%define udev_arg --enable-udev=no
+%endif
+
+%configure %{gir_arg} %{udev_arg} --enable-vala=yes --with-usb-ids-path=/usr/share/hwdata/usb.ids --with-pci-ids-path=/usr/share/hwdata/pci.ids
+%__make %{?_smp_mflags} V=1
+
+chmod a-x examples/*.js examples/*.py
+
+%install
+rm -fr %{buildroot}
+%__make install DESTDIR=%{buildroot}
+rm -f %{buildroot}%{_libdir}/*.a
+rm -f %{buildroot}%{_libdir}/*.la
+
+%find_lang %{name}
+
+%check
+make check
+
+%clean
+rm -fr %{buildroot}
+
+%post -p /sbin/ldconfig
+
+%postun -p /sbin/ldconfig
+
+%files -f %{name}.lang
+%defattr(-, root, root)
+%doc AUTHORS ChangeLog COPYING.LIB NEWS README
+%{_bindir}/osinfo-detect
+%{_bindir}/osinfo-db-validate
+%{_bindir}/osinfo-query
+%{_bindir}/osinfo-install-script
+%dir %{_datadir}/libosinfo/
+%dir %{_datadir}/libosinfo/db/
+%dir %{_datadir}/libosinfo/schemas/
+%{_datadir}/libosinfo/db/usb.ids
+%{_datadir}/libosinfo/db/pci.ids
+%{_datadir}/libosinfo/db/datamaps
+%{_datadir}/libosinfo/db/devices
+%{_datadir}/libosinfo/db/oses
+%{_datadir}/libosinfo/db/hypervisors
+%{_datadir}/libosinfo/db/install-scripts
+%{_datadir}/libosinfo/schemas/libosinfo.rng
+%{_mandir}/man1/osinfo-db-validate.1*
+%{_mandir}/man1/osinfo-detect.1*
+%{_mandir}/man1/osinfo-query.1*
+%{_mandir}/man1/osinfo-install-script.1*
+%{_libdir}/%{name}-1.0.so.*
+%if %{with_udev}
+/lib/udev/rules.d/95-osinfo.rules
+%endif
+%if %{with_gir}
+%{_libdir}/girepository-1.0/Libosinfo-1.0.typelib
+%endif
+
+%files devel
+%defattr(-, root, root)
+%doc examples/demo.js
+%doc examples/demo.py
+%{_libdir}/%{name}-1.0.so
+%dir %{_includedir}/%{name}-1.0/
+%dir %{_includedir}/%{name}-1.0/osinfo/
+%{_includedir}/%{name}-1.0/osinfo/*.h
+%{_libdir}/pkgconfig/%{name}-1.0.pc
+%if %{with_gir}
+%{_datadir}/gir-1.0/Libosinfo-1.0.gir
+%endif
+%{_datadir}/gtk-doc/html/Libosinfo
+
+%files vala
+%defattr(-, root, root)
+%{_datadir}/vala/vapi/libosinfo-1.0.vapi
+
+%changelog
+* Tue May 12 2015 Yaakov Selkowitz <yselkowi@redhat.com> - 0.2.11-7
+- Apply previous patch
+
+* Tue Feb 24 2015 Cole Robinson <crobinso@redhat.com> 0.2.11-6
+- Detect rhelsa as rhel7.0 (#1172817)
+
+* Sun Feb 22 2015 Cole Robinson <crobinso@redhat.com> 0.2.11-5
+- Add rhelsa2.0 os entry (#1172817)
+
+* Mon Jan 26 2015 Zeeshan Ali <zeenix@redhat.com> - 0.2.11-4
+- Add/update F21 info (#1169415).
+
+* Mon Jan 26 2015 Zeeshan Ali <zeenix@redhat.com> - 0.2.11-3
+- Don't specify network interface in fedora script (#1169415).
+
+* Thu Jan  8 2015 Zeeshan Ali <zeenix@redhat.com> - 0.2.11-2
+- Add rhel-5.9..11 and rhel-6.6 info (#1168199).
+
+* Wed Sep  3 2014 Zeeshan Ali <zeenix@redhat.com> - 0.2.11-1
+- Update to latest libosinfo release (#1128621).
+
+* Fri Feb 28 2014 Zeeshan Ali <zeenix@redhat.com> - 0.2.7-10
+- Rebuild with -fstack-protector-strong (#1070773).
+
+* Fri Feb 28 2014 Zeeshan Ali <zeenix@redhat.com> - 0.2.7-9
+- Remove unsigned drivers from unsecure locations (#1032524).
+
+* Mon Feb 24 2014 Zeeshan Ali <zeenix@redhat.com> - 0.2.7-8
+- Disable unattended installation scripts for Windows 8.1 (#1067431).
+
+* Tue Feb 18 2014 Zeeshan Ali <zeenix@redhat.com> - 0.2.7-7
+- Support windows 8.1 (#1066042).
+
+* Fri Jan 24 2014 Daniel Mach <dmach@redhat.com> - 0.2.7-6
+- Mass rebuild 2014-01-24
+
+* Tue Jan  7 2014 Zeeshan Ali <zeenix@redhat.com> - 0.2.7-5
+- fedora,win7: Improve & add data (#1047774).
+
+* Fri Dec 27 2013 Daniel Mach <dmach@redhat.com> - 0.2.7-4
+- Mass rebuild 2013-12-27
+
+* Thu Dec  5 2013 Zeeshan Ali <zeenix@redhat.com> - 0.2.7-3
+- rhel: Add info on 6.5 and 7.0 (#1015055).
+- install-script,rhel: Fix for 'Server' & 7.0 (#1033007).
+
+* Fri Jul 19 2013 Zeeshan Ali <zeenix@redhat.com> - 0.2.7-2
+- Don't install udev rule in RHEL7+ either (#983169).
+
+* Tue May 14 2013 Zeeshan Ali <zeenix@redhat.com> - 0.2.7-1
+- New upstream release 0.2.7
+
+* Thu Mar 21 2013 Zeeshan Ali <zeenix@redhat.com> - 0.2.6-1
+- New upstream release 0.2.6
+
+* Wed Mar 06 2013 Christophe Fergeau <cfergeau@redhat.com> - 0.2.5-2
+- BuildRequires /usr/bin/pod2man as this will automatically pick the right
+  package rather than conditionally requiring a package that is only
+  available in f19+
+- Do not Requires: udev when building libosinfo without its udev rule
+  (which is done on f19+)
+
+* Tue Mar 05 2013 Christophe Fergeau <cfergeau@redhat.com> 0.2.5-1
+- New upstream release 0.2.5
+- Disable udev rule as it's no longer required with newer
+  systemd/util-linux
+
+* Tue Feb 12 2013 Cole Robinson <crobinso@redhat.com> - 0.2.3-2
+- Fix osinfo-detect crash with non-bootable media (bz #901910)
+
+* Mon Jan 14 2013 Zeeshan Ali <zeenix@redhat.com> - 0.2.3-1
+- New upstream release 0.2.3
+
+* Thu Dec 20 2012 Christophe Fergeau <cfergeau@redhat.com> - 0.2.2-1
+- New upstream release 0.2.2
+
+* Fri Oct 12 2012 Zeeshan Ali <zeenix@redhat.com> - 0.2.1-1
+- Fix and simplify udev rule.
+- Fedora:
+  - Fix minimum RAM requirements for F16 and F17.
+- Add data on:
+  - Fedora 18
+  - GNOME 3.6
+  - Ubuntu 12.10
+- Fixes to doc build.
+- Install script:
+  - Add get_config_param method.
+  - Differenciate between expected/output script names.
+  - Add more utility functions.
+- Add 'installer-reboots' parameter to medias.
+- osinfo-detect does not die of DB loading errors anymore.
+- More type-specific entity value getters/setters.
+- Fixe and update RNG file.
+- Add 'subsystem' property/attribute to devices.
+
+* Mon Sep 03 2012 Christophe Fergeau <cfergeau@redhat.com> - 0.2.0-1
+- Update to 0.2.0 release.
+
+* Thu Jul 19 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.1.2-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
+
+* Tue Jun 12 2012 Zeeshan Ali <zeenix@redhat.com> - 0.1.2-1
+- Update to 0.1.2 release.
+
+* Thu Apr 12 2012 Zeeshan Ali <zeenix@redhat.com> - 0.1.1-1
+- Update to 0.1.1 release.
+
+* Wed Mar 14 2012 Daniel P. Berrange <berrange@redhat.com> - 0.1.0-2
+- Remove obsolete perl based scripts (rhbz #803086)
+
+* Wed Feb 08 2012 Christophe Fergeau <cfergeau@redhat.com> - 0.1.0-1
+- Update to 0.1.0 release
+
+* Tue Jan  17 2012 Zeeshan Ali <zeenix@redhat.com> - 0.0.5-1
+- Update to 0.0.5 release
+
+* Tue Jan  3 2012 Daniel P. Berrange <berrange@redhat.com> - 0.0.4-2
+- Remove pointless gir conditionals
+
+* Wed Dec 21 2011 Daniel P. Berrange <berrange@redhat.com> - 0.0.4-1
+- Update to 0.0.4 release
+
+* Thu Nov 24 2011 Daniel P. Berrange <berrange@redhat.com> - 0.0.2-1
+- Initial package
+