thozza pushed to unbound (f22). "Fix install command when creating directories (..more)"
notifications at fedoraproject.org
notifications at fedoraproject.org
Fri Apr 17 07:50:57 UTC 2015
>From ebc942cc932c8a035914a4b6fce5157f459bdd89 Mon Sep 17 00:00:00 2001
From: Tomas Hozza <thozza at redhat.com>
Date: Mon, 13 Apr 2015 12:50:34 +0200
Subject: Fix install command when creating directories
Previously the command created a directory with the same name as specified permissions
Signed-off-by: Tomas Hozza <thozza at redhat.com>
diff --git a/unbound.spec b/unbound.spec
index 5295b90..9b586a0 100644
--- a/unbound.spec
+++ b/unbound.spec
@@ -137,20 +137,20 @@ export CXXFLAGS="$RPM_OPT_FLAGS -fPIE -pie"
%install
%{__make} DESTDIR=%{buildroot} install
-install -d 0755 %{buildroot}%{_unitdir} %{buildroot}%{_sysconfdir}/sysconfig
+install -d -m 0755 %{buildroot}%{_unitdir} %{buildroot}%{_sysconfdir}/sysconfig
install -p -m 0644 %{SOURCE1} %{buildroot}%{_unitdir}/unbound.service
install -p -m 0644 %{SOURCE7} %{buildroot}%{_unitdir}/unbound-keygen.service
install -p -m 0755 %{SOURCE2} %{buildroot}%{_sysconfdir}/unbound
install -p -m 0644 %{SOURCE12} %{buildroot}%{_sysconfdir}/unbound
install -p -m 0644 %{SOURCE14} %{buildroot}%{_sysconfdir}/sysconfig/unbound
install -p -m 0644 %{SOURCE16} .
-install -d 0755 %{buildroot}%{_sysconfdir}/cron.d
+install -d -m 0755 %{buildroot}%{_sysconfdir}/cron.d
install -p -m 0644 %{SOURCE15} %{buildroot}%{_sysconfdir}/cron.d/unbound-anchor
%if %{with_munin}
# Install munin plugin and its softlinks
-install -d 0755 %{buildroot}%{_sysconfdir}/munin/plugin-conf.d
+install -d -m 0755 %{buildroot}%{_sysconfdir}/munin/plugin-conf.d
install -p -m 0644 %{SOURCE3} %{buildroot}%{_sysconfdir}/munin/plugin-conf.d/unbound
-install -d 0755 %{buildroot}%{_datadir}/munin/plugins/
+install -d -m 0755 %{buildroot}%{_datadir}/munin/plugins/
install -p -m 0755 %{SOURCE4} %{buildroot}%{_datadir}/munin/plugins/unbound
for plugin in unbound_munin_hits unbound_munin_queue unbound_munin_memory unbound_munin_by_type unbound_munin_by_class unbound_munin_by_opcode unbound_munin_by_rcode unbound_munin_by_flags unbound_munin_histogram; do
ln -s unbound %{buildroot}%{_datadir}/munin/plugins/$plugin
--
cgit v0.10.2
http://pkgs.fedoraproject.org/cgit/unbound.git/commit/?h=f22&id=ebc942cc932c8a035914a4b6fce5157f459bdd89
More information about the scm-commits
mailing list