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

Accepting request 544891 from home:RBrownSUSE:branches:network:dhcp

Browse Source 
Replace references to /var/adm/fillup-templates with new %_fillupdir macro (boo#1069468)

OBS-URL: https://build.opensuse.org/request/show/544891
OBS-URL: https://build.opensuse.org/package/show/network:dhcp/dhcp?expand=0&rev=178
This commit is contained in:
Nirmoy Das
2017-11-24 10:37:35 +00:00
committed by Git OBS Bridge
parent 8e9bc2bd04
commit 917d150f5d
2 changed files with 18 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
dhcp.changes
View File

@@ -1,3 +1,9 @@
-------------------------------------------------------------------
Thu Nov 23 13:49:18 UTC 2017 - rbrown@suse.com
- Replace references to /var/adm/fillup-templates with new
%_fillupdir macro (boo#1069468)
-------------------------------------------------------------------
Fri Jul 14 09:48:25 UTC 2017 - dimstar@opensuse.org

19
dhcp.spec
View File

@@ -16,6 +16,11 @@
#
#Compat macro for new _fillupdir macro introduced in Nov 2017
%if ! %{defined _fillupdir}
%define _fillupdir /var/adm/fillup-templates
%endif
%define isc_version 4.3.5
%define susefw2dir %{_sysconfdir}/sysconfig/SuSEfirewall2.d/services
%define omc_prefix /usr/share/omc
@@ -366,7 +371,7 @@ install -d -m0755 $RPM_BUILD_ROOT/%{omc_svcdir}
install -d -m0755 $RPM_BUILD_ROOT%{_sysconfdir}/openldap/schema
%endif
install -d -m0755 $RPM_BUILD_ROOT%{_localstatedir}/run
install -d -m0755 $RPM_BUILD_ROOT%{_localstatedir}/adm/fillup-templates
install -d -m0755 $RPM_BUILD_ROOT%{_fillupdir}
# chroot jail
install -d -m0755 $RPM_BUILD_ROOT%{_localstatedir}/lib/{dhcp,dhcp6}/etc
install -d -m0755 $RPM_BUILD_ROOT%{_localstatedir}/lib/{dhcp,dhcp6}/dev
@@ -449,11 +454,11 @@ rm -f dhcpd.action
%endif
# sysconfig files
install -m0644 $RPM_SOURCE_DIR/sysconfig.dhcpd \
$RPM_BUILD_ROOT%{_localstatedir}/adm/fillup-templates/
$RPM_BUILD_ROOT%{_fillupdir}/
install -m0644 $RPM_SOURCE_DIR/sysconfig.syslog-dhcpd \
$RPM_BUILD_ROOT%{_localstatedir}/adm/fillup-templates/
$RPM_BUILD_ROOT%{_fillupdir}/
install -m0644 $RPM_SOURCE_DIR/sysconfig.dhcrelay \
$RPM_BUILD_ROOT%{_localstatedir}/adm/fillup-templates/
$RPM_BUILD_ROOT%{_fillupdir}/
# another config files and scripts
%if %{with_ldap}
install -m0644 contrib/ldap/dhcp.schema \
@@ -682,8 +687,8 @@ if ! test -f /.buildenv; then rm -rf $RPM_BUILD_ROOT; fi
%{omc_svcdir}/dhcpd6.xml
%{_sysconfdir}/sysconfig/network/scripts/dhcpd-restart-hook
%{_sysconfdir}/sysconfig/network/if-up.d/60-dhcpd-restart-hook
%{_localstatedir}/adm/fillup-templates/sysconfig.dhcpd
%{_localstatedir}/adm/fillup-templates/sysconfig.syslog-dhcpd
%{_fillupdir}/sysconfig.dhcpd
%{_fillupdir}/sysconfig.syslog-dhcpd
%if %{with_doc_package}
%files doc
@@ -723,7 +728,7 @@ if ! test -f /.buildenv; then rm -rf $RPM_BUILD_ROOT; fi
%config %{_sysconfdir}/init.d/dhcrelay6
%endif
%doc %{_mandir}/man8/dhcrelay.8.gz
%{_localstatedir}/adm/fillup-templates/sysconfig.dhcrelay
%{_fillupdir}/sysconfig.dhcrelay
%files devel
%defattr(-,root,root)