From ce6df807fe58c09546bd5faca8f48258ed8fdd19a23dfa12a6a9832c111988a1 Mon Sep 17 00:00:00 2001
From: Dominique Leuenberger <dimstar@opensuse.org>
Date: Wed, 16 Sep 2015 17:19:46 +0000
Subject: [PATCH] Accepting request 331550 from Virtualization

Add support for openSUSE Leap 42.1

OBS-URL: https://build.opensuse.org/request/show/331550
OBS-URL: https://build.opensuse.org/package/show/hardware/libosinfo?expand=0&rev=39
---
 add-opensuse-leap-42.1-support.patch | 63 ++++++++++++++++++++++++++++
 libosinfo.changes                    |  6 +++
 libosinfo.spec                       |  2 +
 3 files changed, 71 insertions(+)
 create mode 100644 add-opensuse-leap-42.1-support.patch

diff --git a/add-opensuse-leap-42.1-support.patch b/add-opensuse-leap-42.1-support.patch
new file mode 100644
index 0000000..984e1aa
--- /dev/null
+++ b/add-opensuse-leap-42.1-support.patch
@@ -0,0 +1,63 @@
+Index: libosinfo-0.2.12/data/oses/opensuse.xml.in
+===================================================================
+--- libosinfo-0.2.12.orig/data/oses/opensuse.xml.in
++++ libosinfo-0.2.12/data/oses/opensuse.xml.in
+@@ -475,6 +475,36 @@
+     </media>
+   </os>
+ 
++  <os id="http://opensuse.org/opensuse/42.1">
++    <short-id>opensuse42.1</short-id>
++    <name>openSUSE 42.1</name>
++    <version>42.1</version>
++    <vendor>openSUSE</vendor>
++    <vendor xml:lang="de">openSUSE</vendor>
++    <vendor xml:lang="es">openSUSE</vendor>
++    <vendor xml:lang="fr">openSUSE</vendor>
++    <vendor xml:lang="ja">openSUSE</vendor>
++    <vendor xml:lang="pl">openSUSE</vendor>
++    <vendor xml:lang="uk">openSUSE</vendor>
++    <family>linux</family>
++    <distro>opensuse</distro>
++    <upgrades id="http://opensuse.org/opensuse/13.2"/>
++    <derives-from id="http://opensuse.org/opensuse/13.2"/>
++
++    <release-date>2015-11-04</release-date>
++
++    <media arch="x86_64">
++      <url>http://download.opensuse.org/distribution/leap/42.1/iso/openSUSE-42.1-DVD-x86_64.iso</url>
++      <iso>
++        <volume-id>openSUSE-42.1-DVD-x86_64</volume-id>
++        <system-id>LINUX</system-id>
++        <publisher-id>SUSE LINUX GmbH</publisher-id>
++      </iso>
++      <kernel>boot/x86_64/loader/linux</kernel>
++      <initrd>boot/x86_64/loader/initrd</initrd>
++    </media>
++  </os>
++
+   <!-- Generic entry for future openSUSE releases. Please update the
+        'upgrades', 'derives-from', 'volume-id' and 'resources' nodes
+        accordingly each time you add a new (specific) entry for a new
+@@ -486,8 +516,8 @@
+     <_vendor>openSUSE</_vendor>
+     <family>linux</family>
+     <distro>opensuse</distro>
+-    <upgrades id="http://opensuse.org/opensuse/13.2" />
+-    <derives-from id="http://opensuse.org/opensuse/13.2" />
++    <upgrades id="http://opensuse.org/opensuse/42.1" />
++    <derives-from id="http://opensuse.org/opensuse/42.1" />
+     <release-status>prerelease</release-status>
+ 
+     <media arch="i686">
+@@ -532,8 +562,8 @@
+     <_vendor>openSUSE</_vendor>
+     <family>linux</family>
+     <distro>opensuse</distro>
+-    <upgrades id="http://opensuse.org/opensuse/13.2" />
+-    <derives-from id="http://opensuse.org/opensuse/13.2" />
++    <upgrades id="http://opensuse.org/opensuse/42.1" />
++    <derives-from id="http://opensuse.org/opensuse/42.1" />
+     <release-status>snapshot</release-status>
+ 
+     <media arch="i686">
diff --git a/libosinfo.changes b/libosinfo.changes
index 61ece6d..b19ae45 100644
--- a/libosinfo.changes
+++ b/libosinfo.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Fri Sep  4 15:25:33 MDT 2015 - carnold@suse.com
+
+- bsc#944605 - Libosinfo is missing an entry for openSUSE Leap 42.1
+  add-opensuse-leap-42.1-support.patch
+
 -------------------------------------------------------------------
 Mon Jul 20 16:25:14 MDT 2015 - carnold@suse.com
 
diff --git a/libosinfo.spec b/libosinfo.spec
index ed78783..df92687 100644
--- a/libosinfo.spec
+++ b/libosinfo.spec
@@ -32,6 +32,7 @@ Patch2:         6c3ddecb-add-rhel7.1-support.patch
 Patch3:         7b31e3ac-add-qemu-2.3-support.patch
 Patch4:         a563ad22-fix-fedora-unknown-regexp.patch
 Patch5:         add-sle12sp1-support.patch
+Patch6:         add-opensuse-leap-42.1-support.patch
 BuildRequires:  intltool
 BuildRequires:  libtool
 BuildRequires:  vala
@@ -101,6 +102,7 @@ the API is available in all common programming languages.
 %patch3 -p1
 %patch4 -p1
 %patch5 -p1
+%patch6 -p1
 
 %build
 %configure \