From 53e8b484776c03f5e8cb3c0af71d9a75df5db81855dc34298cf75cdd3bc6cc2c Mon Sep 17 00:00:00 2001 From: Nirmoy Das Date: Fri, 17 Feb 2017 10:00:18 +0000 Subject: [PATCH] Accepting request 456144 from home:kukuk:branches:network:dhcp - Require insserv only if needed - Fix requires of client subpackage OBS-URL: https://build.opensuse.org/request/show/456144 OBS-URL: https://build.opensuse.org/package/show/network:dhcp/dhcp?expand=0&rev=169 --- dhcp.changes | 6 ++++++ dhcp.spec | 14 ++++++++++---- 2 files changed, 16 insertions(+), 4 deletions(-) diff --git a/dhcp.changes b/dhcp.changes index 835992e..df510d3 100644 --- a/dhcp.changes +++ b/dhcp.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Fri Feb 10 22:49:38 CET 2017 - kukuk@suse.de + +- Require insserv only if needed +- Fix requires of client subpackage + ------------------------------------------------------------------- Thu Aug 4 08:25:28 UTC 2016 - ralf.habacker@freenet.de diff --git a/dhcp.spec b/dhcp.spec index 687ec89..1294c12 100644 --- a/dhcp.spec +++ b/dhcp.spec @@ -1,7 +1,7 @@ # # spec file for package dhcp # -# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -130,24 +130,30 @@ Summary: ISC DHCP Server Group: Productivity/Networking/Boot/Servers Requires: dhcp = %{version} Requires: net-tools -PreReq: %insserv_prereq %fillup_prereq /bin/cat /bin/mkdir /bin/cp /usr/sbin/useradd +%if !%{with systemd} +PreReq: %insserv_prereq +%endif +PreReq: %fillup_prereq /bin/cat /bin/mkdir /bin/cp /usr/sbin/useradd %package client Summary: ISC DHCP Client Group: Productivity/Networking/Boot/Clients Requires: /usr/bin/host +Requires: /usr/bin/touch Requires: dhcp = %{version} Requires: iproute2 Requires: iputils Requires: net-tools -PreReq: %insserv_prereq %fillup_prereq /bin/cat /bin/mkdir /bin/cp /bin/grep %package relay Summary: ISC DHCP Relay Agent Group: Productivity/Networking/Boot/Servers Requires: dhcp = %{version} Requires: net-tools -PreReq: %insserv_prereq %fillup_prereq /bin/cat /bin/mkdir /bin/cp +%if !%{with systemd} +PreReq: %insserv_prereq +%endif +PreReq: %fillup_prereq /bin/cat /bin/mkdir /bin/cp %package devel Summary: Header Files and Libraries for dhcpctl API