[sanlock/f18] uniform the install commands

Federico Simoncelli fsimonce at fedoraproject.org
Wed Jan 2 10:17:50 UTC 2013


commit 17a4652b9b64f61688bd2d051d21bd305e74b76b
Author: Federico Simoncelli <fsimonce at redhat.com>
Date:   Wed Jan 2 10:44:22 2013 +0100

    uniform the install commands

 sanlock.spec |   17 ++++++++---------
 1 files changed, 8 insertions(+), 9 deletions(-)
---
diff --git a/sanlock.spec b/sanlock.spec
index d237792..5909cfa 100644
--- a/sanlock.spec
+++ b/sanlock.spec
@@ -67,12 +67,12 @@ install -D -m 0644 init.d/wdmd.service $RPM_BUILD_ROOT/%{_unitdir}/wdmd.service
 install -D -m 0755 init.d/fence_sanlockd $RPM_BUILD_ROOT/lib/systemd/systemd-fence_sanlockd
 install -D -m 0644 init.d/fence_sanlockd.service $RPM_BUILD_ROOT/%{_unitdir}/fence_sanlockd.service
 %else
-install -D -m 755 init.d/sanlock $RPM_BUILD_ROOT/%{_initddir}/sanlock
-install -D -m 755 init.d/wdmd $RPM_BUILD_ROOT/%{_initddir}/wdmd
-install -D -m 755 init.d/fence_sanlockd $RPM_BUILD_ROOT/%{_initddir}/fence_sanlockd
+install -D -m 0755 init.d/sanlock $RPM_BUILD_ROOT/%{_initddir}/sanlock
+install -D -m 0755 init.d/wdmd $RPM_BUILD_ROOT/%{_initddir}/wdmd
+install -D -m 0755 init.d/fence_sanlockd $RPM_BUILD_ROOT/%{_initddir}/fence_sanlockd
 %endif
 
-install -Dm 0644 src/logrotate.sanlock \
+install -D -m 0644 src/logrotate.sanlock \
 	$RPM_BUILD_ROOT/etc/logrotate.d/sanlock
 
 install -D -m 0644 src/sysconfig.sanlock \
@@ -81,11 +81,10 @@ install -D -m 0644 src/sysconfig.sanlock \
 install -D -m 0644 wdmd/sysconfig.wdmd \
         $RPM_BUILD_ROOT/etc/sysconfig/wdmd
 
-install -dm 0755 $RPM_BUILD_ROOT/etc/wdmd.d
-
-install -Dd -m 775 $RPM_BUILD_ROOT/%{_localstatedir}/run/sanlock
-install -Dd -m 775 $RPM_BUILD_ROOT/%{_localstatedir}/run/fence_sanlock
-install -Dd -m 775 $RPM_BUILD_ROOT/%{_localstatedir}/run/fence_sanlockd
+install -Dd -m 0755 $RPM_BUILD_ROOT/etc/wdmd.d
+install -Dd -m 0775 $RPM_BUILD_ROOT/%{_localstatedir}/run/sanlock
+install -Dd -m 0775 $RPM_BUILD_ROOT/%{_localstatedir}/run/fence_sanlock
+install -Dd -m 0775 $RPM_BUILD_ROOT/%{_localstatedir}/run/fence_sanlockd
 
 %clean
 rm -rf $RPM_BUILD_ROOT


More information about the scm-commits mailing list