From 83abf43e55b8e1e4e58501546a7b473d8489ae17d54c3739cdf56780738140a4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Wed, 11 Feb 2015 11:22:30 +0000 Subject: [PATCH] Accepting request 283947 from home:coolo:branches:openSUSE:Factory - do not check scripts not in the src.rpm OBS-URL: https://build.opensuse.org/request/show/283947 OBS-URL: https://build.opensuse.org/package/show/network:dhcp/dhcp?expand=0&rev=149 --- dhcp.changes | 5 +++++ dhcp.spec | 4 +++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/dhcp.changes b/dhcp.changes index 3c119fb..4c7e639 100644 --- a/dhcp.changes +++ b/dhcp.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Feb 3 18:37:59 UTC 2015 - coolo@suse.com + +- do not check scripts not in the src.rpm + ------------------------------------------------------------------- Wed Dec 10 12:52:03 UTC 2014 - mt@suse.de diff --git a/dhcp.spec b/dhcp.spec index 49ca0ef..b7a64ce 100644 --- a/dhcp.spec +++ b/dhcp.spec @@ -1,7 +1,7 @@ # # spec file for package dhcp # -# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 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 @@ -354,10 +354,12 @@ make %{?_smp_mflags} ./server/dhcpd -4 -t -cf $RPM_SOURCE_DIR/dhcpd.conf ./server/dhcpd -6 -t -cf $RPM_SOURCE_DIR/dhcpd6.conf # check syntax in our scripts +%if !%{with systemd} bash -n $RPM_SOURCE_DIR/rc.dhcpd bash -n $RPM_SOURCE_DIR/rc.dhcpd6 bash -n $RPM_SOURCE_DIR/rc.dhcrelay bash -n $RPM_SOURCE_DIR/rc.dhcrelay6 +%endif bash -n $RPM_SOURCE_DIR/dhcpd.script bash -n $RPM_SOURCE_DIR/dhcrelay.script bash -n $RPM_SOURCE_DIR/dhclient-script