Hello community,
here is the log from the commit of package gnome-control-center for
openSUSE:Factory checked in at 2015-01-29 09:54:59
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/gnome-control-center (Old)
and /work/SRC/openSUSE:Factory/.gnome-control-center.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "gnome-control-center"
Changes:
--------
---
/work/SRC/openSUSE:Factory/gnome-control-center/gnome-control-center.changes
2014-11-26 22:56:19.000000000 +0100
+++
/work/SRC/openSUSE:Factory/.gnome-control-center.new/gnome-control-center.changes
2015-01-29 09:55:02.000000000 +0100
@@ -1,0 +2,8 @@
+Tue Jan 27 16:24:06 UTC 2015 - [email protected]
+
+- Add gnome-control-center-NM-1.0.patch: Add compatibility to
+ NetworkManager 1.0.
+- Disable gnome-control-center-probe-radius-server-cert.patch until
+ NetworkManager has been fixed up again.
+
+-------------------------------------------------------------------
New:
----
gnome-control-center-NM-1.0.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ gnome-control-center.spec ++++++
--- /var/tmp/diff_new_pack.l3YwvK/_old 2015-01-29 09:55:03.000000000 +0100
+++ /var/tmp/diff_new_pack.l3YwvK/_new 2015-01-29 09:55:03.000000000 +0100
@@ -1,7 +1,7 @@
#
# spec file for package gnome-control-center
#
-# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -47,6 +47,8 @@
Patch16: gnome-control-center-probe-radius-server-cert.patch
# PATCH-FEATURE-OPENSUSE
gnome-control-center-follow-polkit-permissions-for-tz.patch boo#904058
[email protected] -- Follow polkit permissions for allowing/locking timezone
setting changes
Patch17: gnome-control-center-follow-polkit-permissions-for-tz.patch
+# PATCH-FIX-UPSTREAM gnome-control-center-NM-1.0.patch [email protected] --
Allow to operate with NetworkManager 1.0
+Patch18: gnome-control-center-NM-1.0.patch
BuildRequires: cups-devel
BuildRequires: desktop-file-utils
BuildRequires: fdupes
@@ -180,10 +182,11 @@
%patch0 -p1
%patch1 -p1
%patch15 -p1
-%patch16 -p1
+#patch16 -p1
%patch17 -p1
#NEEDS-REBASE
#patch14 -p1
+%patch18 -p1
%build
ACLOCAL_FLAGS="-I libgd" NOCONFIGURE=1 gnome-autogen.sh
++++++ gnome-control-center-NM-1.0.patch ++++++
>From f30e6df1d4665b06a45ad7bbe7a2ed2bfa9387f5 Mon Sep 17 00:00:00 2001
From: Bastien Nocera <[email protected]>
Date: Thu, 18 Dec 2014 08:04:00 +0100
Subject: network: Also work with NM 1.0
Remove the NetworkManager version checking altogether. The code was made
to check for now very old versions of NetworkManager, and anything newer
than ancient should degrade gracefully if we support newer features.
https://bugzilla.gnome.org/show_bug.cgi?id=741661
diff --git a/panels/network/cc-network-panel.c
b/panels/network/cc-network-panel.c
index 90b265e..28f6158 100644
--- a/panels/network/cc-network-panel.c
+++ b/panels/network/cc-network-panel.c
@@ -1321,30 +1321,17 @@ static gboolean
panel_check_network_manager_version (CcNetworkPanel *panel)
{
const gchar *version;
- gchar **split = NULL;
- guint major = 0;
- guint micro = 0;
- guint minor = 0;
gboolean ret = TRUE;
/* parse running version */
version = nm_client_get_version (panel->priv->client);
- if (version != NULL) {
- split = g_strsplit (version, ".", -1);
- major = atoi (split[0]);
- minor = atoi (split[1]);
- micro = atoi (split[2]);
- }
-
- /* is it too new or old */
- if (major > 0 || minor > 9 || (minor <= 8 && micro < 992)) {
+ if (version == NULL) {
ret = FALSE;
/* do modal dialog in idle so we don't block startup */
panel->priv->nm_warning_idle = g_idle_add
((GSourceFunc)display_version_warning_idle, panel);
}
- g_strfreev (split);
return ret;
}
@@ -1391,8 +1378,8 @@ on_toplevel_map (GtkWidget *widget,
{
gboolean ret;
- /* is the user compiling against a new version, but running an
- * old daemon version? */
+ /* is the user compiling against a new version, but not running
+ * the daemon? */
ret = panel_check_network_manager_version (panel);
if (ret) {
manager_running (panel->priv->client, NULL, panel);
--
cgit v0.10.1
--
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
