Accepting request 702051 from hardware

Update to version 1.5.0

OBS-URL: https://build.opensuse.org/request/show/702051
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/libosinfo?expand=0&rev=35

0001-media-Fix-usage-of-application-id.patch

@@ -1,38 +0,0 @@
-From 2626058a7921749387f8d3107241af7507f48c65 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Fabiano=20Fid=C3=AAncio?= <fidencio@redhat.com>
-Date: Mon, 1 Apr 2019 22:40:48 +0200
-Subject: [PATCH] media: Fix usage of application id
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Christophe Fergeau pointed this issue out during the review of 6d789033e
-and, even though, the bogus code ended up merged (sorry, mea culpa
-here!).
-
-Signed-off-by: Fabiano Fidêncio <fidencio@redhat.com>
-Reviewed-by: Cole Robinson <crobinso@redhat.com>
----
- osinfo/osinfo_media.c | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/osinfo/osinfo_media.c b/osinfo/osinfo_media.c
-index b16fcf6..4f86c2b 100644
---- a/osinfo/osinfo_media.c
-+++ b/osinfo/osinfo_media.c
-@@ -830,10 +830,10 @@ create_from_location_async_data(CreateFromLocationAsyncData *data)
-         osinfo_entity_set_param(OSINFO_ENTITY(media),
-                                 OSINFO_MEDIA_PROP_PUBLISHER_ID,
-                                 data->publisher);
--    if (!is_str_empty(data->pvd.application))
-+    if (!is_str_empty(data->application))
-         osinfo_entity_set_param(OSINFO_ENTITY(media),
-                                 OSINFO_MEDIA_PROP_APPLICATION_ID,
--                                data->pvd.application);
-+                                data->application);
- 
-     index = (G_BYTE_ORDER == G_LITTLE_ENDIAN) ? 0 : 1;
-     vol_size = ((gint64) data->pvd.volume_space_size[index]) *
--- 
-2.20.1
-

0002-loader-Properly-load-the-arch-value-for-images.patch

@@ -1,37 +0,0 @@
-From 1940739805409af9e39c61dbfe238e6c9b1519b6 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Fabiano=20Fid=C3=AAncio?= <fidencio@redhat.com>
-Date: Wed, 10 Apr 2019 13:45:14 +0200
-Subject: [PATCH] loader: Properly load the arch value for images
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-osinfo_loader_image() has been considering the XML tag for the
-images' architecture was "architecture", while it actually is "arch".
-
-By trying to read the wrong tag, no arch was loaded, causing then any
-image load to fail with:
-CRITICAL **: 13:30:06.539: osinfo_entity_set_param: assertion 'value != NULL' failed
-
-Signed-off-by: Fabiano Fidêncio <fidencio@redhat.com>
----
- osinfo/osinfo_loader.c | 3 +--
- 1 file changed, 1 insertion(+), 2 deletions(-)
-
-diff --git a/osinfo/osinfo_loader.c b/osinfo/osinfo_loader.c
-index e30148b..84c25e5 100644
---- a/osinfo/osinfo_loader.c
-+++ b/osinfo/osinfo_loader.c
-@@ -1297,8 +1297,7 @@ static OsinfoImage *osinfo_loader_image(OsinfoLoader *loader,
-         { NULL, G_TYPE_INVALID }
-     };
- 
--    gchar *arch = (gchar *)xmlGetProp(root,
--                                      BAD_CAST OSINFO_IMAGE_PROP_ARCHITECTURE);
-+    gchar *arch = (gchar *)xmlGetProp(root, BAD_CAST "arch");
-     gchar *format = (gchar *)xmlGetProp(root,
-                                         BAD_CAST OSINFO_IMAGE_PROP_FORMAT);
-     gchar *cloud_init = (gchar *)xmlGetProp(root,
--- 
-2.20.1
-

libosinfo-1.4.0.tar.gz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:a29e61a82b1a5727b145403914812273dfa033a0c07a15500078726bb3b84165
-size 1075852

libosinfo-1.5.0.tar.gz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:bf692567983478c92bde78d454c18d6196abb032b5a77f430b09a7ef92ec6089
+size 998751

libosinfo.changes

@@ -1,3 +1,27 @@
+-------------------------------------------------------------------
+Thu May  9 09:44:12 MDT 2019 - carnold@suse.com
+
+- Update to version 1.5.0
+  Changes in this release include:
+  * Add API to get an OS from OsinfoTrees & OsinfoImages
+  * Add API to set an OS to OsinfoTrees & OsinfoImages
+  * Add API to get the OS variants from OsinfoTrees & OsinfoImages
+  * Add API to set the installation URL to a OsinfoInstallConfig
+  * Add API to get all short-ids from an OsinfoProduct
+  * Improve OsinfoLoader in order to fully support multiple short-ids values on
+    an OsinfoProduct
+  * Improve osinfo-detect tool's help wording
+  * Improve osinfo-detect tool, making it aware of OsinfoTree's OS variants
+  * Fix the loading of the architecture value of OsinfoImages
+  * Fix usage of application id on media detection
+  * Accept "all" as a valid fallback architecture for OsinfoTrees & OsinfoMedias
+  * Improve treeinfo check by checking for both ".treeinfo" and "treeinfo" files
+  * Explicitly set GVFS as a requirement in the project spec file
+  * Move osinfo-db related tests to osinfo-db project
+- Drop
+  0001-media-Fix-usage-of-application-id.patch
+  0002-loader-Properly-load-the-arch-value-for-images.patch
+
 -------------------------------------------------------------------
 Wed Apr 10 09:18:39 MDT 2019 - carnold@suse.com
 

libosinfo.spec

@@ -20,7 +20,7 @@
 %define with_lang 1
 
 Name:           libosinfo
-Version:        1.4.0
+Version:        1.5.0
 Release:        0
 Summary:        Operating system and hypervisor information management library
 License:        LGPL-2.1-or-later AND GPL-2.0-or-later
@@ -28,8 +28,6 @@ Group:          Development/Libraries/C and C++
 Url:            https://releases.pagure.org/libosinfo/
 Source0:        https://releases.pagure.org/libosinfo/%{name}-%{version}.tar.gz
 Source1:        ids.tar.bz2
-Patch1:         0001-media-Fix-usage-of-application-id.patch
-Patch2:         0002-loader-Properly-load-the-arch-value-for-images.patch
 BuildRequires:  libcurl-devel
 BuildRequires:  vala
 BuildRequires:  pkgconfig(check)
@@ -87,8 +85,6 @@ as well as Vala bindings for the libosinfo library.
 %endif
 %prep
 %setup -q -a 1
-%patch1 -p1
-%patch2 -p1
 
 %build
 %configure \