From 92e60256d34252723f499f36b3a75b83ea5f4c95 Mon Sep 17 00:00:00 2001 From: gaoxingwang Date: Thu, 2 Jul 2020 23:46:08 +0800 Subject: [PATCH] The problem has been solved because of version update,so delete the useless patch --- NetworkManager.spec | 9 +++++-- ...olve-team-page-problem-when-use-json.patch | 26 ------------------- 2 files changed, 7 insertions(+), 28 deletions(-) delete mode 100644 bugfix-NetworkManager-tui-solve-team-page-problem-when-use-json.patch diff --git a/NetworkManager.spec b/NetworkManager.spec index 7801680..5174261 100644 --- a/NetworkManager.spec +++ b/NetworkManager.spec @@ -46,7 +46,7 @@ Name: NetworkManager Version: 1.20.10 Epoch: 1 -Release: 1 +Release: 2 Summary: Network Link Manager and User Applications License: GPLv2+ URL: https://www.gnome.org/projects/NetworkManager/ @@ -57,7 +57,6 @@ Source2: 00-server.conf Patch9000: fix-wants-and-add-requires.patch Patch9001: bugfix-NetworkManager-tui-solve-bond-module.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: dbus-devel dbus-glib-devel glib2-devel gobject-introspection-devel jansson-devel @@ -394,6 +393,12 @@ fi %{_datadir}/gtk-doc/html/NetworkManager/* %changelog +* Thu Jul 2 2020 gaoxingwang - 1.20.10-2 +- Type:bugfix +- ID:NA +- SUG:NA +- DESC:delete a useless patch + * Fri Jun 22 2020 zhujunhao - 1.20.10-1 - Type:bugfix - ID:NA diff --git a/bugfix-NetworkManager-tui-solve-team-page-problem-when-use-json.patch b/bugfix-NetworkManager-tui-solve-team-page-problem-when-use-json.patch deleted file mode 100644 index ec25711..0000000 --- a/bugfix-NetworkManager-tui-solve-team-page-problem-when-use-json.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 4ad2335f5b798046e530fa1c670d0f0ffdea200a Mon Sep 17 00:00:00 2001 -From: zhangyao -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 - -- Gitee