From 955a154d9abf489b0d2cc8b93b05140e1e9c32c7ad3b2ab269658a75e6e81a35 Mon Sep 17 00:00:00 2001
From: Dominique Leuenberger <dimstar@opensuse.org>
Date: Thu, 25 Sep 2014 07:53:17 +0000
Subject: [PATCH] Accepting request 251874 from GNOME:Next

Push GNOME 3.14.0

OBS-URL: https://build.opensuse.org/request/show/251874
OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/glib2?expand=0&rev=259
---
 glib-2.41.4.tar.xz |  3 ---
 glib-2.42.0.tar.xz |  3 +++
 glib2.changes      | 27 +++++++++++++++++++++++++++
 glib2.spec         |  4 ++--
 4 files changed, 32 insertions(+), 5 deletions(-)
 delete mode 100644 glib-2.41.4.tar.xz
 create mode 100644 glib-2.42.0.tar.xz

diff --git a/glib-2.41.4.tar.xz b/glib-2.41.4.tar.xz
deleted file mode 100644
index 150b3cb..0000000
--- a/glib-2.41.4.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:1661bc4abfd1b0b59ae7abbef9d6a60c32192a7a65122753d5d8cc2db110fbf7
-size 6973440
diff --git a/glib-2.42.0.tar.xz b/glib-2.42.0.tar.xz
new file mode 100644
index 0000000..35fe054
--- /dev/null
+++ b/glib-2.42.0.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:94fbc0a7d10633433ff383e540607de649c1b46baaa59dea446a50977a6c4472
+size 7062896
diff --git a/glib2.changes b/glib2.changes
index cdc7dca..9936b7f 100644
--- a/glib2.changes
+++ b/glib2.changes
@@ -1,3 +1,30 @@
+-------------------------------------------------------------------
+Mon Sep 22 18:37:27 UTC 2014 - zaitor@opensuse.org
+
+- Update to version 2.42.0:
+  + Introspection warning fixes.
+  + g_application_add_main_option now uses an enum instead of an
+    'int' for the type of a parameter.
+  + Added a G_OPTION_FLAG_NONE so that people don't need to use 0.
+  + gresource: Use GError in more places.
+  + gresource commandline tool: improve extraction from multiple
+    sections.
+  + GSource now takes the context lock (if any) in
+    g_source_set_name().
+  + New documentation to clarify the use of some APIs related to
+    GVariant, GSource, GApplication.
+  + Other minor updates to docs.
+  + Bugs fixed: bgo#736683, bgo#736975.
+  + Updated translations.
+
+-------------------------------------------------------------------
+Tue Sep 16 19:56:48 UTC 2014 - dimstar@opensuse.org
+
+- Update to version 2.41.5:
+  + Bugs fixed: bgo#735819, bgo#735915, bgo#736350, bgo#736351,
+    bgo#736458.
+  + Updated translations.
+
 -------------------------------------------------------------------
 Mon Sep  8 09:53:20 UTC 2014 - jengelh@inai.de
 
diff --git a/glib2.spec b/glib2.spec
index 768d900..ed34d8d 100644
--- a/glib2.spec
+++ b/glib2.spec
@@ -20,14 +20,14 @@
 
 Name:           glib2
 %define _name glib
-Version:        2.41.4
+Version:        2.42.0
 Release:        0
 # FIXME: find out if tapsets should really be in devel package or in main package
 Summary:        General-Purpose Utility Library
 License:        LGPL-2.1+
 Group:          System/Libraries
 Url:            http://www.gtk.org/
-Source:         http://download.gnome.org/sources/glib/2.41/%{_name}-%{version}.tar.xz
+Source:         http://download.gnome.org/sources/glib/2.42/%{_name}-%{version}.tar.xz
 Source1:        glib2.sh
 Source2:        glib2.csh
 # Not upstream file. Only proposes upstream packages: