Hello community, here is the log from the commit of package icinga2 for openSUSE:Factory checked in at 2018-02-12 10:13:59 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/icinga2 (Old) and /work/SRC/openSUSE:Factory/.icinga2.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "icinga2" Mon Feb 12 10:13:59 2018 rev:3 rq:574133 version:2.8.1 Changes: -------- --- /work/SRC/openSUSE:Factory/icinga2/icinga2.changes 2018-01-25 12:39:59.252212745 +0100 +++ /work/SRC/openSUSE:Factory/.icinga2.new/icinga2.changes 2018-02-12 10:14:00.244123455 +0100 @@ -1,0 +2,5 @@ +Sun Feb 4 22:15:37 UTC 2018 - ec...@opensuse.org + +- fix build error for 15.0, Tumbleweed and Factory + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ icinga2.spec ++++++ --- /var/tmp/diff_new_pack.ccgIrS/_old 2018-02-12 10:14:01.024095347 +0100 +++ /var/tmp/diff_new_pack.ccgIrS/_new 2018-02-12 10:14:01.028095203 +0100 @@ -1,21 +1,20 @@ -#/****************************************************************************** -# * 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. * -# ******************************************************************************/ +# +# spec file for package icinga2 +# +# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. +# +# All modifications and additions to the file contributed by third parties +# remain the property of their copyright owners, unless otherwise agreed +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# license that conforms to the Open Source Definition (Version 1.9) +# published by the Open Source Initiative. + +# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# + %define revision 1 @@ -77,16 +76,15 @@ %define icingaweb2name icingaweb2 %define icingaweb2version 2.0.0 - %define logmsg logger -t %{name}/rpm Summary: Network monitoring application +License: GPL-2.0+ +Group: System/Monitoring Name: icinga2 Version: 2.8.1 Release: %{revision}%{?dist} -License: GPL-2.0+ -URL: https://www.icinga.com/ -Group: System/Monitoring +Url: https://www.icinga.com/ Source: https://github.com/Icinga/%{name}/archive/v%{version}.tar.gz Source1: icinga2-rpmlintrc @@ -113,14 +111,14 @@ BuildRequires: ncurses-devel %if "%{_vendor}" == "suse" && 0%{?suse_version} < 1210 BuildRequires: gcc48-c++ -BuildRequires: libstdc++48-devel BuildRequires: libopenssl1-devel +BuildRequires: libstdc++48-devel %else %if "%{_vendor}" == "redhat" && (0%{?el5} || 0%{?rhel} == 5 || "%{?dist}" == ".el5" || 0%{?el6} || 0%{?rhel} == 6 || "%{?dist}" == ".el6") # Requires devtoolset-2 scl +BuildRequires: devtoolset-2-binutils 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++ @@ -128,9 +126,9 @@ %endif BuildRequires: openssl-devel %endif +BuildRequires: bison BuildRequires: cmake BuildRequires: flex >= 2.5.35 -BuildRequires: bison BuildRequires: make %if 0%{?fedora} BuildRequires: wxGTK3-devel @@ -145,10 +143,10 @@ BuildRequires: boost153-devel %else %if "%{_vendor}" == "suse" && 0%{?suse_version} > 1320 -BuildRequires: libboost_thread-devel >= 1.48 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") # Requires EPEL repository @@ -180,9 +178,9 @@ %endif BuildRequires: logrotate %if "%{_vendor}" == "suse" -Provides: user(%{icinga_user}) Provides: group(%{icinga_group}) Provides: group(%{icingacmd_group}) +Provides: user(%{icinga_user}) Requires(pre): shadow Requires(post): shadow # Coreutils is added because of autoyast problems reported @@ -260,16 +258,17 @@ %package selinux Summary: SELinux policy module supporting icinga2 Group: System/Base -BuildRequires: checkpolicy, selinux-policy-devel, hardlink +BuildRequires: checkpolicy +BuildRequires: hardlink +BuildRequires: selinux-policy-devel Requires: %{name} = %{version}-%{release} Requires(post): policycoreutils-python Requires(postun): policycoreutils-python %description selinux -SELinux policy module supporting icinga2 +SELinux policy module supporting icinga2. %endif - %if 0%{?fedora} %package studio Summary: Studio for Icinga 2 @@ -281,7 +280,6 @@ Provides a GUI for the Icinga 2 API. %endif - %package -n vim-icinga2 Summary: Vim syntax highlighting for icinga2 Group: Productivity/Text/Editors @@ -293,7 +291,7 @@ %endif %description -n vim-icinga2 -Vim syntax highlighting for icinga2 +Provides Vim syntax highlighting for icinga2. %package -n nano-icinga2 @@ -302,10 +300,12 @@ Requires: nano %description -n nano-icinga2 -Nano syntax highlighting for icinga2 +Provides Nano syntax highlighting for icinga2. %prep %setup -q -n %{name}-%{version} +#rpmlintrc +find . -type f -name '*.sh' -exec sed -i -e 's|\/usr\/bin\/env bash|\/bin\/bash|g' {} \; %build CMAKE_OPTS="-DCMAKE_INSTALL_PREFIX=/usr \ @@ -397,9 +397,14 @@ %else ln -sf ../../%{_initrddir}/%{name} "%{buildroot}%{_sbindir}/rc%{name}" %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/" mv "%{buildroot}%{_sysconfdir}/sysconfig/%{name}" "%{buildroot}%{_localstatedir}/adm/fillup-templates/sysconfig.%{name}" %endif +%endif %if 0%{?use_selinux} cd tools/selinux @@ -412,7 +417,7 @@ cd - # TODO: Fix build problems on Icinga, see https://github.com/Icinga/puppet-icinga_build/issues/11 -#/usr/sbin/hardlink -cv %{buildroot}%{_datadir}/selinux +#/usr/sbin/hardlink -cv %%{buildroot}%%{_datadir}/selinux %endif %if 0%{?fedora} @@ -629,7 +634,6 @@ fi %endif - %files %defattr(-,root,root,-) %doc COPYING @@ -680,7 +684,11 @@ %endif %if "%{_vendor}" == "suse" %{_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} +%endif %else %config(noreplace) %{_sysconfdir}/sysconfig/%{name} %endif
