%define icingaweb2name icingaweb2
%define icingaweb2version 2.0.0
-# DEPRECATED
-%define icingaclassicconfdir %{_sysconfdir}/icinga
-
%define logmsg logger -t %{name}/rpm
Summary: Network monitoring application
Name: icinga2
-Version: 2.7.0
+Version: 2.7.1
Release: %{revision}%{?dist}
License: GPL-2.0+
Group: Applications/System
# Requires devtoolset-2 scl
BuildRequires: devtoolset-2-gcc-c++
BuildRequires: devtoolset-2-libstdc++-devel
+BuildRequires: devtoolset-2-binutils
%define scl_enable scl enable devtoolset-2 --
%else
BuildRequires: gcc-c++
Summary: Common Icinga 2 configuration
Group: Applications/System
%if (0%{?amzn} || 0%{?fedora} || 0%{?rhel})
-Requires(pre): shadow-utils
-Requires(post): shadow-utils
+Requires(pre): shadow-utils
+Requires(post): shadow-utils
%endif
%if "%{_vendor}" == "suse"
-Requires(pre): shadow
-Requires(post): shadow
+Requires(pre): shadow
+Requires(post): shadow
# Coreutils is added because of autoyast problems reported
-Requires(pre): coreutils
-Requires(post): coreutils
-Recommends: logrotate
+Requires(pre): coreutils
+Requires(post): coreutils
+%if 0%{?suse_version} >= 1200
+BuildRequires: monitoring-plugins-common
+Requires: monitoring-plugins-common
+%else
+Recommends: monitoring-plugins-common
+%endif
+Recommends: logrotate
%endif
%description common
Icinga 2 IDO PostgreSQL database backend. Compatible with Icinga 1.x
IDOUtils schema >= 1.12
-# DEPRECATED, disable builds on Amazon
-%if !(0%{?amzn})
-
-# DEPRECATED
-%package classicui-config
-Summary: Icinga 2 Classic UI Standalone configuration
-Group: Applications/System
-BuildRequires: %{apachename}
-Requires: %{apachename}
-Requires: %{name} = %{version}-%{release}
-%if "%{_vendor}" == "suse"
-Recommends: icinga-www
-%endif
-Provides: icinga-classicui-config
-Conflicts: icinga-gui-config
-
-# DEPRECATED
-%description classicui-config
-Icinga 1.x Classic UI Standalone configuration with locations
-for Icinga 2.
-
-# DEPRECATED, disable builds on Amazon
-%endif
-
%if "%{_vendor}" == "redhat" && !(0%{?el5} || 0%{?rhel} == 5 || "%{?dist}" == ".el5" || 0%{?el6} || 0%{?rhel} == 6 || "%{?dist}" == ".el6")
%global selinux_variants mls targeted
%{!?_selinux_policy_version: %global _selinux_policy_version %(sed -e 's,.*selinux-policy-\\([^/]*\\)/.*,\\1,' /usr/share/selinux/devel/policyhelp 2>/dev/null)}
Summary: Vim syntax highlighting for icinga2
Group: Applications/System
%if "%{_vendor}" == "suse"
-Requires: vim-data
+BuildRequires: vim
+Requires: vim
%else
-Requires: vim-filesystem
+Requires: vim-filesystem
%endif
%description -n vim-icinga2
%package -n nano-icinga2
-Summary: Nano syntax highlighting for icinga2
-Group: Applications/System
-Requires: nano
+Summary: Nano syntax highlighting for icinga2
+Group: Applications/System
+Requires: nano
%description -n nano-icinga2
Nano syntax highlighting for icinga2
make install \
DESTDIR="%{buildroot}"
-# DEPRECATED, disable builds on Amazon
-%if !(0%{?amzn})
-
-# install classicui config
-install -D -m 0644 etc/icinga/icinga-classic.htpasswd %{buildroot}%{icingaclassicconfdir}/passwd
-install -D -m 0644 etc/icinga/cgi.cfg %{buildroot}%{icingaclassicconfdir}/cgi.cfg
-install -D -m 0644 etc/icinga/icinga-classic-apache.conf %{buildroot}%{apacheconfdir}/icinga.conf
-
-# DEPRECATED, disable builds on Amazon
-%endif
-
# remove features-enabled symlinks
rm -f %{buildroot}/%{_sysconfdir}/%{name}/features-enabled/*.conf
%endif
%if "%{_vendor}" == "suse"
-%if 0%{?suse_version} >= 1310
-install -D -m 0644 tools/syntax/vim/syntax/%{name}.vim %{buildroot}%{_datadir}/vim/vim74/syntax/%{name}.vim
-install -D -m 0644 tools/syntax/vim/ftdetect/%{name}.vim %{buildroot}%{_datadir}/vim/vim74/ftdetect/%{name}.vim
-%else
-install -D -m 0644 tools/syntax/vim/syntax/%{name}.vim %{buildroot}%{_datadir}/vim/vim72/syntax/%{name}.vim
-install -D -m 0644 tools/syntax/vim/ftdetect/%{name}.vim %{buildroot}%{_datadir}/vim/vim72/ftdetect/%{name}.vim
-%endif
+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
%else
install -D -m 0644 tools/syntax/vim/syntax/%{name}.vim %{buildroot}%{_datadir}/vim/vimfiles/syntax/%{name}.vim
install -D -m 0644 tools/syntax/vim/ftdetect/%{name}.vim %{buildroot}%{_datadir}/vim/vimfiles/ftdetect/%{name}.vim
%postun common
# suse
%if "%{_vendor}" == "suse"
-%if 0%{?using_systemd}
+%if 0%{?use_systemd}
%service_del_postun %{name}.service
%else
%restart_on_update %{name}
exit 0
-# DEPRECATED, disable builds on Amazon
-%if !(0%{?amzn})
-
-%post classicui-config
-if [ ${1:-0} -eq 1 ]
-then
- # initial installation, enable features
- for feature in statusdata compatlog command; do
- ln -sf ../features-available/${feature}.conf %{_sysconfdir}/%{name}/features-enabled/${feature}.conf
- done
-fi
-
-%logmsg "The icinga2-classicui-config package has been deprecated and will be removed in future releases."
-
-exit 0
-
-# DEPRECATED
-%postun classicui-config
-if [ "$1" = "0" ]; then
- # deinstallation of the package - remove feature
- for feature in statusdata compatlog command; do
- rm -f %{_sysconfdir}/%{name}/features-enabled/${feature}.conf
- done
-fi
-
-exit 0
-
-# DEPRECATED, disable builds on Amazon
-%endif
-
%if "%{_vendor}" == "redhat" && !(0%{?el5} || 0%{?rhel} == 5 || "%{?dist}" == ".el5" || 0%{?el6} || 0%{?rhel} == 6 || "%{?dist}" == ".el6")
%post selinux
for selinuxvariant in %{selinux_variants}
%{_libdir}/%{name}/libdb_ido_pgsql*
%{_datadir}/icinga2-ido-pgsql
-# DEPRECATED, disable builds on Amazon
-%if !(0%{?amzn})
-
-%files classicui-config
-%defattr(-,root,root,-)
-%attr(0751,%{icinga_user},%{icinga_group}) %dir %{icingaclassicconfdir}
-%config(noreplace) %{icingaclassicconfdir}/cgi.cfg
-%config(noreplace) %{apacheconfdir}/icinga.conf
-%config(noreplace) %attr(0640,root,%{apachegroup}) %{icingaclassicconfdir}/passwd
-
-# DEPRECATED, disable builds on Amazon
-%endif
-
%if "%{_vendor}" == "redhat" && !(0%{?el5} || 0%{?rhel} == 5 || "%{?dist}" == ".el5" || 0%{?el6} || 0%{?rhel} == 6 || "%{?dist}" == ".el6")
%files selinux
%defattr(-,root,root,0755)
%files -n vim-icinga2
%defattr(-,root,root,-)
%if "%{_vendor}" == "suse"
-%if 0%{?suse_version} >= 1310
-%{_datadir}/vim/vim74/syntax/%{name}.vim
-%{_datadir}/vim/vim74/ftdetect/%{name}.vim
-%else
-%{_datadir}/vim/vim72/syntax/%{name}.vim
-%{_datadir}/vim/vim72/ftdetect/%{name}.vim
-%endif
+%{_datadir}/vim/site/syntax/%{name}.vim
+%{_datadir}/vim/site/ftdetect/%{name}.vim
%else
%{_datadir}/vim/vimfiles/syntax/%{name}.vim
%{_datadir}/vim/vimfiles/ftdetect/%{name}.vim
%files -n nano-icinga2
%defattr(-,root,root,-)
+%if "%{_vendor}" == "suse"
+%dir %{_datadir}/nano
+%endif
%{_datadir}/nano/%{name}.nanorc
%changelog
projects / icinga2 / blobdiff