commit gnome-nettool for openSUSE:Factory
![](https://seccdn.libravatar.org/avatar/e2145bc5cf53dda95c308a3c75e8fef3.jpg?s=120&d=mm&r=g)
Hello community, here is the log from the commit of package gnome-nettool for openSUSE:Factory checked in at Thu May 5 16:50:51 CEST 2011. -------- --- GNOME/gnome-nettool/gnome-nettool.changes 2011-02-13 17:22:48.000000000 +0100 +++ /mounts/work_src_done/STABLE/gnome-nettool/gnome-nettool.changes 2011-04-25 13:20:30.000000000 +0200 @@ -1,0 +2,23 @@ +Wed Apr 6 10:50:31 UTC 2011 - fcrozat@novell.com + +- Update to version 3.0.0: + + Updated translations +- Changes from version 2.91.5: + + Use NetworkManager connection editor if available + + Get working with latest GTK3 +- Changes from version 2.91.2: + + bgo#625900: Use GSettings + + Fix autocompletion and dropdown history +- Remove pkgconfig(gconf-2.0) BuildRequires. +- Replace pkgconfig(gtk+-2.0) BuildRequires with + pkgconfig(gtk+-3.0). +- Add GSettings schemas handling with %glib2_gsettings_schema_* + macros. + +------------------------------------------------------------------- +Tue Mar 15 18:24:23 UTC 2011 - malcolmlewis@opensuse.org + +- Fix bnc#679874: iputils-ping displays icmp_req= instead of + icmp_seq=. Handle the two outputs correctly. + +------------------------------------------------------------------- @@ -189,2 +212,2 @@ - + #408452: Fixed the output for traceroute/ping. (Germ�n Po�-Caama�o) - + #414068: Added missing strings for translation (Germ�n Po�-Caama�o) + + #408452: Fixed the output for traceroute/ping. (Germ�n Po�-Caama�o) + + #414068: Added missing strings for translation (Germ�n Po�-Caama�o) @@ -193 +216 @@ - + #311350: Fixed locale problem in whois (Lo�s Minier) + + #311350: Fixed locale problem in whois (Lo�s Minier) calling whatdependson for head-i586 Old: ---- gnome-nettool-2.32.0.tar.bz2 New: ---- 0001-ping-Handle-output-with-icmp_req.patch gnome-nettool-3.0.0.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gnome-nettool.spec ++++++ --- /var/tmp/diff_new_pack.osKtfB/_old 2011-05-05 16:50:13.000000000 +0200 +++ /var/tmp/diff_new_pack.osKtfB/_new 2011-05-05 16:50:13.000000000 +0200 @@ -18,23 +18,25 @@ Name: gnome-nettool -Version: 2.32.0 -Release: 3 +Version: 3.0.0 +Release: 1 License: GPLv2+ Summary: GNOME Interface for Various Networking Tools Url: http://www.gnome.org Group: System/GUI/GNOME Source: ftp://ftp.gnome.org/pub/GNOME/sources/%{name}/2.16/%{name}-%{version}.tar.bz2 +# PATCH-FIX-UPSTREAM 0001-ping-Handle-output-with-icmp_req.patch bnc#679874 bg0#634749 malcolmlewis@opensuse.org -- Handle output with icmp_req +Patch0: 0001-ping-Handle-output-with-icmp_req.patch BuildRequires: fdupes BuildRequires: gnome-doc-utils-devel BuildRequires: intltool BuildRequires: translation-update-upstream BuildRequires: update-desktop-files -BuildRequires: pkgconfig(gconf-2.0) -BuildRequires: pkgconfig(gtk+-2.0) +BuildRequires: pkgconfig(gtk+-3.0) BuildRequires: pkgconfig(libgtop-2.0) Recommends: %{name}-lang BuildRoot: %{_tmppath}/%{name}-%{version}-build +%glib2_gsettings_schema_requires %description GNOME Nettool is a set of front-ends to various networking command line @@ -44,12 +46,13 @@ %prep %setup -q translation-update-upstream +%patch0 -p1 %build %configure\ --libexecdir=%{_prefix}/lib/%{name}\ --disable-scrollkeeper -make %{?jobs:-j%jobs} +make %{?jobs:-j%jobs} V=1 %install %makeinstall @@ -69,10 +72,12 @@ %post %desktop_database_post %icon_theme_cache_post +%glib2_gsettings_schema_post %postun %desktop_database_postun %icon_theme_cache_postun +%glib2_gsettings_schema_postun %files %defattr (-, root, root) @@ -86,6 +91,7 @@ %doc %{_datadir}/omf/%{name}/%{name}-C.omf %{_bindir}/gnome-nettool %{_datadir}/applications/gnome-nettool.desktop +%{_datadir}/glib-2.0/schemas/org.gnome.gnome-nettool.gschema.xml %{_datadir}/gnome-nettool/ %{_datadir}/icons/hicolor/*/apps/gnome-nettool.png %{_datadir}/icons/hicolor/scalable/apps/gnome-nettool.svg ++++++ 0001-ping-Handle-output-with-icmp_req.patch ++++++
From 9af2e18755725dc47ae8eb2867e3f038c298bc09 Mon Sep 17 00:00:00 2001 From: Josselin Mouette <joss@debian.org> Date: Sat, 13 Nov 2010 13:53:12 +0100 Subject: [PATCH] [ping] Handle output with icmp_req
iputils-ping displays icmp_req= instead of icmp_seq=. Handle the two outputs correctly. --- src/ping.c | 7 ++++--- src/ping.h | 8 ++++---- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/src/ping.c b/src/ping.c index 2c973c3..74f3c19 100644 --- a/src/ping.c +++ b/src/ping.c @@ -405,7 +405,7 @@ ping_foreach_with_tree (Netinfo * netinfo, gchar * line, gint len, if (len > 0) { /* there are data to show */ count = strip_line (line, &data, netinfo); - if ((count == 5) || (count == 6)) { + if ((count == 5) || (count == 7)) { /* Creation of GtkTreeView */ gtk_tree_view_set_rules_hint (GTK_TREE_VIEW @@ -519,6 +519,7 @@ static gint strip_line (gchar * line, ping_data * data, Netinfo * netinfo) { gint count; + gchar dummy_buf[3]; if (netinfo_get_ip_version (netinfo) == IPV4) line = g_strdelimit (line, ":", ' '); @@ -530,9 +531,9 @@ strip_line (gchar * line, ping_data * data, Netinfo * netinfo) &(data)->bytes, data->ip, &(data)->icmp_seq, data->srtt, data->unit); #endif -#ifdef PING_PARAMS_6 +#ifdef PING_PARAMS_7 count = sscanf (line, PING_FORMAT, - &(data)->bytes, data->ip, &(data)->icmp_seq, + &(data)->bytes, data->ip, dummy_buf, &(data)->icmp_seq, &(data)->ttl, data->srtt, data->unit); #endif if (count != 5 && count != 6) { diff --git a/src/ping.h b/src/ping.h index 0d2e068..53dd5de 100644 --- a/src/ping.h +++ b/src/ping.h @@ -28,14 +28,14 @@ /* <path to program> ping -b [-c <count>] -n <host> */ # define PING_PROGRAM_FORMAT "%s ping -b%s-n %s" # define PING_PROGRAM_FORMAT_6 "%s ping6%s-n %s" -# define PING_FORMAT "%d bytes from %s icmp_seq=%d ttl=%d time=%s %s" -# define PING_PARAMS_6 +# define PING_FORMAT "%d bytes from %s icmp_%3c=%d ttl=%d time=%s %s" +# define PING_PARAMS_7 #elif defined(__OSF__) || defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__OpenBSD__) || defined(__NetBSD__) || defined(__DragonFly__) /* <path to program> ping [-c <count>] -n <host> */ # define PING_PROGRAM_FORMAT "%s ping%s-n %s" # define PING_PROGRAM_FORMAT_6 "%s ping6%s-n %s" -# define PING_FORMAT "%d bytes from %s icmp_seq=%d ttl=%d time=%s %s" -# define PING_PARAMS_6 +# define PING_FORMAT "%d bytes from %s icmp_%3c=%d ttl=%d time=%s %s" +# define PING_PARAMS_7 #elif defined(__sun__) /* <path to program> ping -s -n <host> [<count>] */ # define PING_PROGRAM_FORMAT "%s ping -s -n %s 56%s" -- 1.7.2.3 ++++++ gnome-nettool-2.32.0.tar.bz2 -> gnome-nettool-3.0.0.tar.bz2 ++++++ ++++ 39594 lines of diff (skipped) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org
participants (1)
-
root@hilbert.suse.de