From 211b2a60311680f958000372e41f37561ee9e436 Mon Sep 17 00:00:00 2001
From: Jiri Popelka <jpopelka@redhat.com>
Date: Mon, 2 Jul 2012 17:00:55 +0200
Subject: [PATCH] fixes for #834110 and #836258 merged upstream

---
 .gitignore     | 1 +
 net-tools.spec | 7 +++++--
 sources        | 2 +-
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/.gitignore b/.gitignore
index bbbb595..a02822c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,3 +6,4 @@ net-tools-1.60.tar.bz2
 /net-tools-1.60.20120119git.tar.xz
 /net-tools-1.60.20120127git.tar.xz
 /net-tools-1.60.20120509git.tar.xz
+/net-tools-1.60.20120702git.tar.xz
diff --git a/net-tools.spec b/net-tools.spec
index 0c7a16a..4af49a6 100644
--- a/net-tools.spec
+++ b/net-tools.spec
@@ -1,9 +1,9 @@
-%global checkout 20120509git
+%global checkout 20120702git
 
 Summary: Basic networking tools
 Name: net-tools
 Version: 1.60
-Release: 137.%{checkout}%{?dist}
+Release: 138.%{checkout}%{?dist}
 License: GPL+
 Group: System Environment/Base
 URL: http://net-tools.sourceforge.net
@@ -160,6 +160,9 @@ fi
 %attr(0644,root,root)   %{_unitdir}/arp-ethers.service
 
 %changelog
+* Mon Jul 02 2012 Jiri Popelka <jpopelka@redhat.com> - 1.60-138.20120702git
+- fixes for #834110 and #836258 merged upstream
+
 * Wed Jun 20 2012 Jiri Popelka <jpopelka@redhat.com> - 1.60-137.20120509git
 - compile without Token ring support (http://lwn.net/Articles/497397/)
 
diff --git a/sources b/sources
index e309ec1..0c3de47 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-8587eb5db6d7018accaae2a558e92056  net-tools-1.60.20120509git.tar.xz
+c4cacddf161b12aaa47db5ea7d10d690  net-tools-1.60.20120702git.tar.xz