From b66b30fd53de49d73048755255e3b20292fadb45900f47643be6f6db062aefa9 Mon Sep 17 00:00:00 2001
From: Reinhard Max <max@suse.com>
Date: Wed, 22 Jan 2020 08:01:33 +0000
Subject: [PATCH] Accepting request 766200 from home:kukuk:container

- Change remaining systemd requires to weak dependencies, too.
- Don't require net-tools with SLE15 or newer, it does not contain
  anything anymore we need
- Get ride of coreutils dependency

OBS-URL: https://build.opensuse.org/request/show/766200
OBS-URL: https://build.opensuse.org/package/show/network:dhcp/dhcp?expand=0&rev=204
---
 dhcp.changes |  8 ++++++++
 dhcp.spec    | 13 ++++++++-----
 2 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/dhcp.changes b/dhcp.changes
index beeab0d..df6ea7a 100644
--- a/dhcp.changes
+++ b/dhcp.changes
@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Wed Jan 22 06:12:51 UTC 2020 - Thorsten Kukuk <kukuk@suse.com>
+
+- Change remaining systemd requires to weak dependencies, too.
+- Don't require net-tools with SLE15 or newer, it does not contain
+  anything anymore we need
+- Get ride of coreutils dependency
+
 -------------------------------------------------------------------
 Tue Oct 15 15:18:59 UTC 2019 - Reinhard Max <max@suse.com>
 
diff --git a/dhcp.spec b/dhcp.spec
index 734390e..6a79536 100644
--- a/dhcp.spec
+++ b/dhcp.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package dhcp
 #
-# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2020 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -102,7 +102,9 @@ Group:          Productivity/Networking/Boot/Servers
 Requires:       insserv-compat
 %endif
 Requires:       dhcp = %{version}
+%if 0%{?suse_version} < 1500
 Requires:       net-tools
+%endif
 Requires(post): %fillup_prereq
 Requires(pre):  shadow
 %systemd_ordering
@@ -114,7 +116,6 @@ Requires(pre):  group(nogroup)
 Summary:        ISC DHCP Client
 Group:          Productivity/Networking/Boot/Clients
 Requires:       %{_bindir}/getent
-Requires:       %{_bindir}/touch
 Requires:       dhcp = %{version}
 Requires:       iproute2
 Requires:       iputils
@@ -128,9 +129,11 @@ Requires:       net-tools
 Summary:        ISC DHCP Relay Agent
 Group:          Productivity/Networking/Boot/Servers
 Requires:       dhcp = %{version}
+%if 0%{?suse_version} < 1500
 Requires:       net-tools
+%endif
 Requires(post): %fillup_prereq
-%systemd_requires
+%systemd_ordering
 
 %package devel
 Summary:        Header Files and Libraries for dhcpctl API
@@ -444,9 +447,9 @@ fi
 
 %post client
 test -e %{_localstatedir}/lib/dhcp/dhclient.leases   || \
-  touch %{_localstatedir}/lib/dhcp/dhclient.leases
+  echo -n > %{_localstatedir}/lib/dhcp/dhclient.leases
 test -e %{_localstatedir}/lib/dhcp6/dhclient6.leases || \
-  touch %{_localstatedir}/lib/dhcp6/dhclient6.leases
+  echo -n > %{_localstatedir}/lib/dhcp6/dhclient6.leases
 
 %files
 %license LICENSE