diff --git a/dhcp.changes b/dhcp.changes index 8e7c399..49e50f2 100644 --- a/dhcp.changes +++ b/dhcp.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Mon Aug 18 07:39:11 UTC 2014 - mt@suse.de + +- Disabled /sbin/service legacy-action hooks on openSUSE <= 13.1, + which does not support it and causes build failure (bnc#891961). + ------------------------------------------------------------------- Fri Jul 18 11:13:40 UTC 2014 - mt@suse.de diff --git a/dhcp.spec b/dhcp.spec index c6a55e6..59570f9 100644 --- a/dhcp.spec +++ b/dhcp.spec @@ -419,6 +419,7 @@ ln -sf %{_sysconfdir}/init.d/dhcpd6 $RPM_BUILD_ROOT%{_sbindir}/rcdhcpd6 ln -sf %{_sysconfdir}/init.d/dhcrelay $RPM_BUILD_ROOT%{_sbindir}/rcdhcrelay ln -sf %{_sysconfdir}/init.d/dhcrelay6 $RPM_BUILD_ROOT%{_sbindir}/rcdhcrelay6 %endif +%if %suse_version > 1310 # rcservice actions legacy_actionsdir=$RPM_BUILD_ROOT/usr/lib/initscripts/legacy-actions cat >dhcpd.action <<'EOF' @@ -439,6 +440,7 @@ install -m0755 dhcpd.action ${legacy_actionsdir}/dhcpd6/syntax-check ln -sf syntax-check ${legacy_actionsdir}/dhcpd6/check-syntax ln -sf syntax-check ${legacy_actionsdir}/dhcpd6/check-lease rm -f dhcpd.action +%endif # sysconfig files install -m0644 $RPM_SOURCE_DIR/sysconfig.dhcpd \ $RPM_BUILD_ROOT%{_localstatedir}/adm/fillup-templates/ @@ -615,10 +617,12 @@ if ! test -f /.buildenv; then rm -rf $RPM_BUILD_ROOT; fi %if %{with systemd} %{_unitdir}/dhcpd.service %{_unitdir}/dhcpd6.service +%if %suse_version > 1310 %dir /usr/lib/initscripts/legacy-actions/dhcpd /usr/lib/initscripts/legacy-actions/dhcpd/* %dir /usr/lib/initscripts/legacy-actions/dhcpd6 /usr/lib/initscripts/legacy-actions/dhcpd6/* +%endif %else %config %{_sysconfdir}/init.d/dhcpd %config %{_sysconfdir}/init.d/dhcpd6