From d71cff185325e67c512e03d61665f5d6f079a26d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fabiano=20Fid=C3=AAncio?= Date: Sat, 30 May 2020 10:04:49 +0200 Subject: [PATCH] Update to 1.8.0 release MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Fabiano Fidêncio --- .gitignore | 2 + ...vert-list-Update-GObject-boilerplate.patch | 100 ------------------ libosinfo.spec | 6 +- sources | 4 +- 4 files changed, 8 insertions(+), 104 deletions(-) delete mode 100644 0001-Partially-revert-list-Update-GObject-boilerplate.patch diff --git a/.gitignore b/.gitignore index ec905f0..f30e8d2 100644 --- a/.gitignore +++ b/.gitignore @@ -8,3 +8,5 @@ x86_64 /libosinfo-1.7.0.tar.xz.asc /libosinfo-1.7.1.tar.xz /libosinfo-1.7.1.tar.xz.asc +/libosinfo-1.8.0.tar.xz +/libosinfo-1.8.0.tar.xz.asc diff --git a/0001-Partially-revert-list-Update-GObject-boilerplate.patch b/0001-Partially-revert-list-Update-GObject-boilerplate.patch deleted file mode 100644 index 8eca897..0000000 --- a/0001-Partially-revert-list-Update-GObject-boilerplate.patch +++ /dev/null @@ -1,100 +0,0 @@ -From 0baa3d3ab5db3cf06c10a3281dee9d2089872aaf Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Fabiano=20Fid=C3=AAncio?= -Date: Fri, 10 Jan 2020 11:53:22 +0100 -Subject: [PATCH] Partially revert "list: Update GObject boilerplate" -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -This partially reverts commit 706b6fd0d97ed572d92c4a33882605d561ebe3c8, -which introduced an ABI breakage by using G_DECLARE_DERIVABLE_TYPE when -declaring an OsinfoList. - -Signed-off-by: Fabiano Fidêncio ---- - osinfo/osinfo_list.c | 4 ++-- - osinfo/osinfo_list.h | 36 +++++++++++++++++++++++++++++++----- - 2 files changed, 33 insertions(+), 7 deletions(-) - -diff --git a/osinfo/osinfo_list.c b/osinfo/osinfo_list.c -index e8fa74c8..7f95c266 100644 ---- a/osinfo/osinfo_list.c -+++ b/osinfo/osinfo_list.c -@@ -35,13 +35,13 @@ - * - */ - --typedef struct -+struct _OsinfoListPrivate - { - GPtrArray *array; - GHashTable *entities; - - GType elementType; --} OsinfoListPrivate; -+}; - - enum { - PROP_O, -diff --git a/osinfo/osinfo_list.h b/osinfo/osinfo_list.h -index 07731f0e..49550662 100644 ---- a/osinfo/osinfo_list.h -+++ b/osinfo/osinfo_list.h -@@ -27,16 +27,44 @@ - - # include - --G_BEGIN_DECLS -+/* -+ * Type macros. -+ */ -+# define OSINFO_TYPE_LIST (osinfo_list_get_type ()) -+# define OSINFO_LIST(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), OSINFO_TYPE_LIST, OsinfoList)) -+# define OSINFO_IS_LIST(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), OSINFO_TYPE_LIST)) -+# define OSINFO_LIST_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), OSINFO_TYPE_LIST, OsinfoListClass)) -+# define OSINFO_IS_LIST_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), OSINFO_TYPE_LIST)) -+# define OSINFO_LIST_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), OSINFO_TYPE_LIST, OsinfoListClass)) -+ -+typedef struct _OsinfoList OsinfoList; -+ -+typedef struct _OsinfoListClass OsinfoListClass; -+ -+typedef struct _OsinfoListPrivate OsinfoListPrivate; -+ -+/* object */ -+struct _OsinfoList -+{ -+ GObject parent_instance; -+ -+ /* public */ - --# define OSINFO_TYPE_LIST (osinfo_list_get_type ()) --G_DECLARE_DERIVABLE_TYPE(OsinfoList, osinfo_list, OSINFO, LIST, GObject) -+ /* private */ -+ OsinfoListPrivate *priv; -+}; - -+/* class */ - struct _OsinfoListClass - { -+ /*< private >*/ - GObjectClass parent_class; -+ -+ /* class members */ - }; - -+GType osinfo_list_get_type(void); -+ - GType osinfo_list_get_element_type(OsinfoList *list); - gint osinfo_list_get_length(OsinfoList *list); - OsinfoEntity *osinfo_list_get_nth(OsinfoList *list, gint idx); -@@ -55,6 +83,4 @@ OsinfoList *osinfo_list_new_filtered(OsinfoList *source, OsinfoFilter *filter); - OsinfoList *osinfo_list_new_intersection(OsinfoList *sourceOne, OsinfoList *sourceTwo); - OsinfoList *osinfo_list_new_union(OsinfoList *sourceOne, OsinfoList *sourceTwo); - --G_END_DECLS -- - #endif /* __OSINFO_LIST_H__ */ --- -2.24.1 - diff --git a/libosinfo.spec b/libosinfo.spec index de3ba6e..d214631 100644 --- a/libosinfo.spec +++ b/libosinfo.spec @@ -2,14 +2,13 @@ Summary: A library for managing OS information for virtualization Name: libosinfo -Version: 1.7.1 +Version: 1.8.0 Release: 3%{?dist} License: LGPLv2+ Source: https://releases.pagure.io/%{name}/%{name}-%{version}.tar.xz URL: https://libosinfo.org/ ### Patches ### -Patch0001: 0001-Partially-revert-list-Update-GObject-boilerplate.patch BuildRequires: meson BuildRequires: gcc @@ -96,6 +95,9 @@ Libraries, includes, etc. to compile with the libosinfo library %{_datadir}/vala/vapi/libosinfo-1.0.vapi %changelog +* Sat May 30 2020 Fabiano Fidêncio - 1.8.0-1 +- Update to 1.8.0 release + * Wed Jan 29 2020 Fedora Release Engineering - 1.7.1-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild diff --git a/sources b/sources index f9d4690..33fc93b 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (libosinfo-1.7.1.tar.xz) = 7339b75f421c4b465abbd478e0700e7d2baba6150baaf966a7331a330d3192c522a580edc3fe38a0c3c970a337e2223ebaa6b1e4111152fecf942698111635ca -SHA512 (libosinfo-1.7.1.tar.xz.asc) = 5ff08053f3f1d2d3f2e2d739779dec867867c4af86e0c962b7cbc010cd50e4ea21f9698715c0d73659b089e3130ad1c9ae153d58571808b2c0e188d94554e04d +SHA512 (libosinfo-1.8.0.tar.xz) = 1d831443af9eea6a5ba1edccafcd47e56fc55e3cc43c0572044abc9c70c4eb8bbe0d95019d42bbdc3b680a2f52511863412ea9587c6eb553353b3802e94b2960 +SHA512 (libosinfo-1.8.0.tar.xz.asc) = 81fb06fd6bd1aea56ae6b8295cd809f19dce5e16354eb4c4583909fd6e4b22de76c444cbbe8ca1aafb6272a40726c03fb78034e25967fb35e21799d324dd50ed