From 96bd63d1e2caefa7ac900f9e08117c3da9fcb829 Mon Sep 17 00:00:00 2001
From: Martin Bacovsky <mbacovsk@fedoraproject.org>
Date: Thu, 15 Mar 2007 17:40:40 +0000
Subject: [PATCH] - fixed things necessery for revision

---
 iputils-20020927-rh.patch | 13 +++----------
 iputils.spec              | 17 +++++++++--------
 2 files changed, 12 insertions(+), 18 deletions(-)

diff --git a/iputils-20020927-rh.patch b/iputils-20020927-rh.patch
index 23d6fd8..930ccbc 100644
--- a/iputils-20020927-rh.patch
+++ b/iputils-20020927-rh.patch
@@ -11,21 +11,14 @@
  
 --- iputils/Makefile.rh7	2002-09-20 20:23:55.000000000 +0200
 +++ iputils/Makefile	2004-05-12 15:08:25.638310270 +0200
-@@ -24,14 +24,14 @@
+@@ -24,8 +24,8 @@
  CC=gcc
  # What a pity, all new gccs are buggy and -Werror does not work. Sigh.
  #CCOPT=-D_GNU_SOURCE -O2 -Wstrict-prototypes -Wall -g -Werror
 -CCOPT=-D_GNU_SOURCE -O2 -Wstrict-prototypes -Wall -g
--CFLAGS=$(CCOPT) $(GLIBCFIX) -I$(KERNEL_INCLUDE) -I../include $(DEFINES) 
+-CFLAGS=$(CCOPT) $(GLIBCFIX) $(DEFINES) 
 +#CCOPT=-D_GNU_SOURCE -O2 -Wstrict-prototypes -Wall -g
-+#CFLAGS=$(CCOPT) $(DEFINES) 
++#CFLAGS=$(CCOPT) $(GLIBCFIX) $(DEFINES) 
  
  IPV4_TARGETS=tracepath ping clockdiff rdisc arping tftpd rarpd
  IPV6_TARGETS=tracepath6 traceroute6 ping6
- TARGETS=$(IPV4_TARGETS) $(IPV6_TARGETS)
- 
--all: check-kernel $(TARGETS)
-+all: $(TARGETS)
- 
- 
- tftpd: tftpd.o tftpsubs.o
diff --git a/iputils.spec b/iputils.spec
index 9c1d36a..f6d9d1d 100644
--- a/iputils.spec
+++ b/iputils.spec
@@ -8,7 +8,7 @@ Group: System Environment/Daemons
 Source0: http://www.skbuff.net/iputils/%{name}-s%{version}.tar.bz2
 Source1: ifenslave.tar.gz
 Source3: rdisc.initd
-#Patch0: iputils-20020927-rh.patch
+Patch0: iputils-20020927-rh.patch
 Patch3: iputils-20020124-countermeasures.patch
 Patch4: iputils-20020927-addrcache.patch
 Patch5: iputils-20020927-ping-subint.patch
@@ -19,12 +19,12 @@ Patch21: iputils-ping_cleanup.patch
 Patch22: iputils-ifenslave.patch
 Patch25: iputils-20020927-arping-infiniband.patch
 
-Prefix: %{_prefix}
-BuildRoot: %{_tmppath}/%{name}-root
-BuildPreReq: docbook-utils perl-SGMLSpm
-BuildPreReq: glibc-kernheaders >= 2.4-8.19
-PreReq: chkconfig
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+BuildRequires: docbook-utils perl-SGMLSpm
+BuildRequires: glibc-kernheaders >= 2.4-8.19
 BuildRequires: libsysfs-devel
+Requires(post): chkconfig
+Requires(preun): chkconfig
 
 %description
 The iputils package contains basic utilities for monitoring a network,
@@ -35,7 +35,7 @@ the target machine is alive and receiving network traffic.
 %prep
 %setup -q -a 1 -n %{name}-s%{version}
 
-#%patch0 -p1 -b .rh
+%patch0 -p1 -b .rh
 %patch3 -p1 -b .countermeasures
 %patch4 -p1 -b .addrcache
 %patch5 -p1 -b .ping-subint
@@ -142,6 +142,7 @@ rm -rf ${RPM_BUILD_ROOT}
 * Thu Mar 15 2007 Martin Bacovsky <mbacovsk@redhat.com> - 20070202-1
 - upgarde to new upstream iputils-s20070202
 - Resolves: #229995
+- Resolves: #225909 - Merge Review: iputils
 - patches revision
 
 * Thu Feb 22 2007 Martin Bacovsky <mbacovsk@redhat.com>- 20020927-42
@@ -379,7 +380,7 @@ rm -rf ${RPM_BUILD_ROOT}
 - add ifenslave.
 
 * Thu Feb  3 2000 Elliot Lee <sopwith@redhat.com>
-- List /usr/sbin/rdisc in %files list.
+- List /usr/sbin/rdisc in %%files list.
 
 * Thu Jan 27 2000 Jeff Johnson <jbj@redhat.com>
 - add remaining binaries.