From d6f53aea73c53ef61943b4dedf21204d3354183a Mon Sep 17 00:00:00 2001
From: Adam Tkac <atkac@redhat.com>
Date: Mon, 18 Feb 2013 15:53:51 +0100
Subject: [PATCH] Update to 0.83

Signed-off-by: Adam Tkac <atkac@redhat.com>
---
 .gitignore                 |  1 +
 mtr-xml-format-fixes.patch | 29 ++++++++---------------------
 mtr.spec                   | 11 +++++++----
 mtr081-rh703549.patch      | 11 -----------
 sources                    |  2 +-
 5 files changed, 17 insertions(+), 37 deletions(-)
 delete mode 100644 mtr081-rh703549.patch

diff --git a/.gitignore b/.gitignore
index 020785c..7248587 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@ mtr-0.79.tar.gz
 /mtr-0.80.tar.gz
 /mtr-0.81.tar.gz
 /mtr-0.82.tar.gz
+/mtr-0.83.tar.gz
diff --git a/mtr-xml-format-fixes.patch b/mtr-xml-format-fixes.patch
index 9d48a81..286fae5 100644
--- a/mtr-xml-format-fixes.patch
+++ b/mtr-xml-format-fixes.patch
@@ -1,19 +1,9 @@
-From 9932c19ce5f5c66fca3b1e2cab42348e3babcda6 Mon Sep 17 00:00:00 2001
-From: Jan Gorig <jgorig@redhat.com>
-Date: Mon, 25 Oct 2010 12:56:13 +0200
-Subject: [PATCH 2/3] XML format fixes
-
----
- report.c |   16 ++++++++--------
- 1 files changed, 8 insertions(+), 8 deletions(-)
-
-diff --git a/report.c b/report.c
-index 49dfcfb..4c67358 100644
---- a/report.c
-+++ b/report.c
-@@ -185,19 +185,19 @@ void xml_close(void)
+diff -up mtr-0.83/report.c.orig mtr-0.83/report.c
+--- mtr-0.83/report.c.orig	2013-02-18 15:46:33.000000000 +0100
++++ mtr-0.83/report.c	2013-02-18 15:51:38.263294586 +0100
+@@ -212,19 +212,19 @@ void xml_close(void)
+   ip_t *addr;
    char name[81];
-   struct hostent *host;
  
 -  printf("<MTR SRC=%s DST=%s", LocalHostname, Hostname);
 -  printf(" TOS=0x%X", tos);
@@ -38,15 +28,12 @@ index 49dfcfb..4c67358 100644
  
    max = net_max();
    at  = net_min();
-@@ -217,7 +217,7 @@ void xml_close(void)
-       }
-     }
+@@ -232,7 +232,7 @@ void xml_close(void)
+     addr = net_addr(at);
+     snprint_addr(name, sizeof(name), addr);
  
 -    printf("    <HUB COUNT=%d HOST=%s>\n", at+1, name);
 +    printf("    <HUB COUNT=\"%d\" HOST=\"%s\">\n", at+1, name);
      for( i=0; i<MAXFLD; i++ ) {
        j = fld_index[fld_active[i]];
        if (j <= 0) continue;
--- 
-1.7.3.1
-
diff --git a/mtr.spec b/mtr.spec
index c518d9b..bdadf8b 100644
--- a/mtr.spec
+++ b/mtr.spec
@@ -1,7 +1,7 @@
 Summary: A network diagnostic tool
 Name: mtr
-Version: 0.82
-Release: 5%{?dist}
+Version: 0.83
+Release: 1%{?dist}
 Epoch:	2
 Group: Applications/Internet
 License: GPLv2+
@@ -13,7 +13,6 @@ Source3: net-x%{name}.desktop
 
 Patch1: mtr-crash-in-xml-mode.patch
 Patch2: mtr-xml-format-fixes.patch
-Patch3: mtr081-rh703549.patch
 
 BuildRequires: ncurses-devel gtk2-devel desktop-file-utils
 
@@ -40,7 +39,6 @@ diagnostic tool.
 
 %patch1 -p1
 %patch2 -p1
-%patch3 -p1 -b .rh703549
 
 %build
 %configure --enable-gtk2
@@ -98,6 +96,11 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/pixmaps/mtr_icon.xpm
 
 %changelog
+* Mon Feb 18 2013 Adam Tkac <atkac redhat com> - 2:0.83-1
+- update to 0.83
+- patches merged
+  - mtr081-rh703549.patch
+
 * Thu Feb 14 2013 Toshio Kuratomi <toshio@fedoraproject.org> - 2:0.82-5
 - Remove --vendor flag from desktop-file-install https://fedorahosted.org/fesco/ticket/1077
 
diff --git a/mtr081-rh703549.patch b/mtr081-rh703549.patch
deleted file mode 100644
index d5bc5f5..0000000
--- a/mtr081-rh703549.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-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 155a5c5..77655e8 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-10601ea543fda3e51545c4bce195b64c  mtr-0.82.tar.gz
+2e3a40f2da47748ad0053a5d678b9b4a  mtr-0.83.tar.gz