From 5d9d53d8696d1afb9bd122b3292304b9f5ed12b7 Mon Sep 17 00:00:00 2001
From: CentOS Sources <bugs@centos.org>
Date: Aug 01 2017 03:51:42 +0000
Subject: import gom-0.3.2-1.el7


---

diff --git a/.gitignore b/.gitignore
index afd0a7d..2390bad 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-SOURCES/gom-0.2.1.tar.xz
+SOURCES/gom-0.3.2.tar.xz
diff --git a/.gom.metadata b/.gom.metadata
index 41c3313..bad11c9 100644
--- a/.gom.metadata
+++ b/.gom.metadata
@@ -1 +1 @@
-27357835540e3ae67451c957bb7b6a98083d52a9 SOURCES/gom-0.2.1.tar.xz
+1b2898b41ad4fe6d1b6a7f9a5ab9a8bdcfa0f035 SOURCES/gom-0.3.2.tar.xz
diff --git a/SOURCES/0001-gom-Fix-converting-pointer-to-GType.patch b/SOURCES/0001-gom-Fix-converting-pointer-to-GType.patch
deleted file mode 100644
index 2045e42..0000000
--- a/SOURCES/0001-gom-Fix-converting-pointer-to-GType.patch
+++ /dev/null
@@ -1,66 +0,0 @@
-From 51af68df5bfcf143bc8cced02f96c79403884a8f Mon Sep 17 00:00:00 2001
-From: Heiher <r@hev.cc>
-Date: Tue, 21 Apr 2015 07:51:00 +0800
-Subject: [PATCH] gom: Fix converting pointer to GType
-
-A gpointer will be the same size as a GType (64-bit), but
-GPOINTER_TO_INT() will clamp that to int (32-bit) causing crashes
-when we try to access the invalid GType values.
-
-This solves crashes when gom was compiled with "-fPIE -pie" CFLAGS
-
-https://bugzilla.gnome.org/show_bug.cgi?id=748196
----
- gom/gom-repository.c | 5 ++---
- gom/gom-resource.c   | 5 ++---
- 2 files changed, 4 insertions(+), 6 deletions(-)
-
-diff --git a/gom/gom-repository.c b/gom/gom-repository.c
-index 873c721..bfa196a 100644
---- a/gom/gom-repository.c
-+++ b/gom/gom-repository.c
-@@ -349,7 +349,7 @@ gom_repository_automatic_migrator (GomRepository  *repository,
-   GList *l;
- 
-   for (l = object_types; l != NULL; l = l->next) {
--    GType type = GPOINTER_TO_INT (l->data);
-+    GType type = (GType) l->data;
-     GomResourceClass *klass;
-     GomCommandBuilder *builder;
-     GList *cmds, *c;
-@@ -479,8 +479,7 @@ gom_repository_find_cb (GomAdapter *adapter,
-    repository = GOM_REPOSITORY(g_async_result_get_source_object(G_ASYNC_RESULT(simple)));
-    g_assert(GOM_IS_REPOSITORY(repository));
- 
--   resource_type = GPOINTER_TO_INT(g_object_get_data(G_OBJECT(simple),
--                                                     "resource-type"));
-+   resource_type = (GType) g_object_get_data(G_OBJECT(simple), "resource-type");
-    g_assert(g_type_is_a(resource_type, GOM_TYPE_RESOURCE));
- 
-    filter = g_object_get_data(G_OBJECT(simple), "filter");
-diff --git a/gom/gom-resource.c b/gom/gom-resource.c
-index f3029eb..b5dc50a 100644
---- a/gom/gom-resource.c
-+++ b/gom/gom-resource.c
-@@ -612,7 +612,7 @@ gom_resource_build_save_cmd (GomResource *resource,
-    for (iter = types; iter; iter = iter->next) {
-       GomCommand *command;
- 
--      resource_type = GPOINTER_TO_INT(iter->data);
-+      resource_type = (GType) iter->data;
- 
-       g_object_set(builder,
-                    "resource-type", resource_type,
-@@ -844,8 +844,7 @@ gom_resource_fetch_m2m_cb (GomAdapter *adapter,
-    g_return_if_fail(G_IS_SIMPLE_ASYNC_RESULT(simple));
- 
-    m2m_table = g_object_get_data(G_OBJECT(simple), "m2m-table");
--   resource_type = GPOINTER_TO_INT(g_object_get_data(G_OBJECT(simple),
--                                                     "resource-type"));
-+   resource_type = (GType) g_object_get_data(G_OBJECT(simple), "resource-type");
-    filter = g_object_get_data(G_OBJECT(simple), "filter");
-    resource = GOM_RESOURCE(g_async_result_get_source_object(G_ASYNC_RESULT(simple)));
-    repository = gom_resource_get_repository(resource);
--- 
-2.4.3
-
diff --git a/SPECS/gom.spec b/SPECS/gom.spec
index df80469..2bce3bf 100644
--- a/SPECS/gom.spec
+++ b/SPECS/gom.spec
@@ -1,11 +1,11 @@
 Name:           gom
-Version:        0.2.1
-Release:        3%{?dist}
+Version:        0.3.2
+Release:        1%{?dist}
 Summary:        GObject to SQLite object mapper library
 
 License:        LGPLv2+
 URL:            https://wiki.gnome.org/Projects/Gom
-Source0:        https://download.gnome.org/sources/gom/0.2/gom-%{version}.tar.xz
+Source0:        https://download.gnome.org/sources/gom/0.3/gom-%{version}.tar.xz
 
 BuildRequires:  gobject-introspection-devel
 BuildRequires:  intltool
@@ -14,8 +14,6 @@ BuildRequires:  pkgconfig(gio-2.0)
 BuildRequires:  pkgconfig(gobject-2.0)
 BuildRequires:  pkgconfig(sqlite3)
 
-Patch0: 0001-gom-Fix-converting-pointer-to-GType.patch
-
 %description
 Gom provides an object mapper from GObjects to SQLite. It helps you write
 applications that need to store structured data as well as make complex queries
@@ -31,7 +29,6 @@ developing applications that use %{name}.
 
 %prep
 %setup -q
-%patch0 -p1
 
 %build
 %configure --disable-static
@@ -60,6 +57,10 @@ find $RPM_BUILD_ROOT -name '*.la' -delete
 %doc %{_datadir}/gtk-doc/
 
 %changelog
+* Tue Dec 29 2015 Kalev Lember <klember@redhat.com> - 0.3.2-1
+- Update to 0.3.2
+- Resolves: #1386973
+
 * Fri Sep 11 2015 Bastien Nocera <bnocera@redhat.com> 0.2.1-3
 - Fix crasher during startup
 Resolves: #1261939