Fix: Utility::Glob on Windows doesn't support wildcards in all but the last path...

[icinga2] / icinga2.spec

diff --git a/icinga2.spec b/icinga2.spec
index 567afaf0794d7c39f35e7013c0e629f99b1c87cf..09782c83f7f4a32c66de339b3b3d808bb3096be0 100644 (file)
--- a/icinga2.spec
+++ b/icinga2.spec
@@ -66,7 +66,7 @@
 
 Summary: Network monitoring application
 Name: icinga2
-Version: 2.3.2
+Version: 2.3.8
 Release: %{revision}%{?dist}
 License: GPL-2.0+
 Group: Applications/System
@@ -90,9 +90,17 @@ Recommends:    monitoring-plugins
 BuildRequires: libyajl-devel
 %endif
 %endif
-BuildRequires: openssl-devel
+BuildRequires: libedit-devel
+BuildRequires: ncurses-devel
+%if "%{_vendor}" == "suse" && 0%{?suse_version} < 1210
+BuildRequires: gcc47-c++
+BuildRequires: libstdc++47-devel
+BuildRequires: libopenssl1-devel
+%else
 BuildRequires: gcc-c++
 BuildRequires: libstdc++-devel
+BuildRequires: openssl-devel
+%endif
 BuildRequires: cmake
 BuildRequires: flex >= 2.5.35
 BuildRequires: bison
@@ -151,8 +159,14 @@ Summary:      IDO MySQL database backend for Icinga 2
 Group:        Applications/System
 %if "%{_vendor}" == "suse"
 BuildRequires: libmysqlclient-devel
+%if 0%{?suse_version} >= 1310
+BuildRequires: mysql-devel
 %endif
+
+%else
 BuildRequires: mysql-devel
+%endif #suse
+
 Requires: %{name} = %{version}-%{release}
 
 %description ido-mysql
@@ -506,7 +520,7 @@ exit 0
 %{_libexecdir}/%{name}/prepare-dirs
 %{_libexecdir}/%{name}/safe-reload
 %attr(0750,%{icinga_user},%{icinga_group}) %dir %{_localstatedir}/spool/%{name}
-%attr(0750,%{icinga_user},%{icinga_group}) %dir %{_localstatedir}/spool/%{name}/perfdata
+%attr(0770,%{icinga_user},%{icinga_group}) %dir %{_localstatedir}/spool/%{name}/perfdata
 %attr(0750,%{icinga_user},%{icinga_group}) %dir %{_localstatedir}/spool/%{name}/tmp
 %attr(0750,%{icinga_user},%{icinga_group}) %dir %{_datadir}/%{name}/include
 %{_datadir}/%{name}/include