From 8e9bc2bd040f77b3428a1e87e17709b57c1f7225a587a9a226b7cd49a719dfc5 Mon Sep 17 00:00:00 2001 From: Nirmoy Das Date: Wed, 18 Oct 2017 09:10:44 +0000 Subject: [PATCH] Accepting request 532836 from home:dimstar:Factory Sure.. I can keep on rebasing it.. I don't mind OBS-URL: https://build.opensuse.org/request/show/532836 OBS-URL: https://build.opensuse.org/package/show/network:dhcp/dhcp?expand=0&rev=177 --- dhcp.changes | 10 +++++++++- dhcp.spec | 6 +++++- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/dhcp.changes b/dhcp.changes index b922ee8..1694477 100644 --- a/dhcp.changes +++ b/dhcp.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Fri Jul 14 09:48:25 UTC 2017 - dimstar@opensuse.org + +- Replace net-tools Requires in dhcp-client with hostname on + suse_version >= 1330 (CODE15): net-tools does no longer provide + any tool referenced by dhclient-script, but we require hostname + (which is also a dependency to net-tools, thus hiding the issue). + ------------------------------------------------------------------- Thu Jul 13 12:27:59 UTC 2017 - bwiedemann@suse.com @@ -6,7 +14,7 @@ Thu Jul 13 12:27:59 UTC 2017 - bwiedemann@suse.com ------------------------------------------------------------------- Thu Jul 6 16:17:18 CEST 2017 - ndas@suse.de -- fixed a typo in nis-servers option name breaking the config file introduced +- fixed a typo in nis-servers option name breaking the config file introduced in previous change to workaround issues in NetworkManager parser. - Update to dhcp-4.3.5 diff --git a/dhcp.spec b/dhcp.spec index aa5d269..ee4b9d6 100644 --- a/dhcp.spec +++ b/dhcp.spec @@ -141,9 +141,13 @@ Group: Productivity/Networking/Boot/Clients Requires: /usr/bin/host Requires: /usr/bin/touch Requires: dhcp = %{version} +%if 0%{?suse_version} >= 1330 +Requires: hostname +%else +Requires: net-tools +%endif Requires: iproute2 Requires: iputils -Requires: net-tools %package relay Summary: ISC DHCP Relay Agent