Accepting request 694617 from GNOME:Next

OBS-URL: https://build.opensuse.org/request/show/694617
OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/glib2?expand=0&rev=385

0001-Handle-an-UNKNOWN-NetworkManager-connectivity-as-NONE.patch

@@ -1,36 +0,0 @@
-From 2932a58cd5e968d3f398f00ae9f78688c826606e Mon Sep 17 00:00:00 2001
-From: Antonio Larrosa <alarrosa@suse.com>
-Date: Tue, 12 Mar 2019 18:35:10 +0100
-Subject: [PATCH] Handle an UNKNOWN NetworkManager connectivity as NONE
-
-nm_conn_to_g_conn already handles UNKNOWN like NONE (returning
-G_NETWORK_CONNECTIVITY_LOCAL in both cases). So in sync_properties
-we should also set new_connectivity to G_NETWORK_CONNECTIVITY_LOCAL
-for both NM_CONNECTIVITY_UNKNOWN and NM_CONNECTIVITY_NONE.
-
-This has the added benefit that when NetworkManager returns the network
-connectivity is UNKNOWN, we set network_available to FALSE as it should
-be. Previously, there were cases in a laptop with no network access,
-that g_network_monitor_get_network_available returned true, which was
-wrong and is also fixed with this commit.
----
- gio/gnetworkmonitornm.c | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/gio/gnetworkmonitornm.c b/gio/gnetworkmonitornm.c
-index 5bc8c925a..4e2a35e8a 100644
---- a/gio/gnetworkmonitornm.c
-+++ b/gio/gnetworkmonitornm.c
-@@ -167,7 +167,8 @@ sync_properties (GNetworkMonitorNM *nm,
-   nm_connectivity = g_variant_get_uint32 (v);
-   g_variant_unref (v);
- 
--  if (nm_connectivity == NM_CONNECTIVITY_NONE)
-+  if (nm_connectivity == NM_CONNECTIVITY_UNKNOWN ||
-+      nm_connectivity == NM_CONNECTIVITY_NONE)
-     {
-       new_network_available = FALSE;
-       new_network_metered = FALSE;
--- 
-2.21.0
-

glib-2.60.0.tar.xz

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

glib-2.60.1.tar.xz

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

glib2.changes

@@ -1,3 +1,16 @@
+-------------------------------------------------------------------
+Mon Apr 15 19:33:19 UTC 2019 - Bjørn Lie <bjorn.lie@gmail.com>
+
+- Update to version 2.60.1:
+  + Fix documentation for `gdbus-tool wait` to use correct units.
+  + Bugs fixed: glgo#GNOME/GLib#1709, glgo#GNOME/GLib#1725,
+    glgo#GNOME/GLib#1737, glgo#GNOME/GLib!711, glgo#GNOME/GLib!722,
+    glgo#GNOME/GLib!727, glgo#GNOME/GLib!729, glgo#GNOME/GLib!758,
+    glgo#GNOME/GLib!775.
+  + Updated translations.
+- Drop upstream fixed patch:
+  0001-Handle-an-UNKNOWN-NetworkManager-connectivity-as-NONE.patch.
+
 -------------------------------------------------------------------
 Tue Mar  5 16:03:29 UTC 2019 - Antonio Larrosa <alarrosa@suse.com>
 

glib2.spec

@@ -19,7 +19,7 @@
 # systemtap is only offered as build-option, but not enabled, as it causes a build cycle
 %bcond_with     systemtap
 Name:           glib2
-Version:        2.60.0
+Version:        2.60.1
 Release:        0
 Summary:        General-Purpose Utility Library
 License:        LGPL-2.1-or-later
@@ -47,8 +47,6 @@ Patch2:         glib2-suppress-schema-deprecated-path-warning.patch
 Patch3:         glib2-dbus-socket-path.patch
 # PATCH-FIX-OPENSUSE glib2-gdbus-codegen-version.patch  olaf@aepfle.de -- Remove version string from files generated by gdbus-codegen
 Patch4:         glib2-gdbus-codegen-version.patch
-# PATCH-FIX-UPSTREAM 0001-Handle-an-UNKNOWN-NetworkManager-connectivity-as-NONE.patch boo#1103678 alarrosa@suse.com -- Fix check for network availability when NM reports it as unknown
-Patch5:         0001-Handle-an-UNKNOWN-NetworkManager-connectivity-as-NONE.patch
 BuildRequires:  docbook-xsl-stylesheets
 BuildRequires:  fdupes
 BuildRequires:  gamin-devel
@@ -256,7 +254,6 @@ translation-update-upstream
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
-%patch5 -p1
 cp -a %{SOURCE1} %{SOURCE2} %{SOURCE5} .
 cp -a %{SOURCE4} gnome_defaults.conf
 # replace /usr/bin/env shebangs