spec: Fix install permissions.

fixes #4830

diff --git a/etc/icinga2/Makefile.am b/etc/icinga2/Makefile.am
index 6ce0366ad3012b06b46951492cd4cc28c7dcf910..c7354840b20844a51ec67994df966cb1864b5a9b 100644 (file)
--- 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 dcb9a3d4294c98a8b7f9ca8cf729b8c79d3115ca..2a8a0551b69e4f5e21b1d458323c7485fb349419 100644 (file)
--- 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 15f7c97e7fdba47ff9b1b60ac5e3f3964c38fcea..7963f7ecb1115e998c79f17394064e9c106aa280 100644 (file)
--- 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 38908614ef9378d424c058d7ae6c29a2dcd0ef0b..9278c0789d1287595f28e11eded9737bdc4ca967 100644 (file)
--- 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}