Change behaviour of troubleshoot cli parameters

[icinga2] / icinga2.spec

diff --git a/icinga2.spec b/icinga2.spec
index e7a4911534cab209579fb3aafa01d914a23a198d..9620f50f7e9616a96192c8afb0aa4b9d71c553f4 100644 (file)
--- a/icinga2.spec
+++ b/icinga2.spec
@@ -1,6 +1,6 @@
 #/******************************************************************************
 # * Icinga 2                                                                   *
-# * Copyright (C) 2012-2014 Icinga Development Team (http://www.icinga.org)    *
+# * Copyright (C) 2012-2015 Icinga Development Team (http://www.icinga.org)    *
 # *                                                                            *
 # * This program is free software; you can redistribute it and/or              *
 # * modify it under the terms of the GNU General Public License                *
@@ -66,7 +66,7 @@
 
 Summary: Network monitoring application
 Name: icinga2
-Version: 2.2.3
+Version: 2.2.4
 Release: %{revision}%{?dist}
 License: GPL-2.0+
 Group: Applications/System
@@ -98,11 +98,11 @@ BuildRequires: flex >= 2.5.35
 BuildRequires: bison
 BuildRequires: make
 
-%if "%{_vendor}" == "redhat" && (0%{?el5} || 0%{?rhel} == 5 || "%{?dist}" == ".el5")
+%if 0%{?build_icinga_org} && "%{_vendor}" == "redhat" && (0%{?el5} || 0%{?rhel} == 5 || "%{?dist}" == ".el5")
 # el5 requires packages.icinga.org
 BuildRequires: boost153-devel
 %else
-%if "%{_vendor}" == "suse" && 0%{?suse_version} < 1310
+%if 0%{?build_icinga_org} && "%{_vendor}" == "suse" && 0%{?suse_version} < 1310
 # sles 11 sp3 requires packages.icinga.org
 BuildRequires: boost153-devel
 %else
@@ -520,14 +520,14 @@ exit 0
 %files ido-mysql
 %defattr(-,root,root,-)
 %doc COPYING COPYING.Exceptions README.md NEWS AUTHORS ChangeLog
-%{_sysconfdir}/%{name}/features-available/ido-mysql.conf
+%config(noreplace) %attr(0640,%{icinga_user},%{icinga_group}) %{_sysconfdir}/%{name}/features-available/ido-mysql.conf
 %{_libdir}/%{name}/libdb_ido_mysql*
 %{_datadir}/icinga2-ido-mysql
 
 %files ido-pgsql
 %defattr(-,root,root,-)
 %doc COPYING COPYING.Exceptions README.md NEWS AUTHORS ChangeLog
-%{_sysconfdir}/%{name}/features-available/ido-pgsql.conf
+%config(noreplace) %attr(0640,%{icinga_user},%{icinga_group}) %{_sysconfdir}/%{name}/features-available/ido-pgsql.conf
 %{_libdir}/%{name}/libdb_ido_pgsql*
 %{_datadir}/icinga2-ido-pgsql