fixes for #834110 and #836258 merged upstream

2012-07-02 17:00:55 +02:00 · 2012-07-02 17:00:55 +02:00 · 211b2a6031
commit 211b2a6031
parent 7ac3b00762
3 changed files with 7 additions and 3 deletions
--- 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
--- 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/)

--- a/2
+++ b/2
@ -1 +1 @@
-8587eb5db6d7018accaae2a558e92056  net-tools-1.60.20120509git.tar.xz
+c4cacddf161b12aaa47db5ea7d10d690  net-tools-1.60.20120702git.tar.xz