[iputils] Update to iputils-s20121207 (#890397) and remove unnecessary patches

[jsynacek]

commit c3a39c6229b616b8a947f06a3a74ed1cd43b94fb
Author: Jan Synacek <jsynacek at redhat.com>
Date:   Mon Jan 7 13:52:02 2013 +0100

    Update to iputils-s20121207 (#890397) and remove unnecessary patches

 iputils-20020927-rh.patch              |   37 +++++---
 iputils-20121125-ninfod-minor.patch    |  171 --------------------------------
 iputils-20121207-ping6-flowlabel.patch |   30 ------
 iputils.spec                           |   11 +--
 4 files changed, 27 insertions(+), 222 deletions(-)
---
diff --git a/iputils-20020927-rh.patch b/iputils-20020927-rh.patch
index 65ce8e4..32ec1bc 100644
--- a/iputils-20020927-rh.patch
+++ b/iputils-20020927-rh.patch
@@ -1,8 +1,26 @@
 Fedora-specific makefile patch.
 
---- iputils-s20121205/Makefile.orig	2012-12-05 15:46:14.000000000 +0100
-+++ iputils-s20121205/Makefile	2012-12-06 11:38:14.752414482 +0100
-@@ -46,7 +46,7 @@
+--- iputils-s20121221-dist/Makefile	2013-01-07 13:37:04.913224305 +0100
++++ iputils-s20121221-new/Makefile	2013-01-07 13:42:56.542052062 +0100
+@@ -27,7 +27,7 @@
+ # sysfs support (with libsysfs - deprecated) [no|yes|static]
+ USE_SYSFS=no
+ # IDN support (experimental) [no|yes|static]
+-USE_IDN=no
++USE_IDN=yes
+ 
+ # Do not use getifaddrs [no|yes|static]
+ WITHOUT_IFADDRS=no
+@@ -35,7 +35,7 @@
+ ARPING_DEFAULT_DEVICE=
+ 
+ # GNU TLS library for ping6 [yes|no|static]
+-USE_GNUTLS=yes
++USE_GNUTLS=no
+ # Crypto library for ping6 [shared|static]
+ USE_CRYPTO=shared
+ # Resolv library for ping6 [yes|static]
+@@ -49,7 +49,7 @@
  # -------------------------------------
  # What a pity, all new gccs are buggy and -Werror does not work. Sigh.
  # CCOPT=-fno-strict-aliasing -Wstrict-prototypes -Wall -Werror -g
@@ -11,16 +29,7 @@ Fedora-specific makefile patch.
  CCOPTOPT=-O3
  GLIBCFIX=-D_GNU_SOURCE
  DEFINES=
-@@ -73,7 +73,7 @@
- endif
- 
- # USE_IDN: DEF_IDN, LIB_IDN
--ifneq ($(USE_IDN),no)
-+ifneq ($(USE_IDN),yes)
- 	DEF_IDN = -DUSE_IDN
- 	LIB_IDN = $(call FUNC_LIB,$(USE_IDN),$(LDFLAG_IDN))
- endif
-@@ -101,7 +101,7 @@
+@@ -110,7 +110,7 @@
  IPV6_TARGETS=tracepath6 traceroute6 ping6
  TARGETS=$(IPV4_TARGETS) $(IPV6_TARGETS)
  
@@ -29,7 +38,7 @@ Fedora-specific makefile patch.
  LDLIBS=$(LDLIB) $(ADDLIB)
  
  UNAME_N:=$(shell uname -n)
-@@ -178,6 +178,7 @@
+@@ -187,6 +187,7 @@
  
  # -------------------------------------
  # ninfod
diff --git a/iputils.spec b/iputils.spec
index 475793c..9becb6b 100644
--- a/iputils.spec
+++ b/iputils.spec
@@ -1,6 +1,6 @@
 Summary: Network monitoring tools including ping
 Name: iputils
-Version: 20121207
+Version: 20121221
 Release: 1%{?dist}
 # some parts are under the original BSD (ping.c)
 # some are under GPLv2+ (tracepath.c)
@@ -17,10 +17,6 @@ Source6: ninfod.service
 
 Patch0: iputils-20020927-rh.patch
 Patch1: iputils-ifenslave.patch
-# upstreamed
-Patch2: iputils-20121125-ninfod-minor.patch
-# pending upstream approval
-Patch3: iputils-20121207-ping6-flowlabel.patch
 
 BuildRequires: docbook-utils perl-SGMLSpm
 BuildRequires: glibc-kernheaders >= 2.4-8.19
@@ -70,8 +66,6 @@ Queries.
 
 %patch0 -p1 -b .rh
 %patch1 -p1 -b .addr
-%patch2 -p1 -b .ninfod-minor
-%patch3 -p1 -b .flowlabel
 
 %build
 %ifarch s390 s390x
@@ -179,6 +173,9 @@ mv -f RELNOTES.tmp RELNOTES
 %attr(644,root,root) %{_mandir}/man8/ninfod.8.gz
 
 %changelog
+* Mon Jan 07 2013 Jan Synáček <jsynacek at redhat.com> - 20121221-1
+- Update to iputils-s20121207 (#890397) and remove unnecessary patches
+
 * Fri Dec 07 2012 Jan Synáček <jsynacek at redhat.com> - 20121207-1
 - Update to iputils-s20121207 (#884983) - fixes a ping segfault introduced
   by the previous update