From 390abd80c265db41c1dcce2effa96d118917e53a Mon Sep 17 00:00:00 2001 From: monitorbuilder_pel7ppc64lebuilder0 Date: Sat, 26 Jun 2021 01:46:56 +0200 Subject: [PATCH] icinga2 update 2.11 tree Signed-off-by: monitorbuilder_pel7ppc64lebuilder0 --- SPECS/icinga2.spec | 59 +++++++++++++++++++++++++++------------------- 1 file changed, 35 insertions(+), 24 deletions(-) diff --git a/SPECS/icinga2.spec b/SPECS/icinga2.spec index 128f082..3721fbc 100755 --- a/SPECS/icinga2.spec +++ b/SPECS/icinga2.spec @@ -16,7 +16,7 @@ Summary: Network monitoring application Name: icinga2 -Version: 2.10.3 +Version: 2.11.9 Release: 1%{?dist} License: GPL-2.0+ URL: https://www.icinga.com/ @@ -142,19 +142,30 @@ Nano syntax highlighting for icinga2 %build CMAKE_OPTS="-DCMAKE_INSTALL_PREFIX=/usr \ - -DCMAKE_INSTALL_SYSCONFDIR=/etc \ - -DCMAKE_INSTALL_LOCALSTATEDIR=/var \ - -DCMAKE_BUILD_TYPE=RelWithDebInfo \ - -DICINGA2_LTO_BUILD=ON \ - -DCMAKE_VERBOSE_MAKEFILE=ON \ - -DBoost_NO_BOOST_CMAKE=ON \ - -DICINGA2_PLUGINDIR=%{plugindir} \ - -DICINGA2_RUNDIR=%{_rundir} \ - -DICINGA2_USER=%{icinga_user} \ - -DICINGA2_GROUP=%{icinga_group} \ - -DICINGA2_COMMAND_GROUP=%{icingacmd_group} \ - -DBUILD_TESTING=FALSE \ - -DUSE_SYSTEMD=ON" +-DCMAKE_INSTALL_SYSCONFDIR=/etc \ +-DCMAKE_INSTALL_LOCALSTATEDIR=/var \ +-DCMAKE_BUILD_TYPE=RelWithDebInfo \ +-DICINGA2_LTO_BUILD=ON \ +-DCMAKE_VERBOSE_MAKEFILE=ON \ +-DBoost_NO_BOOST_CMAKE=ON \ +-DBoost_NO_SYSTEM_PATHS=TRUE \ +-DBOOST_LIBRARYDIR=/usr/lib64/boost169 \ +-DBOOST_INCLUDEDIR=/usr/include/boost169 \ +-DBoost_ADDITIONAL_VERSIONS='1.69;1.69.0' \ +-DICINGA2_PLUGINDIR=%{plugindir} \ +-DICINGA2_RUNDIR=%{_rundir} \ +-DICINGA2_USER=%{icinga_user} \ +-DICINGA2_GROUP=%{icinga_group} \ +-DICINGA2_COMMAND_GROUP=%{icingacmd_group} \ +-DBUILD_TESTING=FALSE \ +-DUSE_SYSTEMD=ON \ +-DICINGA2_WITH_LIVESTATUS=ON \ +-DICINGA2_WITH_NOTIFICATION=ON \ +-DICINGA2_WITH_PERFDATA=ON \ +-DICINGA2_WITH_MYSQL=ON \ +-DICINGA2_WITH_PGSQL=ON" + +#-DICINGA2_SYSCONFIGFILE=%{_sysconfigdir}/%{name} \ cmake $CMAKE_OPTS -DCMAKE_C_FLAGS:STRING="%{optflags} %{?march_flag}" -DCMAKE_CXX_FLAGS:STRING="%{optflags} %{?march_flag}" . @@ -290,7 +301,7 @@ fi %files bin %defattr(-,root,root,-) -%doc COPYING COPYING.Exceptions README.md NEWS AUTHORS CHANGELOG.md +%doc COPYING README.md NEWS AUTHORS CHANGELOG.md %{_sbindir}/%{name} %dir %{_libdir}/%{name}/sbin %{_libdir}/%{name}/sbin/%{name} @@ -312,7 +323,7 @@ fi %files libs %defattr(-,root,root,-) -%doc COPYING COPYING.Exceptions README.md NEWS AUTHORS CHANGELOG.md +%doc COPYING README.md NEWS AUTHORS CHANGELOG.md %exclude %{_libdir}/%{name}/libdb_ido_mysql* %exclude %{_libdir}/%{name}/libdb_ido_pgsql* %dir %{_libdir}/%{name} @@ -321,7 +332,7 @@ fi %files common %defattr(-,root,root,-) -%doc COPYING COPYING.Exceptions README.md NEWS AUTHORS CHANGELOG.md tools/syntax +%doc COPYING README.md NEWS AUTHORS CHANGELOG.md tools/syntax %attr(0750,%{icinga_user},%{icingacmd_group}) %dir %{_localstatedir}/log/%{name} %config(noreplace) %{_sysconfdir}/logrotate.d/%{name} %{_sysconfdir}/bash_completion.d/%{name} @@ -347,7 +358,7 @@ fi %attr(0750,%{icinga_user},%{icinga_group}) %dir %{_sysconfdir}/%{name}/scripts %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,root,%{icinga_group}) %{_sysconfdir}/%{name}/init.conf +#%config(noreplace) %attr(0640,root,%{icinga_group}) %{_sysconfdir}/%{name}/init.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 @@ -372,7 +383,7 @@ fi %files ido-mysql %defattr(-,root,root,-) -%doc COPYING COPYING.Exceptions README.md NEWS AUTHORS CHANGELOG.md +%doc COPYING README.md NEWS AUTHORS CHANGELOG.md %config(noreplace) %attr(0640,%{icinga_user},%{icinga_group}) %{_sysconfdir}/%{name}/features-available/ido-mysql.conf %{_libdir}/%{name}/libdb_ido_mysql* %{_datadir}/icinga2-ido-mysql @@ -380,7 +391,7 @@ fi %files ido-pgsql %defattr(-,root,root,-) -%doc COPYING COPYING.Exceptions README.md NEWS AUTHORS CHANGELOG.md +%doc COPYING README.md NEWS AUTHORS CHANGELOG.md %config(noreplace) %attr(0640,%{icinga_user},%{icinga_group}) %{_sysconfdir}/%{name}/features-available/ido-pgsql.conf %{_libdir}/%{name}/libdb_ido_pgsql* %{_datadir}/icinga2-ido-pgsql @@ -394,14 +405,14 @@ fi %files -n vim-icinga2 %defattr(-,root,root,-) -#%{_datadir}/vim/vimfiles/syntax/%{name}.vim -#%{_datadir}/vim/vimfiles/ftdetect/%{name}.vim +%{_datadir}/vim/vimfiles/syntax/%{name}.vim +%{_datadir}/vim/vimfiles/ftdetect/%{name}.vim %files -n nano-icinga2 %defattr(-,root,root,-) -#%dir %{_datadir}/nano -#%{_datadir}/nano/%{name}.nanorc +%dir %{_datadir}/nano +%{_datadir}/nano/%{name}.nanorc %changelog