Skip to content
Snippets Groups Projects
Commit b8e7d08c authored by Markus Frosch's avatar Markus Frosch
Browse files

Merge remote-tracking branch 'archive/release' into 2.10

parents d0cfb5d0 8ba427ba
No related branches found
No related tags found
No related merge requests found
Pipeline #5210 canceled
#/****************************************************************************** # Icinga 2 | (c) 2012 Icinga GmbH | GPLv2+
# * Icinga 2 *
# * Copyright (C) 2012-2017 Icinga Development Team (https://www.icinga.com/) *
# * *
# * This program is free software; you can redistribute it and/or *
# * modify it under the terms of the GNU General Public License *
# * as published by the Free Software Foundation; either version 2 *
# * of the License, or (at your option) any later version. *
# * *
# * This program is distributed in the hope that it will be useful, *
# * but WITHOUT ANY WARRANTY; without even the implied warranty of *
# * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
# * GNU General Public License for more details. *
# * *
# * You should have received a copy of the GNU General Public License *
# * along with this program; if not, write to the Free Software Foundation *
# * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. *
# ******************************************************************************/
%define revision 1 %define revision 1
...@@ -88,7 +71,7 @@ License: GPLv2+ ...@@ -88,7 +71,7 @@ License: GPLv2+
%endif # suse %endif # suse
Group: System/Monitoring Group: System/Monitoring
Name: icinga2 Name: icinga2
Version: 2.10.2 Version: 2.10.5
Release: %{revision}%{?dist} Release: %{revision}%{?dist}
Url: https://www.icinga.com/ Url: https://www.icinga.com/
Source: https://github.com/Icinga/%{name}/archive/v%{version}.tar.gz Source: https://github.com/Icinga/%{name}/archive/v%{version}.tar.gz
...@@ -262,8 +245,14 @@ BuildRequires: checkpolicy ...@@ -262,8 +245,14 @@ BuildRequires: checkpolicy
BuildRequires: hardlink BuildRequires: hardlink
BuildRequires: selinux-policy-devel BuildRequires: selinux-policy-devel
Requires: %{name}-bin = %{version}-%{release} Requires: %{name}-bin = %{version}-%{release}
%if 0%{?fedora} >= 27 || 0%{?rhel} >= 8
Requires(post): policycoreutils-python-utils
Requires(postun): policycoreutils-python-utils
%else
Requires(post): policycoreutils-python Requires(post): policycoreutils-python
Requires(postun): policycoreutils-python Requires(postun): policycoreutils-python
%endif
%description selinux %description selinux
SELinux policy module supporting icinga2. SELinux policy module supporting icinga2.
...@@ -301,6 +290,11 @@ Provides Nano syntax highlighting for icinga2. ...@@ -301,6 +290,11 @@ Provides Nano syntax highlighting for icinga2.
find . -type f -name '*.sh' -exec sed -i -e 's|\/usr\/bin\/env bash|\/bin\/bash|g' {} \; find . -type f -name '*.sh' -exec sed -i -e 's|\/usr\/bin\/env bash|\/bin\/bash|g' {} \;
%endif %endif
# quick & dirty hack for SLES11 & Kernel < 2.9 w/o SO_REUSEPORT
%if "%{_vendor}" == "suse" && 0%{?suse_version} < 1210
find . -type f -name tcpsocket.cpp -exec sed -i -e 's|.*SO_REUSEPORT.*||g' {} \;
%endif
%build %build
# set basedir to allow cache to hit between different builds # set basedir to allow cache to hit between different builds
# this will make all paths below BUILD/icinga2-x.x.x relative for cache # this will make all paths below BUILD/icinga2-x.x.x relative for cache
...@@ -738,6 +732,18 @@ fi ...@@ -738,6 +732,18 @@ fi
%{_datadir}/nano/%{name}.nanorc %{_datadir}/nano/%{name}.nanorc
%changelog %changelog
* Thu May 23 2019 Michael Friedrich <michael.friedrich@icinga.com> 2.10.5-1
- Update to 2.10.5
* Tue Mar 19 2019 Michael Friedrich <michael.friedrich@icinga.com> 2.10.4-1
- Update to 2.10.4
* Tue Feb 26 2019 Michael Friedrich <michael.friedrich@icinga.com> 2.10.3-2
- Apply quickfix for SLES11
* Tue Feb 26 2019 Michael Friedrich <michael.friedrich@icinga.com> 2.10.3-1
- Update to 2.10.3
* Wed Nov 14 2018 Michael Friedrich <michael.friedrich@icinga.com> 2.10.2-1 * Wed Nov 14 2018 Michael Friedrich <michael.friedrich@icinga.com> 2.10.2-1
- Update to 2.10.2 - Update to 2.10.2
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment