[dhcp/f21] spec: use -D with 'install'

[Jiří Popelka]

commit cc143483e58084c5e17213722822ddbecbc7f671
Author: Jiri Popelka <jpopelka at redhat.com>
Date:   Mon Aug 25 18:48:14 2014 +0200

    spec: use -D with 'install'

 dhcp.spec |   15 +++++++--------
 1 files changed, 7 insertions(+), 8 deletions(-)
---
diff --git a/dhcp.spec b/dhcp.spec
index 28c08c3..5138811 100644
--- a/dhcp.spec
+++ b/dhcp.spec
@@ -18,7 +18,7 @@
 Summary:  Dynamic host configuration protocol software
 Name:     dhcp
 Version:  4.3.1
-Release:  4%{?dist}
+Release:  5%{?dist}
 # NEVER CHANGE THE EPOCH on this package.  The previous maintainer (prior to
 # dcantrell maintaining the package) made incorrect use of the epoch and
 # that's why it is at 12 now.  It should have never been used, but it was.
@@ -375,8 +375,7 @@ popd
 %{__rm} -f %{buildroot}%{_sysconfdir}/dhcpd.conf.example
 
 # dhclient-script
-%{__mkdir} -p %{buildroot}%{_sbindir}
-%{__install} -p -m 0755 %{SOURCE1} %{buildroot}%{_sbindir}/dhclient-script
+%{__install} -D -p -m 0755 %{SOURCE1} %{buildroot}%{_sbindir}/dhclient-script
 
 # README.dhclient.d
 %{__install} -p -m 0644 %{SOURCE2} .
@@ -390,8 +389,7 @@ popd
 %{__install} -p -m 0755 %{SOURCE4} %{buildroot}%{_sysconfdir}/NetworkManager/dispatcher.d
 
 # pm-utils script to handle suspend/resume and dhclient leases
-%{__mkdir} -p %{buildroot}%{_libdir}/pm-utils/sleep.d
-%{__install} -p -m 0755 %{SOURCE5} %{buildroot}%{_libdir}/pm-utils/sleep.d
+%{__install} -D -p -m 0755 %{SOURCE5} %{buildroot}%{_libdir}/pm-utils/sleep.d/56dhclient
 
 # systemd unit files
 mkdir -p %{buildroot}%{_unitdir}
@@ -452,9 +450,7 @@ EOF
 EOF
 
 # Install dhcp.schema for LDAP configuration
-%{__mkdir} -p %{buildroot}%{_sysconfdir}/openldap/schema
-%{__install} -p -m 0644 -D contrib/ldap/dhcp.schema \
-    %{buildroot}%{_sysconfdir}/openldap/schema
+%{__install} -D -p -m 0644 contrib/ldap/dhcp.schema %{buildroot}%{_sysconfdir}/openldap/schema/dhcp.schema
 
 # Don't package libtool *.la files
 find ${RPM_BUILD_ROOT}/%{_libdir} -name '*.la' -exec '/bin/rm' '-f' '{}' ';';
@@ -592,6 +588,9 @@ done
 %doc doc/html/
 
 %changelog
+* Mon Aug 25 2014 Jiri Popelka <jpopelka at redhat.com> - 12:4.3.1-5
+- spec: use -D with 'install'
+
 * Sat Aug 16 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 12:4.3.1-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild