From 2b7443fd02610daa4fe392c98556e3b5a9cf1ae0c8ded0c30ef6dd17699d3d06 Mon Sep 17 00:00:00 2001
From: Nirmoy Das <ndas@please-enter-an-email-address>
Date: Tue, 7 Jun 2016 09:58:59 +0000
Subject: [PATCH] Accepting request 396824 from
 home:markoschandras:branches:network:dhcp

- Use /usr/sbin/arping instead of /sbin/arping in the dhcp scripts.
  /sbin/arping is a symlink to /usr/sbin/arping in order to ease the
  transition for the /usr merge. Newest releases of iputils may only
  install utilities in /usr/* so this dependency will no longer be valid.
  Moreover, we replace the '/sbin/arping' dependency with 'iputils'.

OBS-URL: https://build.opensuse.org/request/show/396824
OBS-URL: https://build.opensuse.org/package/show/network:dhcp/dhcp?expand=0&rev=165
---
 dhclient-script | 2 +-
 dhcp.changes    | 9 +++++++++
 dhcp.spec       | 2 +-
 3 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/dhclient-script b/dhclient-script
index 0736be3..995b00b 100644
--- a/dhclient-script
+++ b/dhclient-script
@@ -614,7 +614,7 @@ TIMEOUT)
                       dev $interface
 
     set -- $(get_ipv4_default_gw)
-    if [ -n "$1" ] && /sbin/arping -q -c 1 -w 5 -I $interface $1 ;
+    if [ -n "$1" ] && /usr/sbin/arping -q -c 1 -w 5 -I $interface $1 ;
     then
       if [ x$new_ip_address != x$alias_ip_address ] && \
          [ x$alias_ip_address != x ]; then
diff --git a/dhcp.changes b/dhcp.changes
index cecb6f2..ecca820 100644
--- a/dhcp.changes
+++ b/dhcp.changes
@@ -1,3 +1,12 @@
+-------------------------------------------------------------------
+Thu May 19 10:37:25 UTC 2016 - mchandras@suse.de
+
+- Use /usr/sbin/arping instead of /sbin/arping in the dhcp scripts.
+  /sbin/arping is a symlink to /usr/sbin/arping in order to ease the
+  transition for the /usr merge. Newest releases of iputils may only
+  install utilities in /usr/* so this dependency will no longer be valid.
+  Moreover, we replace the '/sbin/arping' dependency with 'iputils'.
+
 -------------------------------------------------------------------
 Tue Jan 26 17:16:45 CET 2016 - ndas@suse.de
 
diff --git a/dhcp.spec b/dhcp.spec
index 799142b..f7c6d40 100644
--- a/dhcp.spec
+++ b/dhcp.spec
@@ -134,10 +134,10 @@ PreReq:         %insserv_prereq %fillup_prereq /bin/cat /bin/mkdir /bin/cp /usr/
 %package client
 Summary:        ISC DHCP Client
 Group:          Productivity/Networking/Boot/Clients
-Requires:       /sbin/arping
 Requires:       /usr/bin/host
 Requires:       dhcp = %{version}
 Requires:       iproute2
+Requires:       iputils
 Requires:       net-tools
 PreReq:         %insserv_prereq %fillup_prereq /bin/cat /bin/mkdir /bin/cp /bin/grep