From 77dfa05d290f02a1604178dfd6d2942f145fb63f Mon Sep 17 00:00:00 2001 From: Michael Friedrich Date: Thu, 10 Oct 2013 12:14:04 +0200 Subject: [PATCH] spec: Fix install permissions. fixes #4830 --- etc/icinga2/Makefile.am | 2 +- etc/icinga2/conf.d/Makefile.am | 2 +- etc/icinga2/features-available/Makefile.am | 2 +- icinga2.spec.in | 8 ++++---- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/etc/icinga2/Makefile.am b/etc/icinga2/Makefile.am index 6ce0366ad..c7354840b 100644 --- a/etc/icinga2/Makefile.am +++ b/etc/icinga2/Makefile.am @@ -12,7 +12,7 @@ CONFIG_FILES = \ install-data-local: @for file in $(CONFIG_FILES); do \ if [ ! -e $(icinga2confdir)/$$file ]; then \ - $(INSTALL_DATA) -o @icinga_user@ -g @icinga_group@ -m 0640 $(srcdir)/$$file $(icinga2confdir)/$$file; \ + $(INSTALL_DATA) $(INSTALL_OPTS) -m 0640 $(srcdir)/$$file $(icinga2confdir)/$$file; \ fi; \ done diff --git a/etc/icinga2/conf.d/Makefile.am b/etc/icinga2/conf.d/Makefile.am index dcb9a3d42..2a8a0551b 100644 --- a/etc/icinga2/conf.d/Makefile.am +++ b/etc/icinga2/conf.d/Makefile.am @@ -12,7 +12,7 @@ install-data-local: @if [ ! -e $(icinga2confdir) ]; then \ $(MKDIR_P) $(icinga2confdir); \ for file in $(CONFIG_FILES); do \ - $(INSTALL_DATA) -o @icinga_user@ -g @icinga_group@ -m 0640 $(srcdir)/$$file $(icinga2confdir)/$$file; \ + $(INSTALL_DATA) $(INSTALL_OPTS) -m 0640 $(srcdir)/$$file $(icinga2confdir)/$$file; \ done; \ fi diff --git a/etc/icinga2/features-available/Makefile.am b/etc/icinga2/features-available/Makefile.am index 15f7c97e7..7963f7ecb 100644 --- a/etc/icinga2/features-available/Makefile.am +++ b/etc/icinga2/features-available/Makefile.am @@ -17,7 +17,7 @@ install-data-local: @$(MKDIR_P) $(icinga2confdir); \ for file in $(CONFIG_FILES); do \ if [ ! -e $(icinga2confdir)/$$file ]; then \ - $(INSTALL_DATA) -o @icinga_user@ -g @icinga_group@ -m 0640 $(srcdir)/$$file $(icinga2confdir)/$$file; \ + $(INSTALL_DATA) $(INSTALL_OPTS) -m 0640 $(srcdir)/$$file $(icinga2confdir)/$$file; \ fi; \ done diff --git a/icinga2.spec.in b/icinga2.spec.in index 38908614e..9278c0789 100644 --- a/icinga2.spec.in +++ b/icinga2.spec.in @@ -132,10 +132,10 @@ IDOUtils schema >= 1.10 %setup -q -n %{name}-%{version} %build -%configure --with-icinga-user=$USER \ - --with-icinga-group=$USER \ - --with-icingacmd-user=$USER \ - --with-icingacmd-group=$USER +%configure --with-icinga-user=%{icinga_user} \ + --with-icinga-group=%{icinga_group} \ + --with-icingacmd-user=%{icinga_user} \ + --with-icingacmd-group=%{icinga_group} make %{?_smp_mflags}