Accepting request 233843 from home:gary_lin:branches:GNOME:Factory

match the predictable device name (bnc#866643)

OBS-URL: https://build.opensuse.org/request/show/233843
OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gnome-nettool?expand=0&rev=50
This commit is contained in:
2014-05-18 13:20:49 +00:00
committed by Git OBS Bridge
parent 2434306951
commit c43d1befce
3 changed files with 24 additions and 1 deletions

View File

@@ -0,0 +1,14 @@
diff --git a/src/info.c b/src/info.c
index 4a5ebfb..9094425 100644
--- a/src/info.c
+++ b/src/info.c
@@ -59,7 +59,8 @@ static InfoInterfaceDescription info_iface_desc [] = {
/* Interface Name Interface Type icon Device prefix Pixbuf */
{ N_("Other type"), INFO_INTERFACE_OTHER, "network.png", "other_type", NULL },
{ N_("Ethernet Interface"), INFO_INTERFACE_ETH, "16_ethernet.xpm", "eth", NULL },
- { N_("Wireless Interface"), INFO_INTERFACE_WLAN, "wavelan-16.png", "wlan", NULL },
+ { N_("Ethernet Interface"), INFO_INTERFACE_ETH, "16_ethernet.xpm", "en", NULL },
+ { N_("Wireless Interface"), INFO_INTERFACE_WLAN, "wavelan-16.png", "wl", NULL },
{ N_("Modem Interface"), INFO_INTERFACE_PPP, "16_ppp.xpm", "ppp", NULL },
{ N_("Parallel Line Interface"), INFO_INTERFACE_PLIP, "16_plip.xpm", "plip", NULL },
{ N_("Infrared Interface"), INFO_INTERFACE_IRLAN, "irda-16.png", "irlan", NULL },

View File

@@ -1,3 +1,9 @@
-------------------------------------------------------------------
Wed May 14 08:52:22 UTC 2014 - glin@suse.com
- Add gnome-nettool-bnc866643-predictable-name.patch to match the
predictable device name (bnc#866643)
------------------------------------------------------------------- -------------------------------------------------------------------
Fri May 31 18:51:15 UTC 2013 - zaitor@opensuse.org Fri May 31 18:51:15 UTC 2013 - zaitor@opensuse.org

View File

@@ -1,7 +1,7 @@
# #
# spec file for package gnome-nettool # spec file for package gnome-nettool
# #
# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. # Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
# #
# All modifications and additions to the file contributed by third parties # All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed # remain the property of their copyright owners, unless otherwise agreed
@@ -24,6 +24,8 @@ License: GPL-2.0+
Group: System/GUI/GNOME Group: System/GUI/GNOME
Url: http://www.gnome.org Url: http://www.gnome.org
Source: http://download.gnome.org/sources/gnome-nettool/3.8/%{name}-%{version}.tar.xz Source: http://download.gnome.org/sources/gnome-nettool/3.8/%{name}-%{version}.tar.xz
# PATCH-FIX-UPSTREAM gnome-nettool-bnc866643-predictable-name.patch bnc#866643 glin@suse.com -- Detect the predictable network device name
Patch1: gnome-nettool-bnc866643-predictable-name.patch
BuildRequires: fdupes BuildRequires: fdupes
BuildRequires: intltool BuildRequires: intltool
BuildRequires: translation-update-upstream BuildRequires: translation-update-upstream
@@ -52,6 +54,7 @@ tools, like ping, netstat, ifconfig, whois, traceroute, and finger.
%lang_package %lang_package
%prep %prep
%setup -q %setup -q
%patch1 -p1
translation-update-upstream translation-update-upstream
%build %build