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

Accepting request 861551 from network:dhcp

Browse Source 
OBS-URL: https://build.opensuse.org/request/show/861551
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/dhcp?expand=0&rev=123
This commit is contained in:
Dominique Leuenberger 2021-01-11 16:09:56 +00:00 committed by Git OBS Bridge
commit e60b6c1b0b
2 changed files with 18 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
dhcp.changes
View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Tue Nov 17 13:56:54 UTC 2020 - Ludwig Nussel <lnussel@suse.de>
- prepare usrmerge (boo#1029961)
------------------------------------------------------------------- -------------------------------------------------------------------
Wed Oct 21 17:06:32 UTC 2020 - Reinhard Max <max@suse.com> Wed Oct 21 17:06:32 UTC 2020 - Reinhard Max <max@suse.com>

18
dhcp.spec
View File

@ -16,6 +16,12 @@
# #
%if 0%{?usrmerged}
%define sbindir %_sbindir
%else
%define sbindir /sbin
%endif
%define isc_version 4.3.6-P1 %define isc_version 4.3.6-P1
#Compat macro for new _fillupdir macro introduced in Nov 2017 #Compat macro for new _fillupdir macro introduced in Nov 2017
%if ! %{defined _fillupdir} %if ! %{defined _fillupdir}
@ -292,18 +298,20 @@ install -d -m0755 %{buildroot}%{_localstatedir}/lib/{dhcp,dhcp6}/dev
install -d -m0755 %{buildroot}%{_localstatedir}/lib/{dhcp,dhcp6}/%{_lib} install -d -m0755 %{buildroot}%{_localstatedir}/lib/{dhcp,dhcp6}/%{_lib}
install -d -m0755 %{buildroot}%{_localstatedir}/lib/{dhcp,dhcp6}/run install -d -m0755 %{buildroot}%{_localstatedir}/lib/{dhcp,dhcp6}/run
install -d -m0755 %{buildroot}%{_localstatedir}/lib/{dhcp,dhcp6}/db install -d -m0755 %{buildroot}%{_localstatedir}/lib/{dhcp,dhcp6}/db
%if !0%{?usrmerged}
# move the dhclient binary to /sbin # move the dhclient binary to /sbin
mv -f %{buildroot}%{_sbindir}/dhclient %{buildroot}/sbin/ mv -f %{buildroot}%{_sbindir}/dhclient %{buildroot}/sbin/
%endif
# provide a ...6 link, so we know it supports DHCPv6 # provide a ...6 link, so we know it supports DHCPv6
ln -sf dhcpd %{buildroot}%{_sbindir}/dhcpd6 ln -sf dhcpd %{buildroot}%{_sbindir}/dhcpd6
ln -sf dhcrelay %{buildroot}%{_sbindir}/dhcrelay6 ln -sf dhcrelay %{buildroot}%{_sbindir}/dhcrelay6
ln -sf dhclient %{buildroot}/sbin/dhclient6 ln -sf dhclient %{buildroot}%{sbindir}/dhclient6
# install our adopted config examples and dhclient-script: # install our adopted config examples and dhclient-script:
install -m0644 $RPM_SOURCE_DIR/dhcpd.conf %{buildroot}%{_sysconfdir}/ install -m0644 $RPM_SOURCE_DIR/dhcpd.conf %{buildroot}%{_sysconfdir}/
install -m0644 $RPM_SOURCE_DIR/dhcpd6.conf %{buildroot}%{_sysconfdir}/ install -m0644 $RPM_SOURCE_DIR/dhcpd6.conf %{buildroot}%{_sysconfdir}/
install -m0644 $RPM_SOURCE_DIR/dhclient.conf %{buildroot}%{_sysconfdir}/ install -m0644 $RPM_SOURCE_DIR/dhclient.conf %{buildroot}%{_sysconfdir}/
install -m0644 $RPM_SOURCE_DIR/dhclient6.conf %{buildroot}%{_sysconfdir}/ install -m0644 $RPM_SOURCE_DIR/dhclient6.conf %{buildroot}%{_sysconfdir}/
install -m0754 $RPM_SOURCE_DIR/dhclient-script %{buildroot}/sbin/ install -m0754 $RPM_SOURCE_DIR/dhclient-script %{buildroot}%{sbindir}/
# helper / wrapper scripts # helper / wrapper scripts
install -d -m0755 %{buildroot}%{_libexecdir}/dhcp install -d -m0755 %{buildroot}%{_libexecdir}/dhcp
install -m0755 $RPM_SOURCE_DIR/dhcpd.script \ install -m0755 $RPM_SOURCE_DIR/dhcpd.script \
@ -517,9 +525,9 @@ fi
%doc contrib examples %doc contrib examples
%files client %files client
/sbin/dhclient %{sbindir}/dhclient
/sbin/dhclient6 %{sbindir}/dhclient6
/sbin/dhclient-script %{sbindir}/dhclient-script
%config(noreplace) %{_sysconfdir}/dhclient.conf %config(noreplace) %{_sysconfdir}/dhclient.conf
%config(noreplace) %{_sysconfdir}/dhclient6.conf %config(noreplace) %{_sysconfdir}/dhclient6.conf
%{_mandir}/man5/dhclient.conf.5%{?ext_man} %{_mandir}/man5/dhclient.conf.5%{?ext_man}