Fix null ptr exception in Zone::GetLocalZone()

[icinga2] / icinga2.spec

diff --git a/icinga2.spec b/icinga2.spec
index c7dc3ee467e9cefa153d47364c3cc8575ad494b6..8ab13c44864fd60e5beda1326d7f19accc8c5d7f 100644 (file)
--- a/icinga2.spec
+++ b/icinga2.spec
@@ -17,7 +17,7 @@
 # * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.             *
 # ******************************************************************************/
 
-%define revision 1
+%define revision 1.beta1
 
 %if "%{_vendor}" == "redhat"
 %define el5_boost_version 141
@@ -54,7 +54,7 @@
 
 Summary: Network monitoring application
 Name: icinga2
-Version: 2.0.0.beta1
+Version: 2.0.0
 Release: %{revision}%{?dist}
 License: GPLv2+
 Group: Applications/System
@@ -73,13 +73,13 @@ Meta package for Icinga 2 Core, DB IDO and Web.
 Summary:      Icinga 2 binaries and libraries
 Group:        Applications/System
 
-BuildRequires: doxygen
 BuildRequires: openssl-devel
 BuildRequires: gcc-c++
 BuildRequires: libstdc++-devel
 BuildRequires: cmake
 BuildRequires: flex >= 2.5.35
 BuildRequires: bison
+BuildRequires: make
 
 # redhat
 %if "%{_vendor}" == "redhat"
@@ -195,12 +195,6 @@ Group:        Applications/System
 %if "%{_vendor}" == "suse"
 BuildRequires: postgresql-libs
 %endif
-%if "%{_vendor}" == "redhat"
-# el5 only provides mysql package
-%if 0%{?el5} || 0%{?rhel} == 5 || "%{?dist}" == ".el5"
-BuildRequires: postgresql84
-%endif
-%endif
 BuildRequires: postgresql-devel
 Requires: postgresql-libs
 Requires: %{name} = %{version}-%{release}
@@ -415,6 +409,7 @@ exit 0
 %attr(0750,%{icinga_user},%{icinga_group}) %dir %{_sysconfdir}/%{name}/zones.d
 %config(noreplace) %attr(0640,%{icinga_user},%{icinga_group}) %{_sysconfdir}/%{name}/%{name}.conf
 %config(noreplace) %attr(0640,%{icinga_user},%{icinga_group}) %{_sysconfdir}/%{name}/constants.conf
+%config(noreplace) %attr(0640,%{icinga_user},%{icinga_group}) %{_sysconfdir}/%{name}/zones.conf
 %config(noreplace) %attr(0640,%{icinga_user},%{icinga_group}) %{_sysconfdir}/%{name}/conf.d/*.conf
 %config(noreplace) %attr(0640,%{icinga_user},%{icinga_group}) %{_sysconfdir}/%{name}/conf.d/hosts/*.conf
 %config(noreplace) %attr(0640,%{icinga_user},%{icinga_group}) %{_sysconfdir}/%{name}/conf.d/hosts/localhost/*.conf