Merge pull request #2 from mikhailnov/dhcp:rosa2016.1

revert moving dhclient from /sbin to /usr/sbin

ROSA-NEWS

@@ -2,7 +2,6 @@ dhcp v4.4.1
 08.10.2018
 by mikhailnov
 
-* dhclient and dhclient moved from /sbin to /usr/sin
 * Dropped old patches
 * Now upstream uses built-in bind libraries, we also use them for now (they are linked statically)
 * Now it's built with KerberOS support

dhclient@.service

@@ -4,7 +4,7 @@ Wants=network.target
 Before=network.target
 
 [Service]
-ExecStart=/usr/sbin/dhclient -lf /var/lib/dhclient/dhclient.leases -pf /run/dhclient@%i/dhclient.pid -d %I
+ExecStart=/sbin/dhclient -lf /var/lib/dhclient/dhclient.leases -pf /run/dhclient@%i/dhclient.pid -d %I
 RuntimeDirectory=dhclient@%i
 # https://www.freedesktop.org/software/systemd/man/systemd.exec.html#ProtectSystem=
 # /var is not read-only

dhcp.spec

@@ -6,7 +6,7 @@
 Name:		dhcp
 Epoch:		3
 Version:	%{major_version}%{patch_version}
-Release:	3
+Release:	4
 Summary:	The ISC DHCP (Dynamic Host Configuration Protocol) server/relay agent/client
 License:	Distributable
 Group:		System/Servers
@@ -195,7 +195,9 @@ make
 
 install -m0644 %{SOURCE10} doc
 install -m0644 %{SOURCE100} ROSA-NEWS
-install -m 755 client/scripts/linux %{buildroot}%{_sbindir}/dhclient-script
+install -d %{buildroot}/sbin
+mv %{buildroot}%{_sbindir}/dhclient %{buildroot}/sbin/dhclient
+install -m 755 client/scripts/linux %{buildroot}/sbin/dhclient-script
 
 install -d %{buildroot}%{_unitdir}
 install -m 644 %{SOURCE12} %{buildroot}%{_unitdir}/dhcpd.service
@@ -349,10 +351,10 @@ EOF
 
 %files client
 %doc client/dhclient.conf.example
-%attr (0755,root,root) %{_sbindir}/dhclient-script
+%attr (0755,root,root) /sbin/dhclient-script
 %{_tmpfilesdir}/dhclient.conf
 %{_unitdir}/dhclient@.service
-%{_sbindir}/dhclient
+/sbin/dhclient
 %{_mandir}/man5/dhclient.conf.5*
 %{_mandir}/man5/dhclient.leases.5*
 %{_mandir}/man8/dhclient.8*