packages/NetworkManager
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

!8 删除无效patch

Browse Source 
Merge pull request !8 from Robertxw/bugfix
This commit is contained in:
openeuler-ci-bot 2020-07-20 14:17:06 +08:00 committed by Gitee
commit 2c42de3233
2 changed files with 7 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
NetworkManager.spec
View File

@ -46,7 +46,7 @@
Name: NetworkManager Name: NetworkManager
Version: 1.20.10 Version: 1.20.10
Epoch: 1 Epoch: 1
Release: 1 Release: 2
Summary: Network Link Manager and User Applications Summary: Network Link Manager and User Applications
License: GPLv2+ License: GPLv2+
URL: https://www.gnome.org/projects/NetworkManager/ URL: https://www.gnome.org/projects/NetworkManager/
@ -57,7 +57,6 @@ Source2: 00-server.conf
Patch9000: fix-wants-and-add-requires.patch Patch9000: fix-wants-and-add-requires.patch
Patch9001: bugfix-NetworkManager-tui-solve-bond-module.patch Patch9001: bugfix-NetworkManager-tui-solve-bond-module.patch
Patch9002: bugfix-NetworkManager-tui-bond-page-when-modify.patch Patch9002: bugfix-NetworkManager-tui-bond-page-when-modify.patch
Patch9003: bugfix-NetworkManager-tui-solve-team-page-problem-when-use-json.patch
BuildRequires: gcc libtool pkgconfig automake autoconf intltool gettext-devel ppp-devel gnutls-devel BuildRequires: gcc libtool pkgconfig automake autoconf intltool gettext-devel ppp-devel gnutls-devel
BuildRequires: dbus-devel dbus-glib-devel glib2-devel gobject-introspection-devel jansson-devel BuildRequires: dbus-devel dbus-glib-devel glib2-devel gobject-introspection-devel jansson-devel
@ -394,6 +393,12 @@ fi
%{_datadir}/gtk-doc/html/NetworkManager/* %{_datadir}/gtk-doc/html/NetworkManager/*
%changelog %changelog
* Thu Jul 2 2020 gaoxingwang <gxw94linux@163.com> - 1.20.10-2
- Type:bugfix
- ID:NA
- SUG:NA
- DESC:delete a useless patch
* Fri Jun 22 2020 zhujunhao <zhujunhao8@huawei.com> - 1.20.10-1 * Fri Jun 22 2020 zhujunhao <zhujunhao8@huawei.com> - 1.20.10-1
- Type:bugfix - Type:bugfix
- ID:NA - ID:NA

26
bugfix-NetworkManager-tui-solve-team-page-problem-when-use-json.patch
View File

@ -1,26 +0,0 @@
From 4ad2335f5b798046e530fa1c670d0f0ffdea200a Mon Sep 17 00:00:00 2001
From: zhangyao <zhangyao65@huawei.com>
Date: Wed, 25 Sep 2019 17:45:01 +0800
Subject: [PATCH] NetworkManager-tui: solve team page problem when use json
---
NetworkManager-1.16.0/clients/tui/newt/nmt-newt-utils.c | 2 --
1 file changed, 2 deletions(-)
diff --git NetworkManager-1.16.0/clients/tui/newt/nmt-newt-utils.c NetworkManager-1.16.0/clients/tui/newt/nmt-newt-utils.c
index 475faf7..8a14f68 100644
--- NetworkManager-1.16.0/clients/tui/newt/nmt-newt-utils.c
+++ NetworkManager-1.16.0/clients/tui/newt/nmt-newt-utils.c
@@ -102,9 +102,7 @@ nmt_newt_basic_g_log_handler (const char *log_domain,
const char *message,
gpointer user_data)
{
- newtSuspend ();
g_log_default_handler (log_domain, log_level, message, NULL);
- newtResume ();
}
static void
--
1.8.3.1