Merge branch 'master' into release

This commit is contained in:
Michael Friedrich 2018-07-17 14:45:20 +02:00
commit 685a471bbf
1 changed files with 135 additions and 157 deletions

View File

@ -79,10 +79,10 @@
Summary: Network monitoring application Summary: Network monitoring application
Name: icinga2 Name: icinga2
Version: 2.8.4 Version: 2.9.0
Release: %{revision}%{?dist} Release: %{revision}%{?dist}
License: GPLv2+ License: GPL-2.0+
URL: https://www.icinga.com/ Url: https://www.icinga.com/
Group: System/Monitoring Group: System/Monitoring
Source: https://github.com/Icinga/%{name}/archive/v%{version}.tar.gz Source: https://github.com/Icinga/%{name}/archive/v%{version}.tar.gz
@ -97,7 +97,6 @@ Summary: Icinga 2 binaries and libraries
Group: System/Monitoring Group: System/Monitoring
%if "%{_vendor}" == "suse" %if "%{_vendor}" == "suse"
PreReq: permissions
Provides: monitoring_daemon Provides: monitoring_daemon
Recommends: monitoring-plugins Recommends: monitoring-plugins
%if 0%{?suse_version} >= 1310 %if 0%{?suse_version} >= 1310
@ -108,14 +107,14 @@ BuildRequires: libedit-devel
BuildRequires: ncurses-devel BuildRequires: ncurses-devel
%if "%{_vendor}" == "suse" && 0%{?suse_version} < 1210 %if "%{_vendor}" == "suse" && 0%{?suse_version} < 1210
BuildRequires: gcc48-c++ BuildRequires: gcc48-c++
BuildRequires: libstdc++48-devel
BuildRequires: libopenssl1-devel BuildRequires: libopenssl1-devel
BuildRequires: libstdc++48-devel
%else %else
%if "%{_vendor}" == "redhat" && (0%{?el5} || 0%{?rhel} == 5 || "%{?dist}" == ".el5" || 0%{?el6} || 0%{?rhel} == 6 || "%{?dist}" == ".el6") %if "%{_vendor}" == "redhat" && (0%{?el5} || 0%{?rhel} == 5 || "%{?dist}" == ".el5" || 0%{?el6} || 0%{?rhel} == 6 || "%{?dist}" == ".el6")
# Requires devtoolset-2 scl # Requires devtoolset-2 scl
BuildRequires: devtoolset-2-binutils
BuildRequires: devtoolset-2-gcc-c++ BuildRequires: devtoolset-2-gcc-c++
BuildRequires: devtoolset-2-libstdc++-devel BuildRequires: devtoolset-2-libstdc++-devel
BuildRequires: devtoolset-2-binutils
%define scl_enable scl enable devtoolset-2 -- %define scl_enable scl enable devtoolset-2 --
%else %else
BuildRequires: gcc-c++ BuildRequires: gcc-c++
@ -123,13 +122,10 @@ BuildRequires: libstdc++-devel
%endif %endif
BuildRequires: openssl-devel BuildRequires: openssl-devel
%endif %endif
BuildRequires: bison
BuildRequires: cmake BuildRequires: cmake
BuildRequires: flex >= 2.5.35 BuildRequires: flex >= 2.5.35
BuildRequires: bison
BuildRequires: make BuildRequires: make
%if 0%{?fedora}
BuildRequires: wxGTK3-devel
%endif
%if 0%{?build_icinga_org} && "%{_vendor}" == "redhat" && (0%{?el5} || 0%{?rhel} == 5 || "%{?dist}" == ".el5" || 0%{?el6} || 0%{?rhel} == 6 || "%{?dist}" == ".el6") %if 0%{?build_icinga_org} && "%{_vendor}" == "redhat" && (0%{?el5} || 0%{?rhel} == 5 || "%{?dist}" == ".el5" || 0%{?el6} || 0%{?rhel} == 6 || "%{?dist}" == ".el6")
# el5 and el6 require packages.icinga.com # el5 and el6 require packages.icinga.com
@ -139,6 +135,12 @@ BuildRequires: boost153-devel
# sles 11 sp3 requires packages.icinga.com # sles 11 sp3 requires packages.icinga.com
BuildRequires: boost153-devel BuildRequires: boost153-devel
%else %else
%if "%{_vendor}" == "suse" && 0%{?suse_version} > 1320
BuildRequires: libboost_program_options-devel >= 1.48
BuildRequires: libboost_regex-devel >= 1.48
BuildRequires: libboost_system-devel >= 1.48
BuildRequires: libboost_thread-devel >= 1.48
%else
%if (0%{?el5} || 0%{?rhel} == 5 || "%{?dist}" == ".el5" || 0%{?el6} || 0%{?rhel} == 6 || "%{?dist}" == ".el6") %if (0%{?el5} || 0%{?rhel} == 5 || "%{?dist}" == ".el5" || 0%{?el6} || 0%{?rhel} == 6 || "%{?dist}" == ".el6")
# Requires EPEL repository # Requires EPEL repository
BuildRequires: boost148-devel >= 1.48 BuildRequires: boost148-devel >= 1.48
@ -147,9 +149,10 @@ BuildRequires: boost-devel >= 1.48
%endif %endif
%endif %endif
%endif %endif
%endif
%if 0%{?use_systemd} %if 0%{?use_systemd}
BuildRequires: systemd BuildRequires: systemd-devel
Requires: systemd Requires: systemd
%endif %endif
@ -168,6 +171,10 @@ Requires(post): shadow-utils
%endif %endif
BuildRequires: logrotate BuildRequires: logrotate
%if "%{_vendor}" == "suse" %if "%{_vendor}" == "suse"
PreReq: permissions
Provides: user(%{icinga_user})
Provides: group(%{icinga_group})
Provides: group(%{icingacmd_group})
Requires(pre): shadow Requires(pre): shadow
Requires(post): shadow Requires(post): shadow
# Coreutils is added because of autoyast problems reported # Coreutils is added because of autoyast problems reported
@ -201,7 +208,7 @@ Group: System/Libraries
Requires: %{name}-common = %{version}-%{release} Requires: %{name}-common = %{version}-%{release}
%description libs %description libs
This subpackage provides the internal libraries for the daemon or studio. This subpackage provides the internal libraries for the daemon.
%package ido-mysql %package ido-mysql
@ -245,28 +252,17 @@ IDOUtils schema >= 1.12
%package selinux %package selinux
Summary: SELinux policy module supporting icinga2 Summary: SELinux policy module supporting icinga2
Group: System/Base Group: System/Base
BuildRequires: checkpolicy, selinux-policy-devel, hardlink BuildRequires: checkpolicy
BuildRequires: hardlink
BuildRequires: selinux-policy-devel
Requires: %{name} = %{version}-%{release} Requires: %{name} = %{version}-%{release}
Requires(post): policycoreutils-python Requires(post): policycoreutils-python
Requires(postun): policycoreutils-python Requires(postun): policycoreutils-python
%description selinux %description selinux
SELinux policy module supporting icinga2 SELinux policy module supporting icinga2.
%endif %endif
%if 0%{?fedora}
%package studio
Summary: Studio for Icinga 2
Group: System/Monitoring
Requires: %{name}-libs = %{version}-%{release}
Requires: wxGTK3
%description studio
Provides a GUI for the Icinga 2 API.
%endif
%package -n vim-icinga2 %package -n vim-icinga2
Summary: Vim syntax highlighting for icinga2 Summary: Vim syntax highlighting for icinga2
Group: Productivity/Text/Editors Group: Productivity/Text/Editors
@ -278,7 +274,7 @@ Requires: vim-filesystem
%endif %endif
%description -n vim-icinga2 %description -n vim-icinga2
Vim syntax highlighting for icinga2 Provides Vim syntax highlighting for icinga2.
%package -n nano-icinga2 %package -n nano-icinga2
@ -287,10 +283,14 @@ Group: Productivity/Text/Editors
Requires: nano Requires: nano
%description -n nano-icinga2 %description -n nano-icinga2
Nano syntax highlighting for icinga2 Provides Nano syntax highlighting for icinga2.
%prep %prep
%setup -q -n %{name}-%{version} %setup -q -n %{name}-%{version}
# use absolute shebang instead of env on SUSE distributions
%if "%{_vendor}" == "suse"
find . -type f -name '*.sh' -exec sed -i -e 's|\/usr\/bin\/env bash|\/bin\/bash|g' {} \;
%endif
%build %build
CMAKE_OPTS="-DCMAKE_INSTALL_PREFIX=/usr \ CMAKE_OPTS="-DCMAKE_INSTALL_PREFIX=/usr \
@ -302,6 +302,7 @@ CMAKE_OPTS="-DCMAKE_INSTALL_PREFIX=/usr \
-DBoost_NO_BOOST_CMAKE=ON \ -DBoost_NO_BOOST_CMAKE=ON \
-DICINGA2_PLUGINDIR=%{plugindir} \ -DICINGA2_PLUGINDIR=%{plugindir} \
-DICINGA2_RUNDIR=%{_rundir} \ -DICINGA2_RUNDIR=%{_rundir} \
-DICINGA2_SYSCONFIGFILE=/etc/sysconfig/icinga2 \
-DICINGA2_USER=%{icinga_user} \ -DICINGA2_USER=%{icinga_user} \
-DICINGA2_GROUP=%{icinga_group} \ -DICINGA2_GROUP=%{icinga_group} \
-DICINGA2_COMMAND_GROUP=%{icingacmd_group}" -DICINGA2_COMMAND_GROUP=%{icingacmd_group}"
@ -382,9 +383,14 @@ rm -f %{buildroot}/%{_sysconfdir}/%{name}/features-enabled/*.conf
%else %else
ln -sf ../../%{_initrddir}/%{name} "%{buildroot}%{_sbindir}/rc%{name}" ln -sf ../../%{_initrddir}/%{name} "%{buildroot}%{_sbindir}/rc%{name}"
%endif %endif
%if ( 0%{?sle_version} >= 150000 && 0%{?is_opensuse} ) || 0%{?suse_version} > 1500
mkdir -p "%{buildroot}%{_fillupdir}/"
mv "%{buildroot}%{_sysconfdir}/sysconfig/%{name}" "%{buildroot}%{_fillupdir}/sysconfig.%{name}"
%else
mkdir -p "%{buildroot}%{_localstatedir}/adm/fillup-templates/" mkdir -p "%{buildroot}%{_localstatedir}/adm/fillup-templates/"
mv "%{buildroot}%{_sysconfdir}/sysconfig/%{name}" "%{buildroot}%{_localstatedir}/adm/fillup-templates/sysconfig.%{name}" mv "%{buildroot}%{_sysconfdir}/sysconfig/%{name}" "%{buildroot}%{_localstatedir}/adm/fillup-templates/sysconfig.%{name}"
%endif %endif
%endif
%if 0%{?use_selinux} %if 0%{?use_selinux}
cd tools/selinux cd tools/selinux
@ -400,24 +406,6 @@ cd -
#/usr/sbin/hardlink -cv %%{buildroot}%%{_datadir}/selinux #/usr/sbin/hardlink -cv %%{buildroot}%%{_datadir}/selinux
%endif %endif
%if 0%{?fedora}
mkdir -p "%{buildroot}%{_datadir}/icinga2-studio"
install -p -m 644 icinga-studio/icinga.ico %{buildroot}%{_datadir}/icinga2-studio
mkdir -p "%{buildroot}%{_datadir}/applications"
echo "[Desktop Entry]
Name=Icinga 2 Studio
Comment=API viewer for Icinga 2
TryExec=icinga-studio
Exec=icinga-studio
Icon=/usr/share/icinga2-studio/icinga.ico
StartupNotify=true
Terminal=false
Type=Application
Categories=GTK;Utility;
Keywords=Monitoring;" > %{buildroot}%{_datadir}/applications/icinga2-studio.desktop
%endif
%if "%{_vendor}" == "suse" %if "%{_vendor}" == "suse"
install -D -m 0644 tools/syntax/vim/syntax/%{name}.vim %{buildroot}%{_datadir}/vim/site/syntax/%{name}.vim install -D -m 0644 tools/syntax/vim/syntax/%{name}.vim %{buildroot}%{_datadir}/vim/site/syntax/%{name}.vim
install -D -m 0644 tools/syntax/vim/ftdetect/%{name}.vim %{buildroot}%{_datadir}/vim/site/ftdetect/%{name}.vim install -D -m 0644 tools/syntax/vim/ftdetect/%{name}.vim %{buildroot}%{_datadir}/vim/site/ftdetect/%{name}.vim
@ -437,27 +425,18 @@ getent passwd %{icinga_user} >/dev/null || %{_sbindir}/useradd -c "icinga" -s /s
%if 0%{?use_systemd} %if 0%{?use_systemd}
%service_add_pre %{name}.service %service_add_pre %{name}.service
%endif %endif
%endif
%if "%{_vendor}" == "suse" %verifyscript common
%verifyscript bin
%verify_permissions -e %{_rundir}/%{name}/cmd %verify_permissions -e %{_rundir}/%{name}/cmd
%endif %endif
%post bin
# suse
%if "%{_vendor}" == "suse"
%if 0%{?suse_version} >= 1310
%set_permissions %{_rundir}/%{name}/cmd
%endif
%endif #suse/rhel
%post common %post common
# suse # suse
%if "%{_vendor}" == "suse" %if "%{_vendor}" == "suse"
%if 0%{?suse_version} >= 1310
%set_permissions %{_rundir}/%{name}/cmd
%endif
%if 0%{?use_systemd} %if 0%{?use_systemd}
%fillup_only %{name} %fillup_only %{name}
%service_add_post %{name}.service %service_add_post %{name}.service
@ -621,7 +600,7 @@ fi
%files bin %files bin
%defattr(-,root,root,-) %defattr(-,root,root,-)
%doc COPYING COPYING.Exceptions README.md NEWS AUTHORS CHANGELOG.md %doc COPYING README.md NEWS AUTHORS CHANGELOG.md
%{_sbindir}/%{name} %{_sbindir}/%{name}
%dir %{_libdir}/%{name}/sbin %dir %{_libdir}/%{name}/sbin
%{_libdir}/%{name}/sbin/%{name} %{_libdir}/%{name}/sbin/%{name}
@ -632,15 +611,15 @@ fi
%files libs %files libs
%defattr(-,root,root,-) %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}/libmysql_shim*
%exclude %{_libdir}/%{name}/libdb_ido_pgsql* %exclude %{_libdir}/%{name}/libpgsql_shim*
%dir %{_libdir}/%{name} %dir %{_libdir}/%{name}
%{_libdir}/%{name}/*.so* %{_libdir}/%{name}/*.so*
%files common %files common
%defattr(-,root,root,-) %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
%config(noreplace) %{_sysconfdir}/logrotate.d/%{name} %config(noreplace) %{_sysconfdir}/logrotate.d/%{name}
%{_sysconfdir}/bash_completion.d/%{name} %{_sysconfdir}/bash_completion.d/%{name}
%if 0%{?use_systemd} %if 0%{?use_systemd}
@ -654,7 +633,11 @@ fi
%endif %endif
%if "%{_vendor}" == "suse" %if "%{_vendor}" == "suse"
%{_sbindir}/rc%{name} %{_sbindir}/rc%{name}
%if ( 0%{?sle_version} >= 150000 && 0%{?is_opensuse} ) || 0%{?suse_version} > 1500
%{_fillupdir}/sysconfig.%{name}
%else
%{_localstatedir}/adm/fillup-templates/sysconfig.%{name} %{_localstatedir}/adm/fillup-templates/sysconfig.%{name}
%endif
%else %else
%config(noreplace) %{_sysconfdir}/sysconfig/%{name} %config(noreplace) %{_sysconfdir}/sysconfig/%{name}
%endif %endif
@ -681,13 +664,13 @@ fi
%attr(0750,%{icinga_user},%{icingacmd_group}) %dir %{_localstatedir}/log/%{name}/compat %attr(0750,%{icinga_user},%{icingacmd_group}) %dir %{_localstatedir}/log/%{name}/compat
%attr(0750,%{icinga_user},%{icingacmd_group}) %dir %{_localstatedir}/log/%{name}/compat/archives %attr(0750,%{icinga_user},%{icingacmd_group}) %dir %{_localstatedir}/log/%{name}/compat/archives
%attr(0750,%{icinga_user},%{icinga_group}) %{_localstatedir}/lib/%{name} %attr(0750,%{icinga_user},%{icinga_group}) %{_localstatedir}/lib/%{name}
%attr(0750,%{icinga_user},%{icingacmd_group}) %ghost %{_rundir}/%{name} %attr(0750,%{icinga_user},%{icingacmd_group}) %ghost %dir %{_rundir}/%{name}
%attr(2750,%{icinga_user},%{icingacmd_group}) %ghost %{_rundir}/%{name}/cmd %attr(2750,%{icinga_user},%{icingacmd_group}) %ghost %{_rundir}/%{name}/cmd
%attr(0750,%{icinga_user},%{icinga_group}) %dir %{_localstatedir}/spool/%{name} %attr(0750,%{icinga_user},%{icinga_group}) %dir %{_localstatedir}/spool/%{name}
%attr(0770,%{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 %{_localstatedir}/spool/%{name}/tmp
%attr(0750,%{icinga_user},%{icinga_group}) %dir %{_datadir}/%{name}/include %attr(0750,%{icinga_user},%{icinga_group}) %dir %{_datadir}/%{name}/include
%{_datadir}/%{name}/include %{_datadir}/%{name}/include/*
%files doc %files doc
%defattr(-,root,root,-) %defattr(-,root,root,-)
@ -696,16 +679,16 @@ fi
%files ido-mysql %files ido-mysql
%defattr(-,root,root,-) %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 %config(noreplace) %attr(0640,%{icinga_user},%{icinga_group}) %{_sysconfdir}/%{name}/features-available/ido-mysql.conf
%{_libdir}/%{name}/libdb_ido_mysql* %{_libdir}/%{name}/libmysql_shim*
%{_datadir}/icinga2-ido-mysql %{_datadir}/icinga2-ido-mysql
%files ido-pgsql %files ido-pgsql
%defattr(-,root,root,-) %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 %config(noreplace) %attr(0640,%{icinga_user},%{icinga_group}) %{_sysconfdir}/%{name}/features-available/ido-pgsql.conf
%{_libdir}/%{name}/libdb_ido_pgsql* %{_libdir}/%{name}/libpgsql_shim*
%{_datadir}/icinga2-ido-pgsql %{_datadir}/icinga2-ido-pgsql
%if 0%{?use_selinux} %if 0%{?use_selinux}
@ -715,14 +698,6 @@ fi
%{_datadir}/selinux/*/%{selinux_modulename}.pp %{_datadir}/selinux/*/%{selinux_modulename}.pp
%endif %endif
%if 0%{?fedora}
%files studio
%defattr(-,root,root,-)
%{_bindir}/icinga-studio
%{_datadir}/icinga2-studio
%{_datadir}/applications/icinga2-studio.desktop
%endif
%files -n vim-icinga2 %files -n vim-icinga2
%defattr(-,root,root,-) %defattr(-,root,root,-)
%if "%{_vendor}" == "suse" %if "%{_vendor}" == "suse"
@ -741,6 +716,9 @@ fi
%{_datadir}/nano/%{name}.nanorc %{_datadir}/nano/%{name}.nanorc
%changelog %changelog
* Tue Jul 17 2018 Michael Friedrich <michael.friedrich@icinga.com> 2.9.0-1
- Update to 2.9.0
* Wed Apr 25 2018 Jean Flach <jean.flach@icinga.com> 2.8.4-1 * Wed Apr 25 2018 Jean Flach <jean.flach@icinga.com> 2.8.4-1
- Update to 2.8.4 - Update to 2.8.4