diff --git a/.gitignore b/.gitignore index 8cf1c49..134aeff 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ mtr-0.79.tar.gz /mtr-0.80.tar.gz +/mtr-0.81.tar.gz diff --git a/mtr-now-waits-for-last-response.patch b/mtr-now-waits-for-last-response.patch deleted file mode 100644 index 168c104..0000000 --- a/mtr-now-waits-for-last-response.patch +++ /dev/null @@ -1,37 +0,0 @@ -From c196de71466b475192fb4c1910fbcaf91ba36ae7 Mon Sep 17 00:00:00 2001 -From: Jan Gorig -Date: Tue, 26 Oct 2010 10:02:45 +0200 -Subject: [PATCH 3/3] mtr now waits for last response - ---- - select.c | 6 ++++-- - 1 files changed, 4 insertions(+), 2 deletions(-) - -diff --git a/select.c b/select.c -index a53017f..d8e460f 100644 ---- a/select.c -+++ b/select.c -@@ -50,6 +50,7 @@ void select_loop(void) { - int dnsfd, netfd; - int NumPing = 0; - int paused = 0; -+ int quit = 0; - struct timeval lasttime, thistime, selecttime; - int dt; - int rv; -@@ -97,9 +98,10 @@ void select_loop(void) { - (thistime.tv_sec == lasttime.tv_sec + intervaltime.tv_sec && - thistime.tv_usec >= lasttime.tv_usec + intervaltime.tv_usec)) { - lasttime = thistime; -+ if(quit == 1) return; - if(NumPing >= MaxPing && (!Interactive || ForceMaxPing)) -- return; -- if (net_send_batch()) -+ quit = 1; -+ else if (net_send_batch()) - NumPing++; - } - --- -1.7.3.1 - diff --git a/mtr.spec b/mtr.spec index afdde9b..b5137d4 100644 --- a/mtr.spec +++ b/mtr.spec @@ -1,7 +1,7 @@ Summary: A network diagnostic tool Name: mtr -Version: 0.80 -Release: 3%{?dist} +Version: 0.81 +Release: 1%{?dist} Epoch: 2 Group: Applications/Internet License: GPLv2+ @@ -13,7 +13,7 @@ Source3: net-x%{name}.desktop Patch1: mtr-crash-in-xml-mode.patch Patch2: mtr-xml-format-fixes.patch -Patch3: mtr-now-waits-for-last-response.patch +Patch3: mtr081-rh703549.patch BuildRequires: ncurses-devel gtk2-devel desktop-file-utils @@ -40,7 +40,7 @@ diagnostic tool. %patch1 -p1 %patch2 -p1 -%patch3 -p1 +%patch3 -p1 -b .rh703549 %build %configure --enable-gtk2 @@ -91,6 +91,11 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/pixmaps/mtr_icon.xpm %changelog +* Tue Nov 01 2011 Adam Tkac - 2:0.81-1 +- update to 0.81 +- mtr-now-waits-for-last-response.patch is no longer needed +- fixed wide report output (#703549) + * Tue Feb 08 2011 Fedora Release Engineering - 2:0.80-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild diff --git a/mtr081-rh703549.patch b/mtr081-rh703549.patch new file mode 100644 index 0000000..d5bc5f5 --- /dev/null +++ b/mtr081-rh703549.patch @@ -0,0 +1,11 @@ +diff -up mtr-0.81/mtr.c.rh703549 mtr-0.81/mtr.c +--- mtr-0.81/mtr.c.rh703549 2011-11-01 12:17:02.045258713 +0100 ++++ mtr-0.81/mtr.c 2011-11-01 12:17:21.229257381 +0100 +@@ -172,6 +172,7 @@ void parse_arg (int argc, char **argv) + break; + case 'w': + reportwide = 1; ++ DisplayMode = DisplayReport; + break; + case 't': + DisplayMode = DisplayCurses; diff --git a/sources b/sources index ba528fe..ef1f62d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -fa68528eaec1757f52bacf9fea8c68a9 mtr-0.80.tar.gz +b7a7914f1fc1b5a21ab10bdca44356e1 mtr-0.81.tar.gz