rpm/dhcp
SHA256
1
0
Fork 0
forked from pool/dhcp
Code Pull Requests Activity

Accepting request 245020 from network:dhcp

Browse Source 
- Disabled /sbin/service legacy-action hooks on openSUSE <= 13.1,
  which does not support it and causes build failure (bnc#891961).

OBS-URL: https://build.opensuse.org/request/show/245020
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/dhcp?expand=0&rev=93
This commit is contained in:
Ludwig Nussel 2014-08-20 15:51:28 +00:00 committed by Git OBS Bridge
commit b98d2b7cb4
2 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
dhcp.changes
View File

@ -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 Fri Jul 18 11:13:40 UTC 2014 - mt@suse.de

4
dhcp.spec
View File

@ -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/dhcrelay $RPM_BUILD_ROOT%{_sbindir}/rcdhcrelay
ln -sf %{_sysconfdir}/init.d/dhcrelay6 $RPM_BUILD_ROOT%{_sbindir}/rcdhcrelay6 ln -sf %{_sysconfdir}/init.d/dhcrelay6 $RPM_BUILD_ROOT%{_sbindir}/rcdhcrelay6
%endif %endif
%if %suse_version > 1310
# rcservice actions # rcservice actions
legacy_actionsdir=$RPM_BUILD_ROOT/usr/lib/initscripts/legacy-actions legacy_actionsdir=$RPM_BUILD_ROOT/usr/lib/initscripts/legacy-actions
cat >dhcpd.action <<'EOF' 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-syntax
ln -sf syntax-check ${legacy_actionsdir}/dhcpd6/check-lease ln -sf syntax-check ${legacy_actionsdir}/dhcpd6/check-lease
rm -f dhcpd.action rm -f dhcpd.action
%endif
# sysconfig files # sysconfig files
install -m0644 $RPM_SOURCE_DIR/sysconfig.dhcpd \ install -m0644 $RPM_SOURCE_DIR/sysconfig.dhcpd \
$RPM_BUILD_ROOT%{_localstatedir}/adm/fillup-templates/ $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} %if %{with systemd}
%{_unitdir}/dhcpd.service %{_unitdir}/dhcpd.service
%{_unitdir}/dhcpd6.service %{_unitdir}/dhcpd6.service
%if %suse_version > 1310
%dir /usr/lib/initscripts/legacy-actions/dhcpd %dir /usr/lib/initscripts/legacy-actions/dhcpd
/usr/lib/initscripts/legacy-actions/dhcpd/* /usr/lib/initscripts/legacy-actions/dhcpd/*
%dir /usr/lib/initscripts/legacy-actions/dhcpd6 %dir /usr/lib/initscripts/legacy-actions/dhcpd6
/usr/lib/initscripts/legacy-actions/dhcpd6/* /usr/lib/initscripts/legacy-actions/dhcpd6/*
%endif
%else %else
%config %{_sysconfdir}/init.d/dhcpd %config %{_sysconfdir}/init.d/dhcpd
%config %{_sysconfdir}/init.d/dhcpd6 %config %{_sysconfdir}/init.d/dhcpd6