From cee9ca5ba4a8602d33c4ec6b9b03f3284933afde Mon Sep 17 00:00:00 2001 From: Daniel Steiner Date: Fri, 25 Nov 2022 11:36:16 +0100 Subject: [PATCH] Cleanup and build the last packages for Fedora 37 --- fedora/SPECS/{ => archive}/arcanist.spec | 0 fedora/SPECS/{ => archive}/ffmpeg-nvidia.spec | 0 fedora/SPECS/{ => archive}/gdal3.spec | 0 fedora/SPECS/{ => archive}/goaccess.spec | 0 fedora/SPECS/{ => archive}/haproxy.spec | 0 fedora/SPECS/{ => archive}/htop.spec | 0 fedora/SPECS/archive/icinga2.spec | 961 ++++++++++-------- fedora/SPECS/archive/icingaweb2.spec | 251 +++-- fedora/SPECS/{ => archive}/icli.spec | 0 fedora/SPECS/{ => archive}/kodi.spec | 0 fedora/SPECS/{ => archive}/l10n.spec | 0 fedora/SPECS/{ => archive}/libva.spec | 0 fedora/SPECS/{ => archive}/makemkv.spec | 0 fedora/SPECS/{ => archive}/mediaelch.spec | 0 .../{ => archive}/nagios-plugins-own.spec | 0 .../SPECS/{ => archive}/nagios-plugins.spec | 0 fedora/SPECS/{ => archive}/ngxtop.spec | 0 fedora/SPECS/archive/noson-app.spec | 71 ++ fedora/SPECS/archive/noson.spec | 84 ++ .../percona-monitoring-plugins.spec | 0 fedora/SPECS/{ => archive}/phabricator.spec | 0 fedora/SPECS/{ => archive}/pnp4nagios.spec | 0 fedora/SPECS/{ => archive}/polemarch.spec | 0 fedora/SPECS/{ => archive}/powerline-go.spec | 0 .../SPECS/{ => archive}/powerline_shell.spec | 0 fedora/SPECS/{ => archive}/proj6.spec | 0 .../SPECS/{ => archive}/python-PyMySQL.spec | 0 fedora/SPECS/{ => archive}/python-acme.spec | 0 fedora/SPECS/{ => archive}/python-django.spec | 0 fedora/SPECS/archive/python-ldap.spec | 362 +++++++ fedora/SPECS/{ => archive}/python-mysql.spec | 0 fedora/SPECS/{ => archive}/python-redis.spec | 0 fedora/SPECS/{ => archive}/python-sphinx.spec | 0 .../SPECS/{ => archive}/python2-argparse.spec | 0 .../SPECS/{ => archive}/python2-whisper.spec | 0 .../SPECS/{ => archive}/python3-argparse.spec | 0 fedora/SPECS/{ => archive}/tilesweep.spec | 0 fedora/SPECS/{ => archive}/xnview.spec | 0 fedora/SPECS/icinga2.spec | 918 ----------------- fedora/SPECS/icingaweb2.spec | 481 --------- fedora/SPECS/mod_auth_openidc.spec | 10 +- fedora/SPECS/mod_tile.spec | 3 + fedora/SPECS/mydumper.spec | 16 +- fedora/SPECS/navidrome.spec | 5 +- 44 files changed, 1284 insertions(+), 1878 deletions(-) rename fedora/SPECS/{ => archive}/arcanist.spec (100%) rename fedora/SPECS/{ => archive}/ffmpeg-nvidia.spec (100%) rename fedora/SPECS/{ => archive}/gdal3.spec (100%) rename fedora/SPECS/{ => archive}/goaccess.spec (100%) rename fedora/SPECS/{ => archive}/haproxy.spec (100%) rename fedora/SPECS/{ => archive}/htop.spec (100%) rename fedora/SPECS/{ => archive}/icli.spec (100%) rename fedora/SPECS/{ => archive}/kodi.spec (100%) rename fedora/SPECS/{ => archive}/l10n.spec (100%) rename fedora/SPECS/{ => archive}/libva.spec (100%) rename fedora/SPECS/{ => archive}/makemkv.spec (100%) rename fedora/SPECS/{ => archive}/mediaelch.spec (100%) rename fedora/SPECS/{ => archive}/nagios-plugins-own.spec (100%) rename fedora/SPECS/{ => archive}/nagios-plugins.spec (100%) rename fedora/SPECS/{ => archive}/ngxtop.spec (100%) create mode 100644 fedora/SPECS/archive/noson-app.spec create mode 100644 fedora/SPECS/archive/noson.spec rename fedora/SPECS/{ => archive}/percona-monitoring-plugins.spec (100%) rename fedora/SPECS/{ => archive}/phabricator.spec (100%) rename fedora/SPECS/{ => archive}/pnp4nagios.spec (100%) rename fedora/SPECS/{ => archive}/polemarch.spec (100%) rename fedora/SPECS/{ => archive}/powerline-go.spec (100%) rename fedora/SPECS/{ => archive}/powerline_shell.spec (100%) rename fedora/SPECS/{ => archive}/proj6.spec (100%) rename fedora/SPECS/{ => archive}/python-PyMySQL.spec (100%) rename fedora/SPECS/{ => archive}/python-acme.spec (100%) rename fedora/SPECS/{ => archive}/python-django.spec (100%) create mode 100644 fedora/SPECS/archive/python-ldap.spec rename fedora/SPECS/{ => archive}/python-mysql.spec (100%) rename fedora/SPECS/{ => archive}/python-redis.spec (100%) rename fedora/SPECS/{ => archive}/python-sphinx.spec (100%) rename fedora/SPECS/{ => archive}/python2-argparse.spec (100%) rename fedora/SPECS/{ => archive}/python2-whisper.spec (100%) rename fedora/SPECS/{ => archive}/python3-argparse.spec (100%) rename fedora/SPECS/{ => archive}/tilesweep.spec (100%) rename fedora/SPECS/{ => archive}/xnview.spec (100%) delete mode 100644 fedora/SPECS/icinga2.spec delete mode 100644 fedora/SPECS/icingaweb2.spec diff --git a/fedora/SPECS/arcanist.spec b/fedora/SPECS/archive/arcanist.spec similarity index 100% rename from fedora/SPECS/arcanist.spec rename to fedora/SPECS/archive/arcanist.spec diff --git a/fedora/SPECS/ffmpeg-nvidia.spec b/fedora/SPECS/archive/ffmpeg-nvidia.spec similarity index 100% rename from fedora/SPECS/ffmpeg-nvidia.spec rename to fedora/SPECS/archive/ffmpeg-nvidia.spec diff --git a/fedora/SPECS/gdal3.spec b/fedora/SPECS/archive/gdal3.spec similarity index 100% rename from fedora/SPECS/gdal3.spec rename to fedora/SPECS/archive/gdal3.spec diff --git a/fedora/SPECS/goaccess.spec b/fedora/SPECS/archive/goaccess.spec similarity index 100% rename from fedora/SPECS/goaccess.spec rename to fedora/SPECS/archive/goaccess.spec diff --git a/fedora/SPECS/haproxy.spec b/fedora/SPECS/archive/haproxy.spec similarity index 100% rename from fedora/SPECS/haproxy.spec rename to fedora/SPECS/archive/haproxy.spec diff --git a/fedora/SPECS/htop.spec b/fedora/SPECS/archive/htop.spec similarity index 100% rename from fedora/SPECS/htop.spec rename to fedora/SPECS/archive/htop.spec diff --git a/fedora/SPECS/archive/icinga2.spec b/fedora/SPECS/archive/icinga2.spec index 80828f9..f0a34a3 100644 --- a/fedora/SPECS/archive/icinga2.spec +++ b/fedora/SPECS/archive/icinga2.spec @@ -1,21 +1,4 @@ -#/****************************************************************************** -# * 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. * -# ******************************************************************************/ +# Icinga 2 | (c) 2012 Icinga GmbH | GPLv2+ %define revision 1 @@ -23,32 +6,52 @@ %if ! %{defined _rundir} %define _rundir %{_localstatedir}/run %endif +%if ! %{defined _fillupdir} + %define _fillupdir %{_localstatedir}/adm/fillup-templates +%endif %define _libexecdir %{_prefix}/lib/ +%define plugindir %{_libdir}/nagios/plugins %if "%{_vendor}" == "redhat" %define apachename httpd %define apacheconfdir %{_sysconfdir}/httpd/conf.d %define apacheuser apache %define apachegroup apache -%if 0%{?el5}%{?el6} + +%if 0%{?el6}%{?amzn} %define use_systemd 0 +%define use_selinux 0 %if %(uname -m) != "x86_64" %define march_flag -march=i686 %endif %else # fedora and el>=7 %define use_systemd 1 +%define use_selinux 1 +%if 0%{?fedora} >= 24 +# for installing limits.conf on systemd >= 228 +%define configure_systemd_limits 1 +%else +%define configure_systemd_limits 0 +%endif %endif %endif %if "%{_vendor}" == "suse" +%define plugindir %{_libexecdir}/nagios/plugins %define apachename apache2 %define apacheconfdir %{_sysconfdir}/apache2/conf.d %define apacheuser wwwrun %define apachegroup www %if 0%{?suse_version} >= 1310 %define use_systemd 1 +%if 0%{?sle_version} >= 120200 || 0%{?suse_version} > 1320 +# for installing limits.conf on systemd >= 228 +%define configure_systemd_limits 1 +%else +%define configure_systemd_limits 0 +%endif %else %define use_systemd 0 %endif @@ -57,296 +60,421 @@ %define icinga_user icinga %define icinga_group icinga %define icingacmd_group icingacmd -%define icingaweb2name icingaweb2 -%define icingaweb2version 2.0.0 -%define icingaclassicconfdir %{_sysconfdir}/icinga +# enable unity builds by default for all architectures except arm32 +%ifarch %{arm} +%bcond_with unity_build +%else +%bcond_without unity_build +%endif + +# Disable lto_build for older SUSE versions +# see https://github.com/Icinga/icinga2/issues/7149 +%if "%{_vendor}" == "suse" && 0%{?suse_version} <= 1315 +%bcond_with lto_build +%else # suse_version 1315 +%bcond_without lto_build +%endif # suse_version 1315 + +%bcond_with systemd_and_init +%bcond_without compat +%bcond_without livestatus +%bcond_without notification +%bcond_without perfdata +%bcond_without tests +%bcond_without mysql +%bcond_without pgsql %define logmsg logger -t %{name}/rpm -Summary: Network monitoring application -Name: icinga2 -Version: 2.6.3 -Release: %{revision}%{?dist} -License: GPL-2.0+ -Group: Applications/System -Source: icinga2.tar.gz -URL: https://www.icinga.com/ +%define boost_min_version 1.66 + +Summary: Network monitoring application +%if "%{_vendor}" == "suse" +License: GPL-2.0-or-later +%else +License: GPLv2+ +%endif # suse +Group: System/Monitoring +Name: icinga2 +Version: 2.12.1 +Release: %{revision}%{?dist} +Url: https://www.icinga.com/ +Source: https://github.com/Icinga/%{name}/archive/v%{version}%{?src_version_suffix}.tar.gz + BuildRoot: %{_tmppath}/%{name}-%{version}-build -Requires: %{name}-bin = %{version}-%{release} +Requires: %{name}-bin = %{version}-%{release} +Requires: %{name}-common = %{version}-%{release} + +Conflicts: %{name}-common < %{version}-%{release} %description Meta package for Icinga 2 Core, DB IDO and Web. %package bin -Summary: Icinga 2 binaries and libraries -Group: Applications/System +Summary: Icinga 2 binaries and libraries +Group: System/Monitoring + +Requires: %{name}-bin = %{version}-%{release} %if "%{_vendor}" == "suse" -PreReq: permissions -Provides: monitoring_daemon -Recommends: monitoring-plugins +Provides: monitoring_daemon +Recommends: monitoring-plugins %if 0%{?suse_version} >= 1310 -BuildRequires: libyajl-devel +BuildRequires: libyajl-devel %endif %endif -BuildRequires: libedit-devel -BuildRequires: ncurses-devel +BuildRequires: libedit-devel +BuildRequires: ncurses-devel %if "%{_vendor}" == "suse" && 0%{?suse_version} < 1210 -BuildRequires: gcc48-c++ -BuildRequires: libstdc++48-devel -BuildRequires: libopenssl1-devel +BuildRequires: gcc48-c++ +BuildRequires: libopenssl1-devel +BuildRequires: libstdc++48-devel %else -BuildRequires: gcc-c++ -BuildRequires: libstdc++-devel -BuildRequires: openssl-devel +%if "%{_vendor}" == "redhat" && (0%{?el6} || 0%{?rhel} == 6 || "%{?dist}" == ".el6") +# Requires devtoolset-7 scl +%define scl_name devtoolset-7 +%define scl_enable scl enable %{scl_name} -- +BuildRequires: %{scl_name}-binutils +BuildRequires: %{scl_name}-gcc-c++ +BuildRequires: %{scl_name}-libstdc++-devel +%else +BuildRequires: gcc-c++ +BuildRequires: libstdc++-devel %endif -BuildRequires: cmake -BuildRequires: flex >= 2.5.35 -BuildRequires: bison -BuildRequires: make -%if 0%{?fedora} -BuildRequires: wxGTK3-devel +BuildRequires: openssl-devel %endif +BuildRequires: bison +BuildRequires: cmake +BuildRequires: flex >= 2.5.35 +BuildRequires: make -%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 -BuildRequires: boost153-devel -%else -%if 0%{?build_icinga_org} && "%{_vendor}" == "suse" && 0%{?suse_version} < 1310 -# sles 11 sp3 requires packages.icinga.com -BuildRequires: boost153-devel -%else -BuildRequires: boost-devel >= 1.41 -%endif -%endif +%if "%{_vendor}" == "suse" + %if 0%{?suse_version} >= 1315 + # SLES 12 and OpenSUSE 42 or later + %define boost_devel_pkg %nil + %if 0%{?suse_version} < 1320 + # before SLES 15 and OpenSUSE 15 + # Provided by packages.icinga.com + %define boost_library icinga-boost + %define boost_version 1.69 + %define boost_rpath %{_libdir}/%{boost_library} + # Note: the -impl suffix comes from current packages on OBS + %define boost_devel_suffix -impl + %endif # suse_version < 1320 +BuildRequires: libboost_context-devel%{?boost_devel_suffix} >= %{boost_min_version} +BuildRequires: libboost_coroutine-devel%{?boost_devel_suffix} >= %{boost_min_version} +BuildRequires: libboost_filesystem-devel%{?boost_devel_suffix} >= %{boost_min_version} +BuildRequires: libboost_program_options-devel%{?boost_devel_suffix} >= %{boost_min_version} +BuildRequires: libboost_regex-devel%{?boost_devel_suffix} >= %{boost_min_version} +BuildRequires: libboost_system-devel%{?boost_devel_suffix} >= %{boost_min_version} +BuildRequires: libboost_thread-devel%{?boost_devel_suffix} >= %{boost_min_version} +BuildRequires: libboost_test-devel%{?boost_devel_suffix} >= %{boost_min_version} + %else # suse_version >= 1315 + # old boost devel name + %define boost_devel_pkg boost-devel + %endif # suse_version >= 1315 +%else # vendor == suse - assuming redhat or compatible + # default boost devel package + %define boost_devel_pkg boost-devel + + %if (0%{?el6} || 0%{?rhel} == 6) + # Provided by packages.icinga.com + %define boost_library icinga-boost169 + %define boost_version 1.69 + %define boost_devel_pkg icinga-boost169-devel + %define boost_rpath %{_libdir}/%{boost_library} + %endif # el6 + %if (0%{?el7} || 0%{?rhel} == 7) + # Provided by EPEL + %define boost_library boost169 + %define boost_version 1.69 + %define boost_devel_pkg boost169-devel + %endif # el7 +%endif # vendor == suse + +%if "%{?boost_devel_pkg}" != "" +BuildRequires: %{boost_devel_pkg} >= %{boost_min_version} +%endif # boost_devel_pkg %if 0%{?use_systemd} -BuildRequires: systemd -Requires: systemd +BuildRequires: systemd-devel +Requires: systemd %endif -Requires: %{name}-libs = %{version}-%{release} +Obsoletes: %{name}-libs <= 2.10.0 +Conflicts: %{name}-libs <= 2.10.0 %description bin Icinga 2 is a general-purpose network monitoring application. -Provides binaries for Icinga 2 Core. +This subpackage provides the binaries for Icinga 2 Core. %package common -Summary: Common Icinga 2 configuration -Group: Applications/System -%if "%{_vendor}" == "redhat" -Requires(pre): shadow-utils +Summary: Common Icinga 2 configuration +Group: System/Monitoring +%if (0%{?amzn} || 0%{?fedora} || 0%{?rhel}) +Requires(pre): shadow-utils Requires(post): shadow-utils %endif +BuildRequires: logrotate %if "%{_vendor}" == "suse" -Recommends: logrotate +PreReq: permissions +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 +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 -Provides common directories, uid and gid among Icinga 2 related -packages. +This subpackage provides common directories, and the UID and GUID definitions +among Icinga 2 related packages. %package doc -Summary: Documentation for Icinga 2 -Group: Applications/System -Requires: %{name} = %{version}-%{release} +Summary: Documentation for Icinga 2 +Group: Documentation/Other %description doc -Provides documentation for Icinga 2. - - -%package libs -Summary: Libraries for Icinga 2 -Group: Applications/System -Requires: %{name}-common = %{version}-%{release} - -%description libs -Provides internal libraries for the daemon or studio. +This subpackage provides documentation for Icinga 2. +%if %{with mysql} %package ido-mysql -Summary: IDO MySQL database backend for Icinga 2 -Group: Applications/System +Summary: IDO MySQL database backend for Icinga 2 +Group: System/Monitoring %if "%{_vendor}" == "suse" -BuildRequires: libmysqlclient-devel +BuildRequires: libmysqlclient-devel %if 0%{?suse_version} >= 1310 -BuildRequires: mysql-devel +BuildRequires: mysql-devel %endif %else -BuildRequires: mysql-devel +BuildRequires: mysql-devel %endif #suse -Requires: %{name} = %{version}-%{release} +Requires: %{name}-bin = %{version}-%{release} %description ido-mysql Icinga 2 IDO mysql database backend. Compatible with Icinga 1.x IDOUtils schema >= 1.12 - - -%package ido-pgsql -Summary: IDO PostgreSQL database backend for Icinga 2 -Group: Applications/System -%if "%{_vendor}" == "suse" && 0%{?suse_version} < 1210 -BuildRequires: postgresql-devel >= 8.4 -%else -BuildRequires: postgresql-devel %endif -Requires: %{name} = %{version}-%{release} + + +%if %{with pgsql} +%package ido-pgsql +Summary: IDO PostgreSQL database backend for Icinga 2 +Group: System/Monitoring +%if "%{_vendor}" == "suse" && 0%{?suse_version} < 1210 +BuildRequires: postgresql-devel >= 8.4 +%else +BuildRequires: postgresql-devel +%endif +Requires: %{name}-bin = %{version}-%{release} %description ido-pgsql Icinga 2 IDO PostgreSQL database backend. Compatible with Icinga 1.x IDOUtils schema >= 1.12 - - -%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 -%description classicui-config -Icinga 1.x Classic UI Standalone configuration with locations -for Icinga 2. - -%if "%{_vendor}" == "redhat" && !(0%{?el5} || 0%{?rhel} == 5 || "%{?dist}" == ".el5" || 0%{?el6} || 0%{?rhel} == 6 || "%{?dist}" == ".el6") +%if 0%{?use_selinux} %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)} -%global modulename %{name} +%global selinux_modulename %{name} %package selinux Summary: SELinux policy module supporting icinga2 -Group: System Environment/Base -#BuildRequires: checkpolicy, selinux-policy-devel, /usr/share/selinux/devel/policyhelp, hardlink -BuildRequires: checkpolicy, selinux-policy-devel, hardlink -%if "%{_selinux_policy_version}" != "" -Requires: selinux-policy >= %{_selinux_policy_version} +Group: System/Base +BuildRequires: checkpolicy +BuildRequires: hardlink +BuildRequires: selinux-policy-devel +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(postun): policycoreutils-python %endif -Requires: %{name} = %{version}-%{release} -Requires(post): /usr/sbin/semodule, /sbin/restorecon -Requires(postun): /usr/sbin/semodule, /sbin/restorecon + %description selinux -SELinux policy module supporting icinga2 +SELinux policy module supporting icinga2. %endif - -%if 0%{?fedora} -%package studio -Summary: Studio for Icinga 2 -Group: Applications/System -Requires: %{name}-libs = %{version}-%{release} -Requires: wxGTK3 - -%description studio -Provides a GUI for the Icinga 2 API. -%endif - - %package -n vim-icinga2 -Summary: Vim syntax highlighting for icinga2 -Group: Applications/System +Summary: Vim syntax highlighting for icinga2 +Group: Productivity/Text/Editors %if "%{_vendor}" == "suse" -Requires: vim-data +BuildRequires: vim +Requires: vim %else -Requires: vim-filesystem +Requires: vim-filesystem %endif %description -n vim-icinga2 -Vim syntax highlighting for icinga2 +Provides Vim syntax highlighting for icinga2. %package -n nano-icinga2 -Summary: Nano syntax highlighting for icinga2 -Group: Applications/System -Requires: nano +Summary: Nano syntax highlighting for icinga2 +Group: Productivity/Text/Editors +Requires: nano %description -n nano-icinga2 -Nano syntax highlighting for icinga2 +Provides Nano syntax highlighting for icinga2. %prep -%setup -q -n icinga2 +%setup -q -n %{name}-%{version}%{?src_version_suffix} +# 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 + +# 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 +# set basedir to allow cache to hit between different builds +# this will make all paths below BUILD/icinga2-x.x.x relative for cache +export CCACHE_BASEDIR="${CCACHE_BASEDIR:-$(pwd)}" + 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_SYSCONFIGFILE=/etc/sysconfig/icinga2 \ -DICINGA2_USER=%{icinga_user} \ -DICINGA2_GROUP=%{icinga_group} \ -DICINGA2_COMMAND_GROUP=%{icingacmd_group}" %if 0%{?fedora} CMAKE_OPTS="$CMAKE_OPTS -DICINGA2_WITH_STUDIO=true" %endif -%if "%{_vendor}" == "redhat" -%if 0%{?el5} || 0%{?rhel} == 5 || "%{?dist}" == ".el5" || 0%{?el6} || 0%{?rhel} == 6 || "%{?dist}" == ".el6" -# Boost_VERSION 1.41.0 vs 101400 - disable build tests -# details in https://dev.icinga.com/issues/5033 -CMAKE_OPTS="$CMAKE_OPTS -DBOOST_LIBRARYDIR=/usr/lib/boost153 \ - -DBOOST_INCLUDEDIR=/usr/include/boost153 \ - -DBoost_ADDITIONAL_VERSIONS='1.53;1.53.0' \ - -DBoost_NO_SYSTEM_PATHS=TRUE \ - -DBUILD_TESTING=FALSE \ - -DBoost_NO_BOOST_CMAKE=TRUE" + +%if %{with unity_build} +CMAKE_OPTS="$CMAKE_OPTS -DICINGA2_UNITY_BUILD=ON" +%else +CMAKE_OPTS="$CMAKE_OPTS -DICINGA2_UNITY_BUILD=OFF" %endif -%if 0%{?el6} || 0%{?rhel} == 6 || "%{?dist}" == ".el6" -CMAKE_OPTS="$CMAKE_OPTS -DBUILD_TESTING=FALSE" +%if %{with lto_build} +CMAKE_OPTS="$CMAKE_OPTS -DICINGA2_LTO_BUILD=ON" +%else +CMAKE_OPTS="$CMAKE_OPTS -DICINGA2_LTO_BUILD=OFF" %endif +%if %{with systemd_and_init} +CMAKE_OPTS="$CMAKE_OPTS -DINSTALL_SYSTEMD_SERVICE_AND_INITSCRIPT=ON" +%else +CMAKE_OPTS="$CMAKE_OPTS -DINSTALL_SYSTEMD_SERVICE_AND_INITSCRIPT=OFF" +%endif +%if %{with compat} +CMAKE_OPTS="$CMAKE_OPTS -DICINGA2_WITH_COMPAT=ON" +%else +CMAKE_OPTS="$CMAKE_OPTS -DICINGA2_WITH_COMPAT=OFF" +%endif +%if %{with livestatus} +CMAKE_OPTS="$CMAKE_OPTS -DICINGA2_WITH_LIVESTATUS=ON" +%else +CMAKE_OPTS="$CMAKE_OPTS -DICINGA2_WITH_LIVESTATUS=OFF" +%endif +%if %{with notification} +CMAKE_OPTS="$CMAKE_OPTS -DICINGA2_WITH_NOTIFICATION=ON" +%else +CMAKE_OPTS="$CMAKE_OPTS -DICINGA2_WITH_NOTIFICATION=OFF" +%endif +%if %{with perfdata} +CMAKE_OPTS="$CMAKE_OPTS -DICINGA2_WITH_PERFDATA=ON" +%else +CMAKE_OPTS="$CMAKE_OPTS -DICINGA2_WITH_PERFDATA=OFF" +%endif +%if %{with tests} +CMAKE_OPTS="$CMAKE_OPTS -DICINGA2_WITH_TESTS=ON" +%else +CMAKE_OPTS="$CMAKE_OPTS -DICINGA2_WITH_TESTS=OFF" +%endif +%if %{with mysql} +CMAKE_OPTS="$CMAKE_OPTS -DICINGA2_WITH_MYSQL=ON" +%else +CMAKE_OPTS="$CMAKE_OPTS -DICINGA2_WITH_MYSQL=OFF" +%endif +%if %{with pgsql} +CMAKE_OPTS="$CMAKE_OPTS -DICINGA2_WITH_PGSQL=ON" +%else +CMAKE_OPTS="$CMAKE_OPTS -DICINGA2_WITH_PGSQL=OFF" %endif -%if "%{_vendor}" != "suse" -CMAKE_OPTS="$CMAKE_OPTS -DICINGA2_PLUGINDIR=%{_libdir}/nagios/plugins" -%else -%if 0%{?suse_version} < 1310 -CMAKE_OPTS="$CMAKE_OPTS -DBOOST_LIBRARYDIR=/usr/lib/boost153 \ - -DBOOST_INCLUDEDIR=/usr/include/boost153 \ - -DBoost_ADDITIONAL_VERSIONS='1.53;1.53.0' \ +%if (0%{?el6} || 0%{?rhel} == 6) +# Explicitly link against rt, because ld doesn't detect it automatically +CMAKE_OPTS="$CMAKE_OPTS -DCMAKE_EXE_LINKER_FLAGS=-lrt" +%endif # el6 + +%if "%{?boost_rpath}" != "" +CMAKE_OPTS="$CMAKE_OPTS -DCMAKE_INSTALL_RPATH=%{boost_rpath}" +%endif # boost_rpath + +%if "%{?boost_library}" != "" +# Boost_NO_BOOST_CMAKE=ON - disable search for cmake +# Boost_NO_SYSTEM_PATHS=ON - only search in specified locations +CMAKE_OPTS="$CMAKE_OPTS + -DBoost_NO_BOOST_CMAKE=TRUE \ -DBoost_NO_SYSTEM_PATHS=TRUE \ - -DBUILD_TESTING=FALSE \ - -DBoost_NO_BOOST_CMAKE=TRUE" -%endif -CMAKE_OPTS="$CMAKE_OPTS -DICINGA2_PLUGINDIR=%{_prefix}/lib/nagios/plugins" -%endif + -DBOOST_LIBRARYDIR=%{_libdir}/%{boost_library} \ + -DBOOST_INCLUDEDIR=/usr/include/%{boost_library} \ + -DBoost_ADDITIONAL_VERSIONS='%{boost_version};%{boost_version}.0'" +%endif # boost_library %if 0%{?use_systemd} CMAKE_OPTS="$CMAKE_OPTS -DUSE_SYSTEMD=ON" %endif -cmake $CMAKE_OPTS -DCMAKE_C_FLAGS:STRING="%{optflags} %{?march_flag}" -DCMAKE_CXX_FLAGS:STRING="%{optflags} %{?march_flag}" . +%if "%{_vendor}" == "suse" && 0%{?suse_version} < 1210 +# from package gcc48-c++ +export CC=gcc-4.8 +export CXX=g++-4.8 +%endif -make %{?_smp_mflags} +%if "%{?_buildhost}" != "" +CMAKE_OPTS="$CMAKE_OPTS -DICINGA2_BUILD_HOST_NAME:STRING=%_buildhost" +%endif -%if "%{_vendor}" == "redhat" && !(0%{?el5} || 0%{?rhel} == 5 || "%{?dist}" == ".el5" || 0%{?el6} || 0%{?rhel} == 6 || "%{?dist}" == ".el6") +%{?scl_enable} cmake $CMAKE_OPTS -DCMAKE_C_FLAGS:STRING="%{optflags} %{?march_flag}" -DCMAKE_CXX_FLAGS:STRING="%{optflags} %{?march_flag}" . + +%{?scl_enable} make %{?_smp_mflags} + +%if 0%{?use_selinux} cd tools/selinux for selinuxvariant in %{selinux_variants} do make NAME=${selinuxvariant} -f /usr/share/selinux/devel/Makefile - mv %{modulename}.pp %{modulename}.pp.${selinuxvariant} + mv %{selinux_modulename}.pp %{selinux_modulename}.pp.${selinuxvariant} make NAME=${selinuxvariant} -f /usr/share/selinux/devel/Makefile clean done cd - %endif %install -make install \ - DESTDIR="%{buildroot}" +%{?scl_enable} make install \ + DESTDIR="%{buildroot}" -# 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 +# install custom limits.conf for systemd +%if 0%{?configure_systemd_limits} +# for > 2.8 or > 2.7.2 +install -D -m 0644 etc/initsystem/icinga2.service.limits.conf %{buildroot}/etc/systemd/system/%{name}.service.d/limits.conf +%endif # remove features-enabled symlinks rm -f %{buildroot}/%{_sysconfdir}/%{name}/features-enabled/*.conf @@ -358,49 +486,27 @@ rm -f %{buildroot}/%{_sysconfdir}/%{name}/features-enabled/*.conf %else ln -sf ../../%{_initrddir}/%{name} "%{buildroot}%{_sbindir}/rc%{name}" %endif -mkdir -p "%{buildroot}%{_localstatedir}/adm/fillup-templates/" -mv "%{buildroot}%{_sysconfdir}/sysconfig/%{name}" "%{buildroot}%{_localstatedir}/adm/fillup-templates/sysconfig.%{name}" +mkdir -p "%{buildroot}%{_fillupdir}/" +mv "%{buildroot}%{_sysconfdir}/sysconfig/%{name}" "%{buildroot}%{_fillupdir}/sysconfig.%{name}" %endif -%if "%{_vendor}" == "redhat" && !(0%{?el5} || 0%{?rhel} == 5 || "%{?dist}" == ".el5" || 0%{?el6} || 0%{?rhel} == 6 || "%{?dist}" == ".el6") +%if 0%{?use_selinux} cd tools/selinux for selinuxvariant in %{selinux_variants} do install -d %{buildroot}%{_datadir}/selinux/${selinuxvariant} - install -p -m 644 %{modulename}.pp.${selinuxvariant} \ - %{buildroot}%{_datadir}/selinux/${selinuxvariant}/%{modulename}.pp + install -p -m 644 %{selinux_modulename}.pp.${selinuxvariant} \ + %{buildroot}%{_datadir}/selinux/${selinuxvariant}/%{selinux_modulename}.pp done cd - -/usr/sbin/hardlink -cv %{buildroot}%{_datadir}/selinux -%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 +# TODO: Fix build problems on Icinga, see https://github.com/Icinga/puppet-icinga_build/issues/11 +#/usr/sbin/hardlink -cv %%{buildroot}%%{_datadir}/selinux %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 @@ -408,39 +514,27 @@ install -D -m 0644 tools/syntax/vim/ftdetect/%{name}.vim %{buildroot}%{_datadir} install -D -m 0644 tools/syntax/nano/%{name}.nanorc %{buildroot}%{_datadir}/nano/%{name}.nanorc -%clean -[ "%{buildroot}" != "/" ] && [ -d "%{buildroot}" ] && rm -rf %{buildroot} - -%pre common -getent group %{icinga_group} >/dev/null || %{_sbindir}/groupadd -r %{icinga_group} -getent group %{icingacmd_group} >/dev/null || %{_sbindir}/groupadd -r %{icingacmd_group} -getent passwd %{icinga_user} >/dev/null || %{_sbindir}/useradd -c "icinga" -s /sbin/nologin -r -d %{_localstatedir}/spool/%{name} -G %{icingacmd_group} -g %{icinga_group} %{icinga_user} +%check +export CTEST_OUTPUT_ON_FAILURE=1 +make test +%pre %if "%{_vendor}" == "suse" %if 0%{?use_systemd} %service_add_pre %{name}.service %endif -%endif -%if "%{_vendor}" == "suse" -%verifyscript bin +%verifyscript %verify_permissions -e %{_rundir}/%{name}/cmd %endif -%post bin - +%post # suse %if "%{_vendor}" == "suse" - %if 0%{?suse_version} >= 1310 %set_permissions %{_rundir}/%{name}/cmd %endif -%endif #suse/rhel - -%post common -# suse -%if "%{_vendor}" == "suse" %if 0%{?use_systemd} %fillup_only %{name} %service_add_post %{name}.service @@ -448,10 +542,13 @@ getent passwd %{icinga_user} >/dev/null || %{_sbindir}/useradd -c "icinga" -s /s %fillup_and_insserv %{name} %endif -# initial installation, enable default features -for feature in checker notification mainlog; do - ln -sf ../features-available/${feature}.conf %{_sysconfdir}/%{name}/features-enabled/${feature}.conf -done +if [ ${1:-0} -eq 1 ] +then + # initial installation, enable default features + for feature in checker notification mainlog; do + ln -sf ../features-available/${feature}.conf %{_sysconfdir}/%{name}/features-enabled/${feature}.conf + done +fi exit 0 @@ -466,10 +563,10 @@ exit 0 if [ ${1:-0} -eq 1 ] then - # initial installation, enable default features - for feature in checker notification mainlog; do - ln -sf ../features-available/${feature}.conf %{_sysconfdir}/%{name}/features-enabled/${feature}.conf - done + # initial installation, enable default features + for feature in checker notification mainlog; do + ln -sf ../features-available/${feature}.conf %{_sysconfdir}/%{name}/features-enabled/${feature}.conf + done fi exit 0 @@ -477,38 +574,7 @@ exit 0 %endif # suse/rhel -%postun common -# suse -%if "%{_vendor}" == "suse" -%if 0%{?using_systemd} - %service_del_postun %{name}.service -%else - %restart_on_update %{name} - %insserv_cleanup -%endif - -%else -# rhel - -%if 0%{?use_systemd} -%systemd_postun_with_restart %{name}.service -%else -if [ "$1" -ge "1" ]; then - /sbin/service %{name} condrestart >/dev/null 2>&1 || : -fi -%endif - -%endif -# suse / rhel - -if [ "$1" = "0" ]; then - # deinstallation of the package - remove enabled features - rm -rf %{_sysconfdir}/%{name}/features-enabled -fi - -exit 0 - -%preun common +%preun # suse %if "%{_vendor}" == "suse" @@ -527,8 +593,8 @@ exit 0 %systemd_preun %{name}.service %else if [ "$1" = "0" ]; then - /sbin/service %{name} stop > /dev/null 2>&1 || : - /sbin/chkconfig --del %{name} || : + /sbin/service %{name} stop > /dev/null 2>&1 || : + /sbin/chkconfig --del %{name} || : fi %endif @@ -537,68 +603,96 @@ exit 0 %endif # suse / rhel +%postun +# suse +%if "%{_vendor}" == "suse" +%if 0%{?use_systemd} + %service_del_postun %{name}.service +%else + %restart_on_update %{name} + %insserv_cleanup +%endif + +%else +# rhel + +%if 0%{?use_systemd} +%systemd_postun_with_restart %{name}.service +%else +if [ "$1" -ge "1" ]; then + /sbin/service %{name} condrestart >/dev/null 2>&1 || : +fi +%endif + +%endif +# suse / rhel + +if [ "$1" = "0" ]; then + # deinstallation of the package - remove enabled features + rm -rf %{_sysconfdir}/%{name}/features-enabled +fi + +exit 0 + +%pre common +getent group %{icinga_group} >/dev/null || %{_sbindir}/groupadd -r %{icinga_group} +getent group %{icingacmd_group} >/dev/null || %{_sbindir}/groupadd -r %{icingacmd_group} +getent passwd %{icinga_user} >/dev/null || %{_sbindir}/useradd -c "icinga" -s /sbin/nologin -r -d %{_localstatedir}/spool/%{name} -G %{icingacmd_group} -g %{icinga_group} %{icinga_user} + +%if "%{_vendor}" == "suse" +%verifyscript common +%verify_permissions -e %{_rundir}/%{name}/cmd +%endif + +%post common +%if "%{_vendor}" == "suse" +%if 0%{?suse_version} >= 1310 +%set_permissions %{_rundir}/%{name}/cmd +%endif +%endif + %post ido-mysql -if [ ${1:-0} -eq 1 ] +if [ ${1:-0} -eq 1 ] && [ -e %{_sysconfdir}/%{name}/features-enabled/ido-mysql.conf ] then - # initial installation, enable ido-mysql feature - ln -sf ../features-available/ido-mysql.conf %{_sysconfdir}/%{name}/features-enabled/ido-mysql.conf + # initial installation, enable ido-mysql feature + ln -sf ../features-available/ido-mysql.conf %{_sysconfdir}/%{name}/features-enabled/ido-mysql.conf fi exit 0 %postun ido-mysql if [ "$1" = "0" ]; then - # deinstallation of the package - remove feature - rm -f %{_sysconfdir}/%{name}/features-enabled/ido-mysql.conf + # deinstallation of the package - remove feature + rm -f %{_sysconfdir}/%{name}/features-enabled/ido-mysql.conf fi exit 0 %post ido-pgsql -if [ ${1:-0} -eq 1 ] +if [ ${1:-0} -eq 1 ] && [ -e %{_sysconfdir}/%{name}/features-enabled/ido-pgsql.conf ] then - # initial installation, enable ido-pgsql feature - ln -sf ../features-available/ido-pgsql.conf %{_sysconfdir}/%{name}/features-enabled/ido-pgsql.conf + # initial installation, enable ido-pgsql feature + ln -sf ../features-available/ido-pgsql.conf %{_sysconfdir}/%{name}/features-enabled/ido-pgsql.conf fi exit 0 %postun ido-pgsql if [ "$1" = "0" ]; then - # deinstallation of the package - remove feature - rm -f %{_sysconfdir}/%{name}/features-enabled/ido-pgsql.conf + # deinstallation of the package - remove feature + rm -f %{_sysconfdir}/%{name}/features-enabled/ido-pgsql.conf fi exit 0 -%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 - -exit 0 - -%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 - -%if "%{_vendor}" == "redhat" && !(0%{?el5} || 0%{?rhel} == 5 || "%{?dist}" == ".el5" || 0%{?el6} || 0%{?rhel} == 6 || "%{?dist}" == ".el6") +%if 0%{?use_selinux} %post selinux for selinuxvariant in %{selinux_variants} do /usr/sbin/semodule -s ${selinuxvariant} -i \ - %{_datadir}/selinux/${selinuxvariant}/%{modulename}.pp &> /dev/null || : + %{_datadir}/selinux/${selinuxvariant}/%{selinux_modulename}.pp &> /dev/null || : done +/sbin/fixfiles -R icinga2 restore &> /dev/null || : /sbin/fixfiles -R icinga2-bin restore &> /dev/null || : /sbin/fixfiles -R icinga2-common restore &> /dev/null || : /sbin/semanage port -a -t icinga2_port_t -p tcp 5665 &> /dev/null || : @@ -608,8 +702,9 @@ if [ $1 -eq 0 ] ; then /sbin/semanage port -d -t icinga2_port_t -p tcp 5665 &> /dev/null || : for selinuxvariant in %{selinux_variants} do - /usr/sbin/semodule -s ${selinuxvariant} -r %{modulename} &> /dev/null || : + /usr/sbin/semodule -s ${selinuxvariant} -r %{selinux_modulename} &> /dev/null || : done + /sbin/fixfiles -R icinga2 restore &> /dev/null || : /sbin/fixfiles -R icinga2-bin restore &> /dev/null || : /sbin/fixfiles -R icinga2-common restore &> /dev/null || : fi @@ -620,15 +715,44 @@ fi %defattr(-,root,root,-) %doc COPYING -%files bin -%defattr(-,root,root,-) -%doc COPYING COPYING.Exceptions README.md NEWS AUTHORS ChangeLog +%config(noreplace) %{_sysconfdir}/logrotate.d/%{name} + +%if 0%{?use_systemd} +%attr(644,root,root) %{_unitdir}/%{name}.service +%if 0%{?configure_systemd_limits} +%dir /etc/systemd/system/%{name}.service.d +%attr(644,root,root) %config(noreplace) /etc/systemd/system/%{name}.service.d/limits.conf +%endif +%else +%attr(755,root,root) %config(noreplace) %{_sysconfdir}/init.d/%{name} +%endif +%if "%{_vendor}" == "suse" +%{_sbindir}/rc%{name} +%{_fillupdir}/sysconfig.%{name} +%else +%config(noreplace) %{_sysconfdir}/sysconfig/%{name} +%endif + %{_sbindir}/%{name} -%dir %{_libdir}/%{name}/sbin -%{_libdir}/%{name}/sbin/%{name} -%{_datadir}/%{name} -%exclude %{_datadir}/%{name}/include -%{_mandir}/man8/%{name}.8.gz + +%dir %{_libexecdir}/%{name} +%{_libexecdir}/%{name}/prepare-dirs +%{_libexecdir}/%{name}/safe-reload + +%attr(0750,%{icinga_user},%{icinga_group}) %dir %{_sysconfdir}/%{name} +%attr(0750,%{icinga_user},%{icinga_group}) %dir %{_sysconfdir}/%{name}/conf.d +%attr(0750,%{icinga_user},%{icinga_group}) %dir %{_sysconfdir}/%{name}/features-available +%exclude %{_sysconfdir}/%{name}/features-available/ido-*.conf +%attr(0750,%{icinga_user},%{icinga_group}) %dir %{_sysconfdir}/%{name}/features-enabled +%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,%{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 +%config(noreplace) %attr(0640,%{icinga_user},%{icinga_group}) %{_sysconfdir}/%{name}/features-available/*.conf +%config(noreplace) %attr(0640,%{icinga_user},%{icinga_group}) %{_sysconfdir}/%{name}/zones.d/* +%config(noreplace) %{_sysconfdir}/%{name}/scripts/* %attr(0750,%{icinga_user},%{icingacmd_group}) %{_localstatedir}/cache/%{name} %attr(0750,%{icinga_user},%{icingacmd_group}) %dir %{_localstatedir}/log/%{name} @@ -636,113 +760,65 @@ fi %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},%{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 - -%files libs -%defattr(-,root,root,-) -%doc COPYING COPYING.Exceptions README.md NEWS AUTHORS ChangeLog -%exclude %{_libdir}/%{name}/libdb_ido_mysql* -%exclude %{_libdir}/%{name}/libdb_ido_pgsql* -%dir %{_libdir}/%{name} -%{_libdir}/%{name}/*.so* - -%files common -%defattr(-,root,root,-) -%doc COPYING COPYING.Exceptions README.md NEWS AUTHORS ChangeLog tools/syntax -%attr(0750,%{icinga_user},%{icingacmd_group}) %dir %{_localstatedir}/log/%{name} -%config(noreplace) %{_sysconfdir}/logrotate.d/%{name} -%{_sysconfdir}/bash_completion.d/%{name} -%if 0%{?use_systemd} -%attr(644,root,root) %{_unitdir}/%{name}.service -%else -%attr(755,root,root) %{_sysconfdir}/init.d/%{name} -%endif -%if "%{_vendor}" == "suse" -%{_sbindir}/rc%{name} -%{_localstatedir}/adm/fillup-templates/sysconfig.%{name} -%else -%config(noreplace) %{_sysconfdir}/sysconfig/%{name} -%endif -%attr(0750,root,%{icinga_group}) %dir %{_sysconfdir}/%{name} -%attr(0750,%{icinga_user},%{icinga_group}) %dir %{_sysconfdir}/%{name}/conf.d -%attr(0750,%{icinga_user},%{icinga_group}) %dir %{_sysconfdir}/%{name}/features-available -%exclude %{_sysconfdir}/%{name}/features-available/ido-*.conf -%attr(0750,%{icinga_user},%{icinga_group}) %dir %{_sysconfdir}/%{name}/features-enabled -%attr(0750,%{icinga_user},%{icinga_group}) %dir %{_sysconfdir}/%{name}/repository.d -%attr(0750,%{icinga_user},%{icinga_group}) %dir %{_sysconfdir}/%{name}/scripts -%attr(0750,%{icinga_user},%{icinga_group}) %dir %{_sysconfdir}/%{name}/repository.d -%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,%{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 -%config(noreplace) %attr(0640,%{icinga_user},%{icinga_group}) %{_sysconfdir}/%{name}/features-available/*.conf -%config(noreplace) %attr(0640,%{icinga_user},%{icinga_group}) %{_sysconfdir}/%{name}/repository.d/* -%config(noreplace) %attr(0640,%{icinga_user},%{icinga_group}) %{_sysconfdir}/%{name}/zones.d/* -%config(noreplace) %{_sysconfdir}/%{name}/scripts/* -%dir %{_libexecdir}/%{name} -%{_libexecdir}/%{name}/prepare-dirs -%{_libexecdir}/%{name}/safe-reload %attr(0750,%{icinga_user},%{icinga_group}) %dir %{_localstatedir}/spool/%{name} %attr(0770,%{icinga_user},%{icinga_group}) %dir %{_localstatedir}/spool/%{name}/perfdata %attr(0750,%{icinga_user},%{icinga_group}) %dir %{_localstatedir}/spool/%{name}/tmp + +%files bin +%defattr(-,root,root,-) +%doc COPYING README.md NEWS AUTHORS CHANGELOG.md +%dir %{_libdir}/%{name} +%dir %{_libdir}/%{name}/sbin +%{_libdir}/%{name}/sbin/%{name} +%{plugindir}/check_nscp_api +%{_datadir}/%{name} +%exclude %{_datadir}/%{name}/include +%{_mandir}/man8/%{name}.8.gz + +%files common +%defattr(-,root,root,-) +%doc COPYING README.md NEWS AUTHORS CHANGELOG.md tools/syntax +%{_sysconfdir}/bash_completion.d/%{name} %attr(0750,%{icinga_user},%{icinga_group}) %dir %{_datadir}/%{name}/include -%{_datadir}/%{name}/include +%{_datadir}/%{name}/include/* %files doc %defattr(-,root,root,-) %{_datadir}/doc/%{name} %docdir %{_datadir}/doc/%{name} +%if %{with mysql} %files ido-mysql %defattr(-,root,root,-) -%doc COPYING COPYING.Exceptions README.md NEWS AUTHORS ChangeLog +%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* +%{_libdir}/%{name}/libmysql_shim* %{_datadir}/icinga2-ido-mysql +%endif +%if %{with pgsql} %files ido-pgsql %defattr(-,root,root,-) -%doc COPYING COPYING.Exceptions README.md NEWS AUTHORS ChangeLog +%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* +%{_libdir}/%{name}/libpgsql_shim* %{_datadir}/icinga2-ido-pgsql +%endif -%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 - -%if "%{_vendor}" == "redhat" && !(0%{?el5} || 0%{?rhel} == 5 || "%{?dist}" == ".el5" || 0%{?el6} || 0%{?rhel} == 6 || "%{?dist}" == ".el6") +%if 0%{?use_selinux} %files selinux %defattr(-,root,root,0755) %doc tools/selinux/* -%{_datadir}/selinux/*/%{modulename}.pp -%endif - -%if 0%{?fedora} -%files studio -%defattr(-,root,root,-) -%{_bindir}/icinga-studio -%{_datadir}/icinga2-studio -%{_datadir}/applications/icinga2-studio.desktop +%{_datadir}/selinux/*/%{selinux_modulename}.pp %endif %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 @@ -750,6 +826,93 @@ fi %files -n nano-icinga2 %defattr(-,root,root,-) +%if "%{_vendor}" == "suse" +%dir %{_datadir}/nano +%endif %{_datadir}/nano/%{name}.nanorc %changelog +* Tue Oct 13 2020 Alexander A. Klimov 2.12.1-1 +- Update to 2.12.1 + +* Wed Aug 05 2020 Henrik Triem 2.12.0-1 +- Update to 2.12.0 + +* Fri Mar 13 2020 Noah Hilverling 2.12.0-0.rc1.1 +- Update to 2.12.0-rc1 + +* Thu Oct 24 2019 Michael Friedrich 2.11.2-1 +- Update to 2.11.2 + +* Thu Oct 17 2019 Michael Friedrich 2.11.1-1 +- Update to 2.11.1 + +* Thu Sep 19 2019 Michael Friedrich 2.11.0-1 +- Update to 2.11.0 + +* Thu Jul 25 2019 Markus Frosch 2.11.0-0.rc1.1 +- Prepare pre-release 2.11.0-rc1 + +* Tue Mar 19 2019 Michael Friedrich 2.10.4-1 +- Update to 2.10.4 + +* Tue Feb 26 2019 Michael Friedrich 2.10.3-2 +- Apply quickfix for SLES11 + +* Tue Feb 26 2019 Michael Friedrich 2.10.3-1 +- Update to 2.10.3 + +* Wed Nov 14 2018 Michael Friedrich 2.10.2-1 +- Update to 2.10.2 + +* Thu Oct 18 2018 Michael Friedrich 2.10.1-1 +- Update to 2.10.1 + +* Thu Oct 11 2018 Michael Friedrich 2.10.0-1 +- Update to 2.10.0 + +* Wed Sep 26 2018 Michael Friedrich 2.9.2-1 +- Update to 2.9.2 + +* Wed Jul 25 2018 Markus Frosch 2.10.0-0 +- Remove obsoleted icinga2-libs package + +* Tue Jul 24 2018 Michael Friedrich 2.9.1-1 +- Update to 2.9.1 + +* Tue Jul 17 2018 Michael Friedrich 2.9.0-1 +- Update to 2.9.0 + +* Wed Apr 25 2018 Jean Flach 2.8.4-1 +- Update to 2.8.4 + +* Tue Apr 24 2018 Jean Flach 2.8.3-1 +- Update to 2.8.3 + +* Thu Mar 22 2018 Jean Flach 2.8.2-1 +- Update to 2.8.2 + +* Wed Jan 17 2018 Gunnar Beutner 2.8.1-1 +- Update to 2.8.1 + +* Fri Nov 24 2017 Markus Frosch 2.8.0-2 +- [SLES] Add systemd limits file +- Add config(noreplace) for the systemd limits file + (no need to release every OS immediately) +- Update SELinux handling to be compatible to Fedora 27 + (only affecting f27 builds) + +* Thu Nov 16 2017 Jean Flach 2.8.0-1 +- Update to 2.8.0 + +* Thu Nov 09 2017 Gunnar Beutner 2.7.2-1 +- Update to 2.7.2 + +* Mon Oct 02 2017 Markus Frosch 2.7.1-2 +- Fixing systemd limit issues on openSUSE > 42.1 + +* Thu Sep 21 2017 Michael Friedrich 2.7.1-1 +- Update to 2.7.1 + +* Tue Jun 20 2017 Markus Frosch 2.7.0-1 +- Update to 2.7.0 diff --git a/fedora/SPECS/archive/icingaweb2.spec b/fedora/SPECS/archive/icingaweb2.spec index fb3172e..35e7fb7 100644 --- a/fedora/SPECS/archive/icingaweb2.spec +++ b/fedora/SPECS/archive/icingaweb2.spec @@ -1,55 +1,90 @@ -# Icinga Web 2 | (c) 2013-2016 Icinga Development Team | GPLv2+ +# Icinga Web 2 | (c) 2013-2017 Icinga Development Team | GPLv2+ %define revision 1 Name: icingaweb2 -Version: 2.4.1 +Version: 2.8.2 Release: %{revision}%{?dist} Summary: Icinga Web 2 Group: Applications/System License: GPLv2+ and MIT and BSD URL: https://icinga.com -Source: icingaweb2.tar.gz +Source0: icingaweb2-2.8.2.orig.tar.gz BuildArch: noarch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release} Packager: Icinga Team %if 0%{?fedora} || 0%{?rhel} || 0%{?amzn} -%define php php -%define php_cli php-cli +%if 0%{?rhel} == 7 +%define php_scl rh-php73 +%endif +%if 0%{?rhel} == 6 +%define php_scl rh-php70 +%endif + +%if 0%{?el5}%{?el6}%{?amzn} +%define use_selinux 0 +%else +%define use_selinux 1 +%endif + +%if 0%{?php_scl:1} +%define php_scl_prefix %{php_scl}- +%define php_runtime %{php_scl_prefix}php-fpm +%define php_bin /opt/rh/%{php_scl}/root/usr/bin/php +%define php_fpm 1 +%else +%define php_runtime %{php} +%endif + +%define php %{?php_scl_prefix}php +%define php_cli %{php}-cli +%define php_common %{php}-common %define wwwconfigdir %{_sysconfdir}/httpd/conf.d %define wwwuser apache + +# extra requirements on RHEL +Requires: %{php}-mysqlnd +Requires: %{php}-pgsql +Requires: %{php}-ldap %endif +# minimum required PHP version +%define php_version 5.6.0 + %if 0%{?suse_version} %define wwwconfigdir %{_sysconfdir}/apache2/conf.d %define wwwuser wwwrun -%if 0%{?suse_version} == 1110 -%define php php53 -Requires: apache2-mod_php53 -%else -%define php php5 -Requires: apache2-mod_php5 -%endif +%define php php +%define php_runtime mod_php_any +%define php_common %{php} +%define php_cli %{php} +# conflict with older PHP on SLES and openSUSE +Conflicts: php < %{php_version} +Conflicts: php5 < %{php_version} +Conflicts: php53 %endif %{?amzn:Requires(pre): shadow-utils} %{?fedora:Requires(pre): shadow-utils} %{?rhel:Requires(pre): shadow-utils} %{?suse_version:Requires(pre): pwdutils} + +Requires: %{php_runtime} >= %{php_version} +Requires: %{php_common} >= %{php_version} +%if 0%{?suse_version} +Requires: apache2 +%endif + +Requires: icinga-l10n +Requires: icingacli = %{version}-%{release} Requires: %{name}-common = %{version}-%{release} Requires: php-Icinga = %{version}-%{release} -Requires: %{name}-vendor-dompdf = 0.7.0-1%{?dist} -Requires: %{name}-vendor-HTMLPurifier = 4.8.0-1%{?dist} -Requires: %{name}-vendor-JShrink = 1.1.0-1%{?dist} -Requires: %{name}-vendor-lessphp = 0.4.0-1%{?dist} -Requires: %{name}-vendor-Parsedown = 1.6.0-1%{?dist} - -%if "%{_vendor}" == "redhat" && !(0%{?el5} || 0%{?rhel} == 5 || "%{?dist}" == ".el5" || 0%{?el6} || 0%{?rhel} == 6 || "%{?dist}" == ".el6") -%define selinux 1 -%define selinux_variants mls targeted -#%{!?_selinux_policy_version: %define _selinux_policy_version %(sed -e 's,.*selinux-policy-\\([^/]*\\)/.*,\\1,' /usr/share/selinux/devel/policyhelp 2>/dev/null)} -%endif +Requires: %{name}-vendor-dompdf = %{version}-%{release} +Requires: %{name}-vendor-HTMLPurifier = 1:%{version}-%{release} +Requires: %{name}-vendor-JShrink = %{version}-%{release} +Requires: %{name}-vendor-lessphp = %{version}-%{release} +Requires: %{name}-vendor-Parsedown = %{version}-%{release} %define basedir %{_datadir}/%{name} %define bindir %{_bindir} @@ -71,6 +106,9 @@ Group: Applications/System %{?fedora:Requires(pre): shadow-utils} %{?rhel:Requires(pre): shadow-utils} %{?suse_version:Requires(pre): pwdutils} +%if 0%{?suse_version} > 1320 +Requires(pre): system-user-wwwrun +%endif %description common Common files for Icinga Web 2 and the Icinga CLI @@ -79,12 +117,15 @@ Common files for Icinga Web 2 and the Icinga CLI %package -n php-Icinga Summary: Icinga Web 2 PHP library Group: Development/Libraries -Requires: %{php} >= 5.3.0 -Requires: %{php}-gd %{php}-intl -Requires: %{name}-vendor-zf1 = 1.12.20-1%{?dist} +Requires: %{php_common} >= %{php_version} +Requires: %{php}-gd %{php}-intl %{php}-mbstring +%{?rhel:Requires: %{php}-pdo %{php}-xml} +%if 0%{?rhel} >= 8 || 0%{?fedora} >= 30 +Requires: %{php}-json +%endif rhel >= 8 || fedora >= 30 +Requires: %{name}-vendor-zf1 = %{version}-%{release} %{?amzn:Requires: %{php}-pecl-imagick} %{?fedora:Requires: php-pecl-imagick} -%{?rhel:Requires: php-pecl-imagick} %{?suse_version:Requires: %{php}-gettext %{php}-json %{php}-openssl %{php}-posix} %description -n php-Icinga @@ -94,25 +135,29 @@ Icinga Web 2 PHP library %package -n icingacli Summary: Icinga CLI Group: Applications/System +Requires: icinga-l10n Requires: %{name}-common = %{version}-%{release} Requires: php-Icinga = %{version}-%{release} -%{?amzn:Requires: %{php_cli} >= 5.3.0 bash-completion} -%{?fedora:Requires: %{php_cli} >= 5.3.0 bash-completion} -%{?rhel:Requires: %{php_cli} >= 5.3.0 bash-completion} -%{?suse_version:Requires: %{php} >= 5.3.0} +Requires: bash-completion +Requires: %{php_cli} >= %{php_version} +%if 0%{?suse_version} +# conflict with older PHP on SLES and openSUSE +Conflicts: php < %{php_version} +Conflicts: php5 < %{php_version} +Conflicts: php53 +%endif + %description -n icingacli Icinga CLI -%if 0%{?selinux} +%if 0%{?use_selinux} +%define selinux_variants mls targeted + %package selinux Summary: SELinux policy for Icinga Web 2 -#BuildRequires: checkpolicy, selinux-policy-devel, /usr/share/selinux/devel/policyhelp, hardlink BuildRequires: checkpolicy, selinux-policy-devel, hardlink -%if "%{_selinux_policy_version}" != "" -Requires: selinux-policy >= %{_selinux_policy_version} -%endif Requires: %{name} = %{version}-%{release} Requires(post): policycoreutils Requires(postun): policycoreutils @@ -123,87 +168,82 @@ SELinux policy for Icinga Web 2 %package vendor-dompdf -Version: 0.7.0 -Release: 1%{?dist} Summary: Icinga Web 2 vendor library dompdf Group: Development/Libraries License: LGPLv2.1 -Requires: %{php} >= 5.3.0 +Requires: %{php_common} >= %{php_version} +Requires: %{name}-common = %{version}-%{release} %description vendor-dompdf Icinga Web 2 vendor library dompdf %package vendor-HTMLPurifier -Version: 4.8.0 -Release: 1%{?dist} +Epoch: 1 Summary: Icinga Web 2 vendor library HTMLPurifier Group: Development/Libraries License: LGPLv2.1 -Requires: %{php} >= 5.3.0 +Requires: %{php_common} >= %{php_version} +Requires: %{name}-common = %{version}-%{release} %description vendor-HTMLPurifier Icinga Web 2 vendor library HTMLPurifier %package vendor-JShrink -Version: 1.1.0 -Release: 1%{?dist} Summary: Icinga Web 2 vendor library JShrink Group: Development/Libraries License: BSD -Requires: %{php} >= 5.3.0 +Requires: %{php_common} >= %{php_version} +Requires: %{name}-common = %{version}-%{release} %description vendor-JShrink Icinga Web 2 vendor library JShrink %package vendor-lessphp -Version: 0.4.0 -Release: 1%{?dist} Summary: Icinga Web 2 vendor library lessphp Group: Development/Libraries License: MIT -Requires: %{php} >= 5.3.0 +Requires: %{php_common} >= %{php_version} +Requires: %{name}-common = %{version}-%{release} %description vendor-lessphp Icinga Web 2 vendor library lessphp %package vendor-Parsedown -Version: 1.6.0 -Release: 1%{?dist} Summary: Icinga Web 2 vendor library Parsedown Group: Development/Libraries License: MIT -Requires: %{php} >= 5.3.0 +Requires: %{php_common} >= %{php_version} +Requires: %{name}-common = %{version}-%{release} %description vendor-Parsedown Icinga Web 2 vendor library Parsedown %package vendor-zf1 -Version: 1.12.20 -Release: 1%{?dist} Summary: Icinga Web 2's fork of Zend Framework 1 Group: Development/Libraries License: BSD -Requires: %{php} >= 5.3.0 -Obsoletes: %{name}-vendor-Zend +Requires: %{php_common} >= %{php_version} +Obsoletes: %{name}-vendor-Zend < 1.12.20 +Requires: %{name}-common = %{version}-%{release} %description vendor-zf1 Icinga Web 2's fork of Zend Framework 1 %prep -%setup -q -n icingaweb2 -%if 0%{?selinux} +%setup -q +%if 0%{?use_selinux} mkdir selinux cp -p packages/selinux/icingaweb2.{fc,if,te} selinux %endif %build -%if 0%{?selinux} +%if 0%{?use_selinux} cd selinux for selinuxvariant in %{selinux_variants} do @@ -222,13 +262,20 @@ cp -pv etc/bash_completion.d/icingacli %{buildroot}/%{_sysconfdir}/bash_completi cp -prv modules/{monitoring,setup,doc,translation} %{buildroot}/%{basedir}/modules cp -prv library/Icinga %{buildroot}/%{phpdir} cp -prv library/vendor/{dompdf,HTMLPurifier*,JShrink,lessphp,Parsedown,Zend} %{buildroot}/%{basedir}/library/vendor -cp -prv public/{css,font,img,js,error_norewrite.html} %{buildroot}/%{basedir}/public +cp -prv public/{css,font,img,js,error_norewrite.html,error_unavailable.html} %{buildroot}/%{basedir}/public +%if 0%{?php_fpm:1} +cp -pv packages/files/apache/icingaweb2.fpm.conf %{buildroot}/%{wwwconfigdir}/icingaweb2.conf +%else cp -pv packages/files/apache/icingaweb2.conf %{buildroot}/%{wwwconfigdir}/icingaweb2.conf +%endif cp -pv packages/files/bin/icingacli %{buildroot}/%{bindir} +%if 0%{?php_bin:1} +sed -i '1 s~#!.*~#!%{php_bin}~' %{buildroot}/%{bindir}/icingacli +%endif cp -pv packages/files/public/index.php %{buildroot}/%{basedir}/public cp -prv etc/schema %{buildroot}/%{docsdir} cp -prv packages/files/config/modules/{setup,translation} %{buildroot}/%{configdir}/modules -%if 0%{?selinux} +%if 0%{?use_selinux} cd selinux for selinuxvariant in %{selinux_variants} do @@ -236,7 +283,8 @@ do install -p -m 644 icingaweb2.pp.${selinuxvariant} %{buildroot}%{_datadir}/selinux/${selinuxvariant}/icingaweb2.pp done cd - -/usr/sbin/hardlink -cv %{buildroot}%{_datadir}/selinux +# TODO: Fix build problems on Icinga, see https://github.com/Icinga/puppet-icinga_build/issues/11 +#/usr/sbin/hardlink -cv %{buildroot}%{_datadir}/selinux %endif %pre @@ -262,6 +310,11 @@ rm -rf %{buildroot} %{basedir}/doc %{basedir}/modules %{basedir}/public +%if 0%{?suse_version} +# for lint on OBS +%dir %{dirname:%{wwwconfigdir}} +%dir %{wwwconfigdir} +%endif %config(noreplace) %{wwwconfigdir}/icingaweb2.conf %attr(2775,root,%{icingawebgroup}) %dir %{logdir} %attr(2770,root,%{icingawebgroup}) %config(noreplace) %dir %{configdir}/modules/setup @@ -278,14 +331,22 @@ exit 0 %files common %defattr(-,root,root) -%{basedir}/application/locale +%dir %{basedir} +%dir %{basedir}/application +%dir %{basedir}/library +%dir %{basedir}/library/vendor %dir %{basedir}/modules +%{basedir}/application/locale %attr(2770,root,%{icingawebgroup}) %config(noreplace) %dir %{configdir} %attr(2770,root,%{icingawebgroup}) %config(noreplace) %dir %{configdir}/modules %files -n php-Icinga %defattr(-,root,root) +%if 0%{?suse_version} +# for lint on OBS +%dir %{phpdir} +%endif %{phpdir}/Icinga @@ -296,7 +357,7 @@ exit 0 %attr(0755,root,root) %{bindir}/icingacli -%if 0%{?selinux} +%if 0%{?use_selinux} %post selinux for selinuxvariant in %{selinux_variants} do @@ -354,3 +415,67 @@ fi %files vendor-zf1 %defattr(-,root,root) %{basedir}/library/vendor/Zend + +%changelog +* Tue Aug 18 2020 Johannes Meyer 2.8.2-1 +- Update to 2.8.2 + +* Mon Jun 29 2020 Johannes Meyer 2.8.1-1 +- Update to 2.8.1 + +* Mon Jun 8 2020 Johannes Meyer 2.8.0-1 +- Update to 2.8.0 +- Add new requirement for package icinga-l10n +- [EPEL 7] We now require PHP 7.3 instead of PHP 7.1 +- Please check uprading docs at /usr/share/icingaweb2/doc/80-Upgrading.md + +* Fri Oct 18 2019 Johannes Meyer 2.7.3-1 +- Update to 2.7.3 + +* Wed Oct 16 2019 Johannes Meyer 2.7.2-1 +- Update to 2.7.2 + +* Wed Aug 14 2019 Johannes Meyer 2.7.1-1 +- Update to 2.7.1 + +* Tue Jul 30 2019 Johannes Meyer 2.7.0-1 +- Update to 2.7.0 + +* Wed Apr 24 2019 Johannes Meyer 2.6.3-1 +- Update to 2.6.3 + +* Wed Nov 21 2018 Eric Lippmann 2.6.2-1 +- Update to 2.6.2 + +* Thu Aug 02 2018 Eric Lippmann 2.6.1-1 +- Update to 2.6.1 + +* Thu Jul 19 2018 Blerim Sheqa 2.6.0-1 +- Update to 2.6.0 + +* Fri Apr 27 2018 Eric Lippmann 2.5.3-1 +- Update to 2.5.3 + +* Thu Apr 26 2018 Eric Lippmann 2.5.2-1 +- Update to 2.5.2 + +* Mon Jan 22 2018 Markus Frosch 2.5.1-1 +- Update to 2.5.1 +- Remove FPM patches + +* Wed Nov 29 2017 Eric Lippmann 2.5.0-2 +- FPM: Add patch to support both Apache >= 2.4 and Apache < 2.4 + +* Tue Nov 28 2017 Eric Lippmann 2.5.0-1 +- Install error_unavailable.html +- Add patch to fix Apache FPM config + +* Mon Nov 27 2017 Markus Frosch 2.5.0-1 +- Update to 2.5.0 +- All packages now require PHP >= 5.6 +- [EPEL 6 + 7] We now require PHP 7 from SCL packages, php-fpm as runtime engine +- [SUSE / openSUSE] Requirements will force the installation of php7 +- Please check upgrading docs at /usr/share/icingaweb2/doc/80-Upgrading.md + +* Thu Sep 28 2017 Markus Frosch 2.4.2-1 +- Update to 2.4.2 diff --git a/fedora/SPECS/icli.spec b/fedora/SPECS/archive/icli.spec similarity index 100% rename from fedora/SPECS/icli.spec rename to fedora/SPECS/archive/icli.spec diff --git a/fedora/SPECS/kodi.spec b/fedora/SPECS/archive/kodi.spec similarity index 100% rename from fedora/SPECS/kodi.spec rename to fedora/SPECS/archive/kodi.spec diff --git a/fedora/SPECS/l10n.spec b/fedora/SPECS/archive/l10n.spec similarity index 100% rename from fedora/SPECS/l10n.spec rename to fedora/SPECS/archive/l10n.spec diff --git a/fedora/SPECS/libva.spec b/fedora/SPECS/archive/libva.spec similarity index 100% rename from fedora/SPECS/libva.spec rename to fedora/SPECS/archive/libva.spec diff --git a/fedora/SPECS/makemkv.spec b/fedora/SPECS/archive/makemkv.spec similarity index 100% rename from fedora/SPECS/makemkv.spec rename to fedora/SPECS/archive/makemkv.spec diff --git a/fedora/SPECS/mediaelch.spec b/fedora/SPECS/archive/mediaelch.spec similarity index 100% rename from fedora/SPECS/mediaelch.spec rename to fedora/SPECS/archive/mediaelch.spec diff --git a/fedora/SPECS/nagios-plugins-own.spec b/fedora/SPECS/archive/nagios-plugins-own.spec similarity index 100% rename from fedora/SPECS/nagios-plugins-own.spec rename to fedora/SPECS/archive/nagios-plugins-own.spec diff --git a/fedora/SPECS/nagios-plugins.spec b/fedora/SPECS/archive/nagios-plugins.spec similarity index 100% rename from fedora/SPECS/nagios-plugins.spec rename to fedora/SPECS/archive/nagios-plugins.spec diff --git a/fedora/SPECS/ngxtop.spec b/fedora/SPECS/archive/ngxtop.spec similarity index 100% rename from fedora/SPECS/ngxtop.spec rename to fedora/SPECS/archive/ngxtop.spec diff --git a/fedora/SPECS/archive/noson-app.spec b/fedora/SPECS/archive/noson-app.spec new file mode 100644 index 0000000..45384bc --- /dev/null +++ b/fedora/SPECS/archive/noson-app.spec @@ -0,0 +1,71 @@ +# +# spec file for package noson-app +# +# Copyright (c) 2020 SUSE LLC +# +# 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 https://bugs.opensuse.org/ +# + + +Name: noson-app +Version: 4.4.3 +Release: 1%{?dist} +Summary: SONOS device controller +License: GPL-3.0-or-later +Group: Productivity/Multimedia/Sound/Players +URL: https://janbar.github.io/noson-app/index.html +Source0: https://github.com/janbar/noson-app/archive/%{name}-%{version}.tar.gz +BuildRequires: cmake +BuildRequires: extra-cmake-modules +BuildRequires: flac-devel +BuildRequires: gcc-c++ +BuildRequires: openssl-devel +BuildRequires: pulseaudio-libs-devel +BuildRequires: pkgconfig +#BuildRequires: update-desktop-files +BuildRequires: zlib-devel +BuildRequires: pkgconfig(Qt5Core) +BuildRequires: pkgconfig(Qt5Gui) +BuildRequires: pkgconfig(Qt5Qml) +BuildRequires: pkgconfig(Qt5QuickControls2) +BuildRequires: pkgconfig(Qt5Svg) +BuildRequires: pkgconfig(Qt5Xml) +BuildRequires: pkgconfig(noson) = 2.3.1 + +%description +A controller for SONOS devices. It allows for browsing the music +library, and playing tracks or radio on any zones. Zone groups, +queues and playlists can be managed, and playback be controlled. + +%prep +%setup -q + +%build +%cmake \ + -DCMAKE_BUILD_TYPE=Release \ + -DBUILD_DEPENDENCIES=OFF \ + -DBUILD_LIBNOSON=OFF +%cmake_build + +%install +%cmake_install + +%files +%doc README.md +%license LICENSE +%{_bindir}/noson-app +%{_datadir}/applications/io.github.janbar.noson.desktop +%{_datadir}/icons/hicolor/*/*/*.png +%{_datadir}/metainfo/io.github.janbar.noson.appdata.xml +%{_libdir}/noson/ + +%changelog diff --git a/fedora/SPECS/archive/noson.spec b/fedora/SPECS/archive/noson.spec new file mode 100644 index 0000000..bb6137c --- /dev/null +++ b/fedora/SPECS/archive/noson.spec @@ -0,0 +1,84 @@ +# +# spec file for package noson +# +# Copyright (c) 2020 SUSE LLC +# +# 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 https://bugs.opensuse.org/ +# + + +Name: noson +Version: 2.3.1 +Release: 1%{?dist} +Summary: C++ library for accessing sonos devices +License: GPL-3.0-or-later +Group: Development/Libraries/C and C++ +URL: https://github.com/janbar/noson/ +Source0: https://github.com/janbar/noson/archive/%{version}.tar.gz +BuildRequires: cmake +BuildRequires: extra-cmake-modules +BuildRequires: flac-devel +BuildRequires: gcc-c++ +BuildRequires: openssl-devel +BuildRequires: pulseaudio-libs-devel +BuildRequires: zlib-devel + +%description +C++ library for accessing sonos devices +The API supports basic features to browse music index and control playback +in any zones. + +%package -n libnoson2 +Summary: C++ library for accessing sonos devices +Group: System/Libraries + +%description -n libnoson2 +C++ library for accessing sonos devices +The API supports basic features to browse music index and control playback +in any zones. + +%package devel +Summary: Development files for noson library +Group: Development/Libraries/C and C++ +Requires: libnoson2 = %{version} + +%description devel +Development files for noson library. The noson library supports basic features +to browse music index and control playback in any zones. + +%prep +%setup -q + +%build + %cmake \ + -DCMAKE_INSTALL_FULL_LIBDIR=%{_libdir} + %cmake_build + +%install + %cmake_install + +%post -n libnoson2 -p /sbin/ldconfig +%postun -n libnoson2 -p /sbin/ldconfig + +%files -n libnoson2 +%license LICENSE +%doc README.md +%{_libdir}/libnoson.so.%{version} +%{_libdir}/libnoson.so.2 + +%files devel +%{_includedir}/noson +%{_libdir}/pkgconfig/noson.pc +%{_libdir}/cmake/noson/ +%{_libdir}/libnoson.so + +%changelog diff --git a/fedora/SPECS/percona-monitoring-plugins.spec b/fedora/SPECS/archive/percona-monitoring-plugins.spec similarity index 100% rename from fedora/SPECS/percona-monitoring-plugins.spec rename to fedora/SPECS/archive/percona-monitoring-plugins.spec diff --git a/fedora/SPECS/phabricator.spec b/fedora/SPECS/archive/phabricator.spec similarity index 100% rename from fedora/SPECS/phabricator.spec rename to fedora/SPECS/archive/phabricator.spec diff --git a/fedora/SPECS/pnp4nagios.spec b/fedora/SPECS/archive/pnp4nagios.spec similarity index 100% rename from fedora/SPECS/pnp4nagios.spec rename to fedora/SPECS/archive/pnp4nagios.spec diff --git a/fedora/SPECS/polemarch.spec b/fedora/SPECS/archive/polemarch.spec similarity index 100% rename from fedora/SPECS/polemarch.spec rename to fedora/SPECS/archive/polemarch.spec diff --git a/fedora/SPECS/powerline-go.spec b/fedora/SPECS/archive/powerline-go.spec similarity index 100% rename from fedora/SPECS/powerline-go.spec rename to fedora/SPECS/archive/powerline-go.spec diff --git a/fedora/SPECS/powerline_shell.spec b/fedora/SPECS/archive/powerline_shell.spec similarity index 100% rename from fedora/SPECS/powerline_shell.spec rename to fedora/SPECS/archive/powerline_shell.spec diff --git a/fedora/SPECS/proj6.spec b/fedora/SPECS/archive/proj6.spec similarity index 100% rename from fedora/SPECS/proj6.spec rename to fedora/SPECS/archive/proj6.spec diff --git a/fedora/SPECS/python-PyMySQL.spec b/fedora/SPECS/archive/python-PyMySQL.spec similarity index 100% rename from fedora/SPECS/python-PyMySQL.spec rename to fedora/SPECS/archive/python-PyMySQL.spec diff --git a/fedora/SPECS/python-acme.spec b/fedora/SPECS/archive/python-acme.spec similarity index 100% rename from fedora/SPECS/python-acme.spec rename to fedora/SPECS/archive/python-acme.spec diff --git a/fedora/SPECS/python-django.spec b/fedora/SPECS/archive/python-django.spec similarity index 100% rename from fedora/SPECS/python-django.spec rename to fedora/SPECS/archive/python-django.spec diff --git a/fedora/SPECS/archive/python-ldap.spec b/fedora/SPECS/archive/python-ldap.spec new file mode 100644 index 0000000..f1b3648 --- /dev/null +++ b/fedora/SPECS/archive/python-ldap.spec @@ -0,0 +1,362 @@ +## START: Set by rpmautospec +## (rpmautospec version 0.2.6) +%define autorelease(e:s:pb:) %{?-p:0.}%{lua: + release_number = 4; + base_release_number = tonumber(rpm.expand("%{?-b*}%{!?-b:1}")); + print(release_number + base_release_number - 1); +}%{?-e:.%{-e*}}%{?-s:.%{-s*}}%{?dist} +## END: Set by rpmautospec + +### Abstract ### +# global prerelease b4 + +%global openldap_version 2.4.45-4 +%global pypi_name python-ldap + +Name: python-ldap +Version: 3.4.0 +Release: %autorelease +License: Python +Summary: An object-oriented API to access LDAP directory servers +URL: https://python-ldap.org/ +Source0: %{pypi_source} +Patch0: python-ldap-always-use-ldap-library.patch + + +### Build Dependencies ### +BuildRequires: gcc +BuildRequires: openldap-devel >= %{openldap_version} +BuildRequires: openssl-devel +BuildRequires: cyrus-sasl-devel +BuildRequires: python3-devel +BuildRequires: python3-setuptools +# Test dependencies +BuildRequires: openldap-servers >= %{openldap_version} +BuildRequires: openldap-clients >= %{openldap_version} +BuildRequires: python3-pyasn1 >= 0.3.7 +BuildRequires: python3-pyasn1-modules >= 0.1.5 + +%global _description\ +python-ldap provides an object-oriented API for working with LDAP within\ +Python programs. It allows access to LDAP directory servers by wrapping the\ +OpenLDAP 2.x libraries, and contains modules for other LDAP-related tasks\ +(including processing LDIF, LDAPURLs, LDAPv3 schema, etc.). + +%description %_description + + +%package -n python3-ldap +Summary: %{summary} + +Requires: openldap >= %{openldap_version} +Requires: python3-pyasn1 >= 0.3.7 +Requires: python3-pyasn1-modules >= 0.1.5 +Requires: python3-setuptools +%{?python_provide:%python_provide python3-ldap} +Obsoletes: python3-pyldap < 3 +Provides: python3-pyldap = %{version}-%{release} +Provides: python3-pyldap%{?_isa} = %{version}-%{release} + +%description -n python3-ldap %_description + + +%prep +%autosetup -p1 -n %{name}-%{version}%{?prerelease} +# Fix interpreter +find . -name '*.py' | xargs sed -i '1s|^#!/usr/bin/env python|#!%{__python3}|' + + +%build +%py3_build + + +%check +PYTHONPATH=%{buildroot}%{python3_sitearch} %{__python3} -m unittest discover -v -s Tests -p 't_*' + + +%install +%py3_install + +%files -n python3-ldap +%license LICENCE +%doc CHANGES README TODO Demo +%{python3_sitearch}/_ldap.cpython-*.so +%{python3_sitearch}/ldapurl.py* +%{python3_sitearch}/ldif.py* +%{python3_sitearch}/__pycache__/* +%{python3_sitearch}/slapdtest/ +%{python3_sitearch}/ldap/ +%{python3_sitearch}/python_ldap-%{version}%{?prerelease}-py%{python3_version}.egg-info/ + +%changelog +* Mon Jun 13 2022 Python Maint 3.4.0-4 +- Rebuilt for Python 3.11 + +* Thu Feb 10 2022 Simon Pichugin 3.4.0-3 +- Always use libldap shared library + +* Fri Jan 21 2022 Fedora Release Engineering 3.4.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + +* Fri Nov 26 2021 Christian Heimes 3.4.0-1 +- Update to 3.4.0, fixes RHBZ#2026947 + +* Fri Jul 23 2021 Fedora Release Engineering - 3.3.1-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + +* Mon Jun 28 2021 Christian Heimes - 3.3.1-6 +- Fix SASL get/set options on big endian platforms +- Resolves: rhbz#1976824 + +* Fri Jun 04 2021 Python Maint - 3.3.1-5 +- Rebuilt for Python 3.10 + +* Wed Jan 27 2021 Fedora Release Engineering - 3.3.1-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + +* Thu Jan 21 17:53:26 CET 2021 Christian Heimes - 3.3.1-3 +- Run test suite without tox (#1918913) + +* Fri Nov 13 2020 Miro Hrončok - 3.3.1-2 +- Use https in URL +- Drop build dependency on python3-coverage + +* Thu Oct 22 2020 Christian Heimes - 3.3.1-1 +- New upstream release 3.3.1 + +* Wed Jul 29 2020 Fedora Release Engineering - 3.1.0-11 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Sun May 24 2020 Miro Hrončok - 3.1.0-10 +- Rebuilt for Python 3.9 + +* Thu Jan 30 2020 Fedora Release Engineering - 3.1.0-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + +* Wed Oct 23 2019 Miro Hrončok - 3.1.0-8 +- Subpackage python2-ldap has been removed + See https://fedoraproject.org/wiki/Changes/Mass_Python_2_Package_Removal + +* Thu Oct 03 2019 Miro Hrončok - 3.1.0-7 +- Rebuilt for Python 3.8.0rc1 (#1748018) + +* Fri Aug 16 2019 Miro Hrončok - 3.1.0-6 +- Rebuilt for Python 3.8 + +* Fri Jul 26 2019 Fedora Release Engineering - 3.1.0-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + +* Sat Feb 02 2019 Fedora Release Engineering - 3.1.0-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + +* Sat Jul 14 2018 Fedora Release Engineering - 3.1.0-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + +* Mon Jun 18 2018 Miro Hrončok - 3.1.0-2 +- Rebuilt for Python 3.7 + +* Fri May 25 2018 Christian Heimes - 3.1.0-1 +- New upstream release 3.1.0 + +* Wed Mar 21 2018 Christian Heimes - 3.0.0-1 +- New upstream release 3.0.0 + +* Fri Feb 09 2018 Fedora Release Engineering - 3.0.0-0.5.b4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + +* Wed Jan 10 2018 Christian Heimes - 3.0.0-0.4.b4 +- New upstream release 3.0.0b4 (RHBZ #1496470) + +* Wed Dec 20 2017 Christian Heimes - 3.0.0-0.3.b3 +- New upstream release 3.0.0b3 (RHBZ #1496470) + +* Mon Dec 11 2017 Christian Heimes - 3.0.0-0.2.b2 +- New upstream release 3.0.0b2 (RHBZ #1496470) +- Require OpenLDAP with fix for NSS issue (see #1520990) + +* Mon Dec 04 2017 Christian Heimes - 0:3.0.0-0.1.b1 +- New upstream release 3.0.0b1 (RHBZ #1496470) +- Resolves RHBZ #1489184 +- Enable unittests +- Remove dsml module +- Package python3-ldap, which obsoletes python3-pyldap + +* Wed Nov 08 2017 Christian Heimes - 0:2.4.25-9 +- Fix issue in pyasn1 patch + +* Tue Nov 07 2017 Christian Heimes - 0:2.4.25-8 +- Apply fix for pyasn1 >= 0.3 + +* Sat Aug 19 2017 Zbigniew Jędrzejewski-Szmek - 0:2.4.25-7 +- Python 2 binary package renamed to python2-ldap + See https://fedoraproject.org/wiki/FinalizingFedoraSwitchtoPython3 + +* Thu Aug 03 2017 Fedora Release Engineering - 0:2.4.25-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild + +* Thu Jul 27 2017 Fedora Release Engineering - 0:2.4.25-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + +* Fri Jul 07 2017 Igor Gnatenko - 0:2.4.25-4 +- Rebuild due to bug in RPM (RHBZ #1468476) + +* Sat Feb 11 2017 Fedora Release Engineering - 0:2.4.25-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + +* Tue Jul 19 2016 Fedora Release Engineering - 0:2.4.25-2 +- https://fedoraproject.org/wiki/Changes/Automatic_Provides_for_Python_RPM_Packages + +* Wed Apr 20 2016 Petr Spacek - 2.4.25-1 +- New upstream release 2.4.25 + +* Thu Feb 04 2016 Fedora Release Engineering - 0:2.4.17-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + +* Thu Jun 18 2015 Fedora Release Engineering - 0:2.4.17-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + +* Mon Sep 29 2014 Petr Spacek - 0:2.4.17-1 +- New upstream release adds features required in bug 1122486 +- Dependency on pyasn1-modules was added to fix bug 995545 + +* Thu Sep 25 2014 Petr Spacek - 0:2.4.16-1 +- New upstream release fixes bug 1007820 +- Dependency on pyasn1 was added to fix bug 995545 + +* Sun Aug 17 2014 Fedora Release Engineering - 0:2.4.6-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild + +* Sat Jun 07 2014 Fedora Release Engineering - 0:2.4.6-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild + +* Sun Aug 04 2013 Fedora Release Engineering - 0:2.4.6-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild + +* Thu Feb 14 2013 Fedora Release Engineering - 0:2.4.6-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild + +* Sat Jul 21 2012 Fedora Release Engineering - 0:2.4.6-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild + +* Sat Jan 14 2012 Fedora Release Engineering - 0:2.4.6-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild + +* Mon Jan 02 2012 Jeroen van Meeuwen - 2.4.6-1 +- New upstream release + +* Wed Feb 09 2011 Fedora Release Engineering - 0:2.3.12-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild + +* Fri Sep 24 2010 Parag Nemade - 0:2.3.12-1 +- Merge-review cleanup (#226343) + +* Thu Jul 22 2010 David Malcolm - 0:2.3.10-2 +- Rebuilt for https://fedoraproject.org/wiki/Features/Python_2.7/MassRebuild + +* Thu Jan 14 2010 Matthew Barnes - 0:2.3.10-1 +- Update to 2.3.10 +- Change source URI to pypi.python.org. + +* Fri Aug 21 2009 Tomas Mraz - 0:2.3.6-3 +- rebuilt with new openssl + +* Sun Jul 26 2009 Fedora Release Engineering - 0:2.3.6-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild + +* Wed Apr 01 2009 Matthew Barnes - 0:2.3.6-1 +- Update to 2.3.6 + +* Fri Feb 27 2009 Matthew Barnes - 0:2.3.5-5 +- Fix a build error. + +* Thu Feb 26 2009 Fedora Release Engineering - 0:2.3.5-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild + +* Fri Jan 16 2009 Tomas Mraz - 0:2.3.5-3 +- rebuild with new openssl + +* Sat Nov 29 2008 Ignacio Vazquez-Abrams - 0:2.3.5-2 +- Rebuild for Python 2.6 + +* Wed Sep 3 2008 Tom "spot" Callaway - 0:2.3.5-1 +- fix license tag +- update to 2.3.5 + +* Sun Feb 17 2008 Matthew Barnes - 0:2.3.1-3.fc9 +- Rebuild with GCC 4.3 + +* Wed Dec 05 2007 Matthew Barnes - 0:2.3.1-2.fc9 +- Rebuild against new openssl. + +* Wed Oct 10 2007 Matthew Barnes - 0:2.3.1-1.fc8 +- Update to 2.3.1 + +* Fri Jun 08 2007 Matthew Barnes - 0:2.3.0-1.fc8 +- Update to 2.3 +- Spec file cleanups. + +* Thu Dec 7 2006 Jeremy Katz - 0:2.2.0-3 +- rebuild against python 2.5 + +* Wed Jul 12 2006 Jesse Keating +- rebuild + +* Wed May 17 2006 Matthew Barnes - 2.2.0-2 +- Put back the epoch line... happy beehive? + +* Mon May 15 2006 Matthew Barnes - 2.2.0-1 +- Update to 2.2.0 +- Update python-ldap-2.0.6-rpath.patch and rename it to + python-ldap-2.2.0-dirs.patch. + +* Fri Feb 10 2006 Jesse Keating - 0:2.0.6-5.2.1 +- bump again for double-long bug on ppc(64) + +* Tue Feb 07 2006 Jesse Keating - 0:2.0.6-5.2 +- rebuilt for new gcc4.1 snapshot and glibc changes + +* Fri Dec 09 2005 Jesse Keating +- rebuilt + +* Tue Nov 8 2005 Tomas Mraz - 2.0.6-5 +- rebuilt with new openssl + +* Tue Mar 22 2005 Warren Togami - 2.0.6-4 +- add LICENCE (#150842) +- simplify python reqs +- remove invalid rpath + +* Wed Mar 16 2005 Dan Williams - 0:2.0.6-2 +- rebuilt to pick up new libssl.so.5 + +* Tue Feb 8 2005 David Malcolm - 0:2.0.6-1 +- 2.0.6 + +* Tue Nov 16 2004 Nalin Dahyabhai - 0:2.0.1-3 +- rebuild (#139161) + +* Mon Aug 30 2004 David Malcolm - 0:2.0.1-2 +- Rewrote description; added requirement for openldap + +* Tue Aug 17 2004 David Malcolm - 0:2.0.1-1 +- imported into Red Hat's packaging system from Fedora.us; set release to 1 + +* Wed Jun 30 2004 Panu Matilainen 0:2.0.1-0.fdr.1 +- update to 2.0.1 + +* Sun Dec 07 2003 Panu Matilainen 0:2.0.0-0.fdr.0.4.pre16 +- fix spec permissions + release tag order (bug 1099) + +* Sat Dec 6 2003 Ville Skyttä 0:2.0.0-0.fdr.0.pre16.3 +- Stricter python version requirements. +- BuildRequire openssl-devel. +- Explicitly build *.pyo, install them as %%ghost. +- Own more installed dirs. +- Remove $RPM_BUILD_ROOT at start of %%install. + +* Wed Dec 03 2003 Panu Matilainen 0:2.0.0-0.fdr.0.pre16.2 +- duh, build requires python-devel, not just python... + +* Wed Dec 03 2003 Panu Matilainen 0:2.0.0-0.fdr.0.pre16.1 +- Initial Fedora packaging. + diff --git a/fedora/SPECS/python-mysql.spec b/fedora/SPECS/archive/python-mysql.spec similarity index 100% rename from fedora/SPECS/python-mysql.spec rename to fedora/SPECS/archive/python-mysql.spec diff --git a/fedora/SPECS/python-redis.spec b/fedora/SPECS/archive/python-redis.spec similarity index 100% rename from fedora/SPECS/python-redis.spec rename to fedora/SPECS/archive/python-redis.spec diff --git a/fedora/SPECS/python-sphinx.spec b/fedora/SPECS/archive/python-sphinx.spec similarity index 100% rename from fedora/SPECS/python-sphinx.spec rename to fedora/SPECS/archive/python-sphinx.spec diff --git a/fedora/SPECS/python2-argparse.spec b/fedora/SPECS/archive/python2-argparse.spec similarity index 100% rename from fedora/SPECS/python2-argparse.spec rename to fedora/SPECS/archive/python2-argparse.spec diff --git a/fedora/SPECS/python2-whisper.spec b/fedora/SPECS/archive/python2-whisper.spec similarity index 100% rename from fedora/SPECS/python2-whisper.spec rename to fedora/SPECS/archive/python2-whisper.spec diff --git a/fedora/SPECS/python3-argparse.spec b/fedora/SPECS/archive/python3-argparse.spec similarity index 100% rename from fedora/SPECS/python3-argparse.spec rename to fedora/SPECS/archive/python3-argparse.spec diff --git a/fedora/SPECS/tilesweep.spec b/fedora/SPECS/archive/tilesweep.spec similarity index 100% rename from fedora/SPECS/tilesweep.spec rename to fedora/SPECS/archive/tilesweep.spec diff --git a/fedora/SPECS/xnview.spec b/fedora/SPECS/archive/xnview.spec similarity index 100% rename from fedora/SPECS/xnview.spec rename to fedora/SPECS/archive/xnview.spec diff --git a/fedora/SPECS/icinga2.spec b/fedora/SPECS/icinga2.spec deleted file mode 100644 index f0a34a3..0000000 --- a/fedora/SPECS/icinga2.spec +++ /dev/null @@ -1,918 +0,0 @@ -# Icinga 2 | (c) 2012 Icinga GmbH | GPLv2+ - -%define revision 1 - -# make sure that _rundir is working on older systems -%if ! %{defined _rundir} -%define _rundir %{_localstatedir}/run -%endif -%if ! %{defined _fillupdir} - %define _fillupdir %{_localstatedir}/adm/fillup-templates -%endif - -%define _libexecdir %{_prefix}/lib/ -%define plugindir %{_libdir}/nagios/plugins - -%if "%{_vendor}" == "redhat" -%define apachename httpd -%define apacheconfdir %{_sysconfdir}/httpd/conf.d -%define apacheuser apache -%define apachegroup apache - -%if 0%{?el6}%{?amzn} -%define use_systemd 0 -%define use_selinux 0 -%if %(uname -m) != "x86_64" -%define march_flag -march=i686 -%endif -%else -# fedora and el>=7 -%define use_systemd 1 -%define use_selinux 1 -%if 0%{?fedora} >= 24 -# for installing limits.conf on systemd >= 228 -%define configure_systemd_limits 1 -%else -%define configure_systemd_limits 0 -%endif -%endif -%endif - -%if "%{_vendor}" == "suse" -%define plugindir %{_libexecdir}/nagios/plugins -%define apachename apache2 -%define apacheconfdir %{_sysconfdir}/apache2/conf.d -%define apacheuser wwwrun -%define apachegroup www -%if 0%{?suse_version} >= 1310 -%define use_systemd 1 -%if 0%{?sle_version} >= 120200 || 0%{?suse_version} > 1320 -# for installing limits.conf on systemd >= 228 -%define configure_systemd_limits 1 -%else -%define configure_systemd_limits 0 -%endif -%else -%define use_systemd 0 -%endif -%endif - -%define icinga_user icinga -%define icinga_group icinga -%define icingacmd_group icingacmd - -# enable unity builds by default for all architectures except arm32 -%ifarch %{arm} -%bcond_with unity_build -%else -%bcond_without unity_build -%endif - -# Disable lto_build for older SUSE versions -# see https://github.com/Icinga/icinga2/issues/7149 -%if "%{_vendor}" == "suse" && 0%{?suse_version} <= 1315 -%bcond_with lto_build -%else # suse_version 1315 -%bcond_without lto_build -%endif # suse_version 1315 - -%bcond_with systemd_and_init -%bcond_without compat -%bcond_without livestatus -%bcond_without notification -%bcond_without perfdata -%bcond_without tests -%bcond_without mysql -%bcond_without pgsql - -%define logmsg logger -t %{name}/rpm - -%define boost_min_version 1.66 - -Summary: Network monitoring application -%if "%{_vendor}" == "suse" -License: GPL-2.0-or-later -%else -License: GPLv2+ -%endif # suse -Group: System/Monitoring -Name: icinga2 -Version: 2.12.1 -Release: %{revision}%{?dist} -Url: https://www.icinga.com/ -Source: https://github.com/Icinga/%{name}/archive/v%{version}%{?src_version_suffix}.tar.gz - -BuildRoot: %{_tmppath}/%{name}-%{version}-build -Requires: %{name}-bin = %{version}-%{release} -Requires: %{name}-common = %{version}-%{release} - -Conflicts: %{name}-common < %{version}-%{release} - -%description -Meta package for Icinga 2 Core, DB IDO and Web. - -%package bin -Summary: Icinga 2 binaries and libraries -Group: System/Monitoring - -Requires: %{name}-bin = %{version}-%{release} - -%if "%{_vendor}" == "suse" -Provides: monitoring_daemon -Recommends: monitoring-plugins -%if 0%{?suse_version} >= 1310 -BuildRequires: libyajl-devel -%endif -%endif -BuildRequires: libedit-devel -BuildRequires: ncurses-devel -%if "%{_vendor}" == "suse" && 0%{?suse_version} < 1210 -BuildRequires: gcc48-c++ -BuildRequires: libopenssl1-devel -BuildRequires: libstdc++48-devel -%else -%if "%{_vendor}" == "redhat" && (0%{?el6} || 0%{?rhel} == 6 || "%{?dist}" == ".el6") -# Requires devtoolset-7 scl -%define scl_name devtoolset-7 -%define scl_enable scl enable %{scl_name} -- -BuildRequires: %{scl_name}-binutils -BuildRequires: %{scl_name}-gcc-c++ -BuildRequires: %{scl_name}-libstdc++-devel -%else -BuildRequires: gcc-c++ -BuildRequires: libstdc++-devel -%endif -BuildRequires: openssl-devel -%endif -BuildRequires: bison -BuildRequires: cmake -BuildRequires: flex >= 2.5.35 -BuildRequires: make - -%if "%{_vendor}" == "suse" - %if 0%{?suse_version} >= 1315 - # SLES 12 and OpenSUSE 42 or later - %define boost_devel_pkg %nil - %if 0%{?suse_version} < 1320 - # before SLES 15 and OpenSUSE 15 - # Provided by packages.icinga.com - %define boost_library icinga-boost - %define boost_version 1.69 - %define boost_rpath %{_libdir}/%{boost_library} - # Note: the -impl suffix comes from current packages on OBS - %define boost_devel_suffix -impl - %endif # suse_version < 1320 -BuildRequires: libboost_context-devel%{?boost_devel_suffix} >= %{boost_min_version} -BuildRequires: libboost_coroutine-devel%{?boost_devel_suffix} >= %{boost_min_version} -BuildRequires: libboost_filesystem-devel%{?boost_devel_suffix} >= %{boost_min_version} -BuildRequires: libboost_program_options-devel%{?boost_devel_suffix} >= %{boost_min_version} -BuildRequires: libboost_regex-devel%{?boost_devel_suffix} >= %{boost_min_version} -BuildRequires: libboost_system-devel%{?boost_devel_suffix} >= %{boost_min_version} -BuildRequires: libboost_thread-devel%{?boost_devel_suffix} >= %{boost_min_version} -BuildRequires: libboost_test-devel%{?boost_devel_suffix} >= %{boost_min_version} - %else # suse_version >= 1315 - # old boost devel name - %define boost_devel_pkg boost-devel - %endif # suse_version >= 1315 -%else # vendor == suse - assuming redhat or compatible - # default boost devel package - %define boost_devel_pkg boost-devel - - %if (0%{?el6} || 0%{?rhel} == 6) - # Provided by packages.icinga.com - %define boost_library icinga-boost169 - %define boost_version 1.69 - %define boost_devel_pkg icinga-boost169-devel - %define boost_rpath %{_libdir}/%{boost_library} - %endif # el6 - %if (0%{?el7} || 0%{?rhel} == 7) - # Provided by EPEL - %define boost_library boost169 - %define boost_version 1.69 - %define boost_devel_pkg boost169-devel - %endif # el7 -%endif # vendor == suse - -%if "%{?boost_devel_pkg}" != "" -BuildRequires: %{boost_devel_pkg} >= %{boost_min_version} -%endif # boost_devel_pkg - -%if 0%{?use_systemd} -BuildRequires: systemd-devel -Requires: systemd -%endif - -Obsoletes: %{name}-libs <= 2.10.0 -Conflicts: %{name}-libs <= 2.10.0 - -%description bin -Icinga 2 is a general-purpose network monitoring application. -This subpackage provides the binaries for Icinga 2 Core. - -%package common -Summary: Common Icinga 2 configuration -Group: System/Monitoring -%if (0%{?amzn} || 0%{?fedora} || 0%{?rhel}) -Requires(pre): shadow-utils -Requires(post): shadow-utils -%endif -BuildRequires: logrotate -%if "%{_vendor}" == "suse" -PreReq: permissions -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 -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 -This subpackage provides common directories, and the UID and GUID definitions -among Icinga 2 related packages. - - -%package doc -Summary: Documentation for Icinga 2 -Group: Documentation/Other - -%description doc -This subpackage provides documentation for Icinga 2. - - -%if %{with mysql} -%package ido-mysql -Summary: IDO MySQL database backend for Icinga 2 -Group: System/Monitoring -%if "%{_vendor}" == "suse" -BuildRequires: libmysqlclient-devel -%if 0%{?suse_version} >= 1310 -BuildRequires: mysql-devel -%endif - -%else -BuildRequires: mysql-devel -%endif #suse - -Requires: %{name}-bin = %{version}-%{release} - -%description ido-mysql -Icinga 2 IDO mysql database backend. Compatible with Icinga 1.x -IDOUtils schema >= 1.12 -%endif - - -%if %{with pgsql} -%package ido-pgsql -Summary: IDO PostgreSQL database backend for Icinga 2 -Group: System/Monitoring -%if "%{_vendor}" == "suse" && 0%{?suse_version} < 1210 -BuildRequires: postgresql-devel >= 8.4 -%else -BuildRequires: postgresql-devel -%endif -Requires: %{name}-bin = %{version}-%{release} - -%description ido-pgsql -Icinga 2 IDO PostgreSQL database backend. Compatible with Icinga 1.x -IDOUtils schema >= 1.12 -%endif - -%if 0%{?use_selinux} -%global selinux_variants mls targeted -%global selinux_modulename %{name} - -%package selinux -Summary: SELinux policy module supporting icinga2 -Group: System/Base -BuildRequires: checkpolicy -BuildRequires: hardlink -BuildRequires: selinux-policy-devel -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(postun): policycoreutils-python -%endif - - -%description selinux -SELinux policy module supporting icinga2. -%endif - -%package -n vim-icinga2 -Summary: Vim syntax highlighting for icinga2 -Group: Productivity/Text/Editors -%if "%{_vendor}" == "suse" -BuildRequires: vim -Requires: vim -%else -Requires: vim-filesystem -%endif - -%description -n vim-icinga2 -Provides Vim syntax highlighting for icinga2. - - -%package -n nano-icinga2 -Summary: Nano syntax highlighting for icinga2 -Group: Productivity/Text/Editors -Requires: nano - -%description -n nano-icinga2 -Provides Nano syntax highlighting for icinga2. - -%prep -%setup -q -n %{name}-%{version}%{?src_version_suffix} -# 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 - -# 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 -# set basedir to allow cache to hit between different builds -# this will make all paths below BUILD/icinga2-x.x.x relative for cache -export CCACHE_BASEDIR="${CCACHE_BASEDIR:-$(pwd)}" - -CMAKE_OPTS="-DCMAKE_INSTALL_PREFIX=/usr \ - -DCMAKE_INSTALL_SYSCONFDIR=/etc \ - -DCMAKE_INSTALL_LOCALSTATEDIR=/var \ - -DCMAKE_BUILD_TYPE=RelWithDebInfo \ - -DCMAKE_VERBOSE_MAKEFILE=ON \ - -DBoost_NO_BOOST_CMAKE=ON \ - -DICINGA2_PLUGINDIR=%{plugindir} \ - -DICINGA2_RUNDIR=%{_rundir} \ - -DICINGA2_SYSCONFIGFILE=/etc/sysconfig/icinga2 \ - -DICINGA2_USER=%{icinga_user} \ - -DICINGA2_GROUP=%{icinga_group} \ - -DICINGA2_COMMAND_GROUP=%{icingacmd_group}" -%if 0%{?fedora} -CMAKE_OPTS="$CMAKE_OPTS -DICINGA2_WITH_STUDIO=true" -%endif - -%if %{with unity_build} -CMAKE_OPTS="$CMAKE_OPTS -DICINGA2_UNITY_BUILD=ON" -%else -CMAKE_OPTS="$CMAKE_OPTS -DICINGA2_UNITY_BUILD=OFF" -%endif -%if %{with lto_build} -CMAKE_OPTS="$CMAKE_OPTS -DICINGA2_LTO_BUILD=ON" -%else -CMAKE_OPTS="$CMAKE_OPTS -DICINGA2_LTO_BUILD=OFF" -%endif -%if %{with systemd_and_init} -CMAKE_OPTS="$CMAKE_OPTS -DINSTALL_SYSTEMD_SERVICE_AND_INITSCRIPT=ON" -%else -CMAKE_OPTS="$CMAKE_OPTS -DINSTALL_SYSTEMD_SERVICE_AND_INITSCRIPT=OFF" -%endif -%if %{with compat} -CMAKE_OPTS="$CMAKE_OPTS -DICINGA2_WITH_COMPAT=ON" -%else -CMAKE_OPTS="$CMAKE_OPTS -DICINGA2_WITH_COMPAT=OFF" -%endif -%if %{with livestatus} -CMAKE_OPTS="$CMAKE_OPTS -DICINGA2_WITH_LIVESTATUS=ON" -%else -CMAKE_OPTS="$CMAKE_OPTS -DICINGA2_WITH_LIVESTATUS=OFF" -%endif -%if %{with notification} -CMAKE_OPTS="$CMAKE_OPTS -DICINGA2_WITH_NOTIFICATION=ON" -%else -CMAKE_OPTS="$CMAKE_OPTS -DICINGA2_WITH_NOTIFICATION=OFF" -%endif -%if %{with perfdata} -CMAKE_OPTS="$CMAKE_OPTS -DICINGA2_WITH_PERFDATA=ON" -%else -CMAKE_OPTS="$CMAKE_OPTS -DICINGA2_WITH_PERFDATA=OFF" -%endif -%if %{with tests} -CMAKE_OPTS="$CMAKE_OPTS -DICINGA2_WITH_TESTS=ON" -%else -CMAKE_OPTS="$CMAKE_OPTS -DICINGA2_WITH_TESTS=OFF" -%endif -%if %{with mysql} -CMAKE_OPTS="$CMAKE_OPTS -DICINGA2_WITH_MYSQL=ON" -%else -CMAKE_OPTS="$CMAKE_OPTS -DICINGA2_WITH_MYSQL=OFF" -%endif -%if %{with pgsql} -CMAKE_OPTS="$CMAKE_OPTS -DICINGA2_WITH_PGSQL=ON" -%else -CMAKE_OPTS="$CMAKE_OPTS -DICINGA2_WITH_PGSQL=OFF" -%endif - -%if (0%{?el6} || 0%{?rhel} == 6) -# Explicitly link against rt, because ld doesn't detect it automatically -CMAKE_OPTS="$CMAKE_OPTS -DCMAKE_EXE_LINKER_FLAGS=-lrt" -%endif # el6 - -%if "%{?boost_rpath}" != "" -CMAKE_OPTS="$CMAKE_OPTS -DCMAKE_INSTALL_RPATH=%{boost_rpath}" -%endif # boost_rpath - -%if "%{?boost_library}" != "" -# Boost_NO_BOOST_CMAKE=ON - disable search for cmake -# Boost_NO_SYSTEM_PATHS=ON - only search in specified locations -CMAKE_OPTS="$CMAKE_OPTS - -DBoost_NO_BOOST_CMAKE=TRUE \ - -DBoost_NO_SYSTEM_PATHS=TRUE \ - -DBOOST_LIBRARYDIR=%{_libdir}/%{boost_library} \ - -DBOOST_INCLUDEDIR=/usr/include/%{boost_library} \ - -DBoost_ADDITIONAL_VERSIONS='%{boost_version};%{boost_version}.0'" -%endif # boost_library - -%if 0%{?use_systemd} -CMAKE_OPTS="$CMAKE_OPTS -DUSE_SYSTEMD=ON" -%endif - -%if "%{_vendor}" == "suse" && 0%{?suse_version} < 1210 -# from package gcc48-c++ -export CC=gcc-4.8 -export CXX=g++-4.8 -%endif - -%if "%{?_buildhost}" != "" -CMAKE_OPTS="$CMAKE_OPTS -DICINGA2_BUILD_HOST_NAME:STRING=%_buildhost" -%endif - -%{?scl_enable} cmake $CMAKE_OPTS -DCMAKE_C_FLAGS:STRING="%{optflags} %{?march_flag}" -DCMAKE_CXX_FLAGS:STRING="%{optflags} %{?march_flag}" . - -%{?scl_enable} make %{?_smp_mflags} - -%if 0%{?use_selinux} -cd tools/selinux -for selinuxvariant in %{selinux_variants} -do - make NAME=${selinuxvariant} -f /usr/share/selinux/devel/Makefile - mv %{selinux_modulename}.pp %{selinux_modulename}.pp.${selinuxvariant} - make NAME=${selinuxvariant} -f /usr/share/selinux/devel/Makefile clean -done -cd - -%endif - -%install -%{?scl_enable} make install \ - DESTDIR="%{buildroot}" - -# install custom limits.conf for systemd -%if 0%{?configure_systemd_limits} -# for > 2.8 or > 2.7.2 -install -D -m 0644 etc/initsystem/icinga2.service.limits.conf %{buildroot}/etc/systemd/system/%{name}.service.d/limits.conf -%endif - -# remove features-enabled symlinks -rm -f %{buildroot}/%{_sysconfdir}/%{name}/features-enabled/*.conf - -# enable suse rc links -%if "%{_vendor}" == "suse" -%if 0%{?use_systemd} - ln -sf /usr/sbin/service %{buildroot}%{_sbindir}/rc%{name} -%else - ln -sf ../../%{_initrddir}/%{name} "%{buildroot}%{_sbindir}/rc%{name}" -%endif -mkdir -p "%{buildroot}%{_fillupdir}/" -mv "%{buildroot}%{_sysconfdir}/sysconfig/%{name}" "%{buildroot}%{_fillupdir}/sysconfig.%{name}" -%endif - -%if 0%{?use_selinux} -cd tools/selinux -for selinuxvariant in %{selinux_variants} -do - install -d %{buildroot}%{_datadir}/selinux/${selinuxvariant} - install -p -m 644 %{selinux_modulename}.pp.${selinuxvariant} \ - %{buildroot}%{_datadir}/selinux/${selinuxvariant}/%{selinux_modulename}.pp -done -cd - - -# TODO: Fix build problems on Icinga, see https://github.com/Icinga/puppet-icinga_build/issues/11 -#/usr/sbin/hardlink -cv %%{buildroot}%%{_datadir}/selinux -%endif - -%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/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 -%endif - -install -D -m 0644 tools/syntax/nano/%{name}.nanorc %{buildroot}%{_datadir}/nano/%{name}.nanorc - -%check -export CTEST_OUTPUT_ON_FAILURE=1 -make test - -%pre -%if "%{_vendor}" == "suse" -%if 0%{?use_systemd} - %service_add_pre %{name}.service -%endif - -%verifyscript -%verify_permissions -e %{_rundir}/%{name}/cmd -%endif - -%post -# suse -%if "%{_vendor}" == "suse" -%if 0%{?suse_version} >= 1310 -%set_permissions %{_rundir}/%{name}/cmd -%endif - -%if 0%{?use_systemd} -%fillup_only %{name} -%service_add_post %{name}.service -%else -%fillup_and_insserv %{name} -%endif - -if [ ${1:-0} -eq 1 ] -then - # initial installation, enable default features - for feature in checker notification mainlog; do - ln -sf ../features-available/${feature}.conf %{_sysconfdir}/%{name}/features-enabled/${feature}.conf - done -fi - -exit 0 - -%else -# rhel - -%if 0%{?use_systemd} -%systemd_post %{name}.service -%else -/sbin/chkconfig --add %{name} -%endif - -if [ ${1:-0} -eq 1 ] -then - # initial installation, enable default features - for feature in checker notification mainlog; do - ln -sf ../features-available/${feature}.conf %{_sysconfdir}/%{name}/features-enabled/${feature}.conf - done -fi - -exit 0 - -%endif -# suse/rhel - -%preun -# suse -%if "%{_vendor}" == "suse" - -%if 0%{?use_systemd} - %service_del_preun %{name}.service -%else - %stop_on_removal %{name} -%endif - -exit 0 - -%else -# rhel - -%if 0%{?use_systemd} -%systemd_preun %{name}.service -%else -if [ "$1" = "0" ]; then - /sbin/service %{name} stop > /dev/null 2>&1 || : - /sbin/chkconfig --del %{name} || : -fi -%endif - -exit 0 - -%endif -# suse / rhel - -%postun -# suse -%if "%{_vendor}" == "suse" -%if 0%{?use_systemd} - %service_del_postun %{name}.service -%else - %restart_on_update %{name} - %insserv_cleanup -%endif - -%else -# rhel - -%if 0%{?use_systemd} -%systemd_postun_with_restart %{name}.service -%else -if [ "$1" -ge "1" ]; then - /sbin/service %{name} condrestart >/dev/null 2>&1 || : -fi -%endif - -%endif -# suse / rhel - -if [ "$1" = "0" ]; then - # deinstallation of the package - remove enabled features - rm -rf %{_sysconfdir}/%{name}/features-enabled -fi - -exit 0 - -%pre common -getent group %{icinga_group} >/dev/null || %{_sbindir}/groupadd -r %{icinga_group} -getent group %{icingacmd_group} >/dev/null || %{_sbindir}/groupadd -r %{icingacmd_group} -getent passwd %{icinga_user} >/dev/null || %{_sbindir}/useradd -c "icinga" -s /sbin/nologin -r -d %{_localstatedir}/spool/%{name} -G %{icingacmd_group} -g %{icinga_group} %{icinga_user} - -%if "%{_vendor}" == "suse" -%verifyscript common -%verify_permissions -e %{_rundir}/%{name}/cmd -%endif - -%post common -%if "%{_vendor}" == "suse" -%if 0%{?suse_version} >= 1310 -%set_permissions %{_rundir}/%{name}/cmd -%endif -%endif - -%post ido-mysql -if [ ${1:-0} -eq 1 ] && [ -e %{_sysconfdir}/%{name}/features-enabled/ido-mysql.conf ] -then - # initial installation, enable ido-mysql feature - ln -sf ../features-available/ido-mysql.conf %{_sysconfdir}/%{name}/features-enabled/ido-mysql.conf -fi - -exit 0 - -%postun ido-mysql -if [ "$1" = "0" ]; then - # deinstallation of the package - remove feature - rm -f %{_sysconfdir}/%{name}/features-enabled/ido-mysql.conf -fi - -exit 0 - -%post ido-pgsql -if [ ${1:-0} -eq 1 ] && [ -e %{_sysconfdir}/%{name}/features-enabled/ido-pgsql.conf ] -then - # initial installation, enable ido-pgsql feature - ln -sf ../features-available/ido-pgsql.conf %{_sysconfdir}/%{name}/features-enabled/ido-pgsql.conf -fi - -exit 0 - -%postun ido-pgsql -if [ "$1" = "0" ]; then - # deinstallation of the package - remove feature - rm -f %{_sysconfdir}/%{name}/features-enabled/ido-pgsql.conf -fi - -exit 0 - -%if 0%{?use_selinux} -%post selinux -for selinuxvariant in %{selinux_variants} -do - /usr/sbin/semodule -s ${selinuxvariant} -i \ - %{_datadir}/selinux/${selinuxvariant}/%{selinux_modulename}.pp &> /dev/null || : -done -/sbin/fixfiles -R icinga2 restore &> /dev/null || : -/sbin/fixfiles -R icinga2-bin restore &> /dev/null || : -/sbin/fixfiles -R icinga2-common restore &> /dev/null || : -/sbin/semanage port -a -t icinga2_port_t -p tcp 5665 &> /dev/null || : - -%postun selinux -if [ $1 -eq 0 ] ; then - /sbin/semanage port -d -t icinga2_port_t -p tcp 5665 &> /dev/null || : - for selinuxvariant in %{selinux_variants} - do - /usr/sbin/semodule -s ${selinuxvariant} -r %{selinux_modulename} &> /dev/null || : - done - /sbin/fixfiles -R icinga2 restore &> /dev/null || : - /sbin/fixfiles -R icinga2-bin restore &> /dev/null || : - /sbin/fixfiles -R icinga2-common restore &> /dev/null || : -fi -%endif - - -%files -%defattr(-,root,root,-) -%doc COPYING - -%config(noreplace) %{_sysconfdir}/logrotate.d/%{name} - -%if 0%{?use_systemd} -%attr(644,root,root) %{_unitdir}/%{name}.service -%if 0%{?configure_systemd_limits} -%dir /etc/systemd/system/%{name}.service.d -%attr(644,root,root) %config(noreplace) /etc/systemd/system/%{name}.service.d/limits.conf -%endif -%else -%attr(755,root,root) %config(noreplace) %{_sysconfdir}/init.d/%{name} -%endif -%if "%{_vendor}" == "suse" -%{_sbindir}/rc%{name} -%{_fillupdir}/sysconfig.%{name} -%else -%config(noreplace) %{_sysconfdir}/sysconfig/%{name} -%endif - -%{_sbindir}/%{name} - -%dir %{_libexecdir}/%{name} -%{_libexecdir}/%{name}/prepare-dirs -%{_libexecdir}/%{name}/safe-reload - -%attr(0750,%{icinga_user},%{icinga_group}) %dir %{_sysconfdir}/%{name} -%attr(0750,%{icinga_user},%{icinga_group}) %dir %{_sysconfdir}/%{name}/conf.d -%attr(0750,%{icinga_user},%{icinga_group}) %dir %{_sysconfdir}/%{name}/features-available -%exclude %{_sysconfdir}/%{name}/features-available/ido-*.conf -%attr(0750,%{icinga_user},%{icinga_group}) %dir %{_sysconfdir}/%{name}/features-enabled -%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,%{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 -%config(noreplace) %attr(0640,%{icinga_user},%{icinga_group}) %{_sysconfdir}/%{name}/features-available/*.conf -%config(noreplace) %attr(0640,%{icinga_user},%{icinga_group}) %{_sysconfdir}/%{name}/zones.d/* -%config(noreplace) %{_sysconfdir}/%{name}/scripts/* - -%attr(0750,%{icinga_user},%{icingacmd_group}) %{_localstatedir}/cache/%{name} -%attr(0750,%{icinga_user},%{icingacmd_group}) %dir %{_localstatedir}/log/%{name} -%attr(0750,%{icinga_user},%{icinga_group}) %dir %{_localstatedir}/log/%{name}/crash -%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},%{icinga_group}) %{_localstatedir}/lib/%{name} -%attr(0750,%{icinga_user},%{icingacmd_group}) %ghost %dir %{_rundir}/%{name} -%attr(2750,%{icinga_user},%{icingacmd_group}) %ghost %{_rundir}/%{name}/cmd -%attr(0750,%{icinga_user},%{icinga_group}) %dir %{_localstatedir}/spool/%{name} -%attr(0770,%{icinga_user},%{icinga_group}) %dir %{_localstatedir}/spool/%{name}/perfdata -%attr(0750,%{icinga_user},%{icinga_group}) %dir %{_localstatedir}/spool/%{name}/tmp - -%files bin -%defattr(-,root,root,-) -%doc COPYING README.md NEWS AUTHORS CHANGELOG.md -%dir %{_libdir}/%{name} -%dir %{_libdir}/%{name}/sbin -%{_libdir}/%{name}/sbin/%{name} -%{plugindir}/check_nscp_api -%{_datadir}/%{name} -%exclude %{_datadir}/%{name}/include -%{_mandir}/man8/%{name}.8.gz - -%files common -%defattr(-,root,root,-) -%doc COPYING README.md NEWS AUTHORS CHANGELOG.md tools/syntax -%{_sysconfdir}/bash_completion.d/%{name} -%attr(0750,%{icinga_user},%{icinga_group}) %dir %{_datadir}/%{name}/include -%{_datadir}/%{name}/include/* - -%files doc -%defattr(-,root,root,-) -%{_datadir}/doc/%{name} -%docdir %{_datadir}/doc/%{name} - -%if %{with mysql} -%files ido-mysql -%defattr(-,root,root,-) -%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}/libmysql_shim* -%{_datadir}/icinga2-ido-mysql -%endif - -%if %{with pgsql} -%files ido-pgsql -%defattr(-,root,root,-) -%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}/libpgsql_shim* -%{_datadir}/icinga2-ido-pgsql -%endif - -%if 0%{?use_selinux} -%files selinux -%defattr(-,root,root,0755) -%doc tools/selinux/* -%{_datadir}/selinux/*/%{selinux_modulename}.pp -%endif - -%files -n vim-icinga2 -%defattr(-,root,root,-) -%if "%{_vendor}" == "suse" -%{_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 -%endif - -%files -n nano-icinga2 -%defattr(-,root,root,-) -%if "%{_vendor}" == "suse" -%dir %{_datadir}/nano -%endif -%{_datadir}/nano/%{name}.nanorc - -%changelog -* Tue Oct 13 2020 Alexander A. Klimov 2.12.1-1 -- Update to 2.12.1 - -* Wed Aug 05 2020 Henrik Triem 2.12.0-1 -- Update to 2.12.0 - -* Fri Mar 13 2020 Noah Hilverling 2.12.0-0.rc1.1 -- Update to 2.12.0-rc1 - -* Thu Oct 24 2019 Michael Friedrich 2.11.2-1 -- Update to 2.11.2 - -* Thu Oct 17 2019 Michael Friedrich 2.11.1-1 -- Update to 2.11.1 - -* Thu Sep 19 2019 Michael Friedrich 2.11.0-1 -- Update to 2.11.0 - -* Thu Jul 25 2019 Markus Frosch 2.11.0-0.rc1.1 -- Prepare pre-release 2.11.0-rc1 - -* Tue Mar 19 2019 Michael Friedrich 2.10.4-1 -- Update to 2.10.4 - -* Tue Feb 26 2019 Michael Friedrich 2.10.3-2 -- Apply quickfix for SLES11 - -* Tue Feb 26 2019 Michael Friedrich 2.10.3-1 -- Update to 2.10.3 - -* Wed Nov 14 2018 Michael Friedrich 2.10.2-1 -- Update to 2.10.2 - -* Thu Oct 18 2018 Michael Friedrich 2.10.1-1 -- Update to 2.10.1 - -* Thu Oct 11 2018 Michael Friedrich 2.10.0-1 -- Update to 2.10.0 - -* Wed Sep 26 2018 Michael Friedrich 2.9.2-1 -- Update to 2.9.2 - -* Wed Jul 25 2018 Markus Frosch 2.10.0-0 -- Remove obsoleted icinga2-libs package - -* Tue Jul 24 2018 Michael Friedrich 2.9.1-1 -- Update to 2.9.1 - -* Tue Jul 17 2018 Michael Friedrich 2.9.0-1 -- Update to 2.9.0 - -* Wed Apr 25 2018 Jean Flach 2.8.4-1 -- Update to 2.8.4 - -* Tue Apr 24 2018 Jean Flach 2.8.3-1 -- Update to 2.8.3 - -* Thu Mar 22 2018 Jean Flach 2.8.2-1 -- Update to 2.8.2 - -* Wed Jan 17 2018 Gunnar Beutner 2.8.1-1 -- Update to 2.8.1 - -* Fri Nov 24 2017 Markus Frosch 2.8.0-2 -- [SLES] Add systemd limits file -- Add config(noreplace) for the systemd limits file - (no need to release every OS immediately) -- Update SELinux handling to be compatible to Fedora 27 - (only affecting f27 builds) - -* Thu Nov 16 2017 Jean Flach 2.8.0-1 -- Update to 2.8.0 - -* Thu Nov 09 2017 Gunnar Beutner 2.7.2-1 -- Update to 2.7.2 - -* Mon Oct 02 2017 Markus Frosch 2.7.1-2 -- Fixing systemd limit issues on openSUSE > 42.1 - -* Thu Sep 21 2017 Michael Friedrich 2.7.1-1 -- Update to 2.7.1 - -* Tue Jun 20 2017 Markus Frosch 2.7.0-1 -- Update to 2.7.0 diff --git a/fedora/SPECS/icingaweb2.spec b/fedora/SPECS/icingaweb2.spec deleted file mode 100644 index 35e7fb7..0000000 --- a/fedora/SPECS/icingaweb2.spec +++ /dev/null @@ -1,481 +0,0 @@ -# Icinga Web 2 | (c) 2013-2017 Icinga Development Team | GPLv2+ - -%define revision 1 - -Name: icingaweb2 -Version: 2.8.2 -Release: %{revision}%{?dist} -Summary: Icinga Web 2 -Group: Applications/System -License: GPLv2+ and MIT and BSD -URL: https://icinga.com -Source0: icingaweb2-2.8.2.orig.tar.gz -BuildArch: noarch -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release} -Packager: Icinga Team - -%if 0%{?fedora} || 0%{?rhel} || 0%{?amzn} -%if 0%{?rhel} == 7 -%define php_scl rh-php73 -%endif -%if 0%{?rhel} == 6 -%define php_scl rh-php70 -%endif - -%if 0%{?el5}%{?el6}%{?amzn} -%define use_selinux 0 -%else -%define use_selinux 1 -%endif - -%if 0%{?php_scl:1} -%define php_scl_prefix %{php_scl}- -%define php_runtime %{php_scl_prefix}php-fpm -%define php_bin /opt/rh/%{php_scl}/root/usr/bin/php -%define php_fpm 1 -%else -%define php_runtime %{php} -%endif - -%define php %{?php_scl_prefix}php -%define php_cli %{php}-cli -%define php_common %{php}-common -%define wwwconfigdir %{_sysconfdir}/httpd/conf.d -%define wwwuser apache - -# extra requirements on RHEL -Requires: %{php}-mysqlnd -Requires: %{php}-pgsql -Requires: %{php}-ldap -%endif - -# minimum required PHP version -%define php_version 5.6.0 - -%if 0%{?suse_version} -%define wwwconfigdir %{_sysconfdir}/apache2/conf.d -%define wwwuser wwwrun -%define php php -%define php_runtime mod_php_any -%define php_common %{php} -%define php_cli %{php} -# conflict with older PHP on SLES and openSUSE -Conflicts: php < %{php_version} -Conflicts: php5 < %{php_version} -Conflicts: php53 -%endif - -%{?amzn:Requires(pre): shadow-utils} -%{?fedora:Requires(pre): shadow-utils} -%{?rhel:Requires(pre): shadow-utils} -%{?suse_version:Requires(pre): pwdutils} - -Requires: %{php_runtime} >= %{php_version} -Requires: %{php_common} >= %{php_version} -%if 0%{?suse_version} -Requires: apache2 -%endif - -Requires: icinga-l10n -Requires: icingacli = %{version}-%{release} -Requires: %{name}-common = %{version}-%{release} -Requires: php-Icinga = %{version}-%{release} -Requires: %{name}-vendor-dompdf = %{version}-%{release} -Requires: %{name}-vendor-HTMLPurifier = 1:%{version}-%{release} -Requires: %{name}-vendor-JShrink = %{version}-%{release} -Requires: %{name}-vendor-lessphp = %{version}-%{release} -Requires: %{name}-vendor-Parsedown = %{version}-%{release} - -%define basedir %{_datadir}/%{name} -%define bindir %{_bindir} -%define configdir %{_sysconfdir}/%{name} -%define logdir %{_localstatedir}/log/%{name} -%define phpdir %{_datadir}/php -%define icingawebgroup icingaweb2 -%define docsdir %{_datadir}/doc/%{name} - - -%description -Icinga Web 2 - - -%package common -Summary: Common files for Icinga Web 2 and the Icinga CLI -Group: Applications/System -%{?amzn:Requires(pre): shadow-utils} -%{?fedora:Requires(pre): shadow-utils} -%{?rhel:Requires(pre): shadow-utils} -%{?suse_version:Requires(pre): pwdutils} -%if 0%{?suse_version} > 1320 -Requires(pre): system-user-wwwrun -%endif - -%description common -Common files for Icinga Web 2 and the Icinga CLI - - -%package -n php-Icinga -Summary: Icinga Web 2 PHP library -Group: Development/Libraries -Requires: %{php_common} >= %{php_version} -Requires: %{php}-gd %{php}-intl %{php}-mbstring -%{?rhel:Requires: %{php}-pdo %{php}-xml} -%if 0%{?rhel} >= 8 || 0%{?fedora} >= 30 -Requires: %{php}-json -%endif rhel >= 8 || fedora >= 30 -Requires: %{name}-vendor-zf1 = %{version}-%{release} -%{?amzn:Requires: %{php}-pecl-imagick} -%{?fedora:Requires: php-pecl-imagick} -%{?suse_version:Requires: %{php}-gettext %{php}-json %{php}-openssl %{php}-posix} - -%description -n php-Icinga -Icinga Web 2 PHP library - - -%package -n icingacli -Summary: Icinga CLI -Group: Applications/System -Requires: icinga-l10n -Requires: %{name}-common = %{version}-%{release} -Requires: php-Icinga = %{version}-%{release} -Requires: bash-completion -Requires: %{php_cli} >= %{php_version} -%if 0%{?suse_version} -# conflict with older PHP on SLES and openSUSE -Conflicts: php < %{php_version} -Conflicts: php5 < %{php_version} -Conflicts: php53 -%endif - - -%description -n icingacli -Icinga CLI - - -%if 0%{?use_selinux} -%define selinux_variants mls targeted - -%package selinux -Summary: SELinux policy for Icinga Web 2 -BuildRequires: checkpolicy, selinux-policy-devel, hardlink -Requires: %{name} = %{version}-%{release} -Requires(post): policycoreutils -Requires(postun): policycoreutils - -%description selinux -SELinux policy for Icinga Web 2 -%endif - - -%package vendor-dompdf -Summary: Icinga Web 2 vendor library dompdf -Group: Development/Libraries -License: LGPLv2.1 -Requires: %{php_common} >= %{php_version} -Requires: %{name}-common = %{version}-%{release} - -%description vendor-dompdf -Icinga Web 2 vendor library dompdf - - -%package vendor-HTMLPurifier -Epoch: 1 -Summary: Icinga Web 2 vendor library HTMLPurifier -Group: Development/Libraries -License: LGPLv2.1 -Requires: %{php_common} >= %{php_version} -Requires: %{name}-common = %{version}-%{release} - -%description vendor-HTMLPurifier -Icinga Web 2 vendor library HTMLPurifier - - -%package vendor-JShrink -Summary: Icinga Web 2 vendor library JShrink -Group: Development/Libraries -License: BSD -Requires: %{php_common} >= %{php_version} -Requires: %{name}-common = %{version}-%{release} - -%description vendor-JShrink -Icinga Web 2 vendor library JShrink - - -%package vendor-lessphp -Summary: Icinga Web 2 vendor library lessphp -Group: Development/Libraries -License: MIT -Requires: %{php_common} >= %{php_version} -Requires: %{name}-common = %{version}-%{release} - -%description vendor-lessphp -Icinga Web 2 vendor library lessphp - - -%package vendor-Parsedown -Summary: Icinga Web 2 vendor library Parsedown -Group: Development/Libraries -License: MIT -Requires: %{php_common} >= %{php_version} -Requires: %{name}-common = %{version}-%{release} - -%description vendor-Parsedown -Icinga Web 2 vendor library Parsedown - - -%package vendor-zf1 -Summary: Icinga Web 2's fork of Zend Framework 1 -Group: Development/Libraries -License: BSD -Requires: %{php_common} >= %{php_version} -Obsoletes: %{name}-vendor-Zend < 1.12.20 -Requires: %{name}-common = %{version}-%{release} - -%description vendor-zf1 -Icinga Web 2's fork of Zend Framework 1 - - -%prep -%setup -q -%if 0%{?use_selinux} -mkdir selinux -cp -p packages/selinux/icingaweb2.{fc,if,te} selinux -%endif - -%build -%if 0%{?use_selinux} -cd selinux -for selinuxvariant in %{selinux_variants} -do - make NAME=${selinuxvariant} -f /usr/share/selinux/devel/Makefile - mv icingaweb2.pp icingaweb2.pp.${selinuxvariant} - make NAME=${selinuxvariant} -f /usr/share/selinux/devel/Makefile clean -done -cd - -%endif - -%install -rm -rf %{buildroot} -mkdir -p %{buildroot}/{%{basedir}/{modules,library/vendor,public},%{bindir},%{configdir}/modules,%{logdir},%{phpdir},%{wwwconfigdir},%{_sysconfdir}/bash_completion.d,%{docsdir}} -cp -prv application doc %{buildroot}/%{basedir} -cp -pv etc/bash_completion.d/icingacli %{buildroot}/%{_sysconfdir}/bash_completion.d/icingacli -cp -prv modules/{monitoring,setup,doc,translation} %{buildroot}/%{basedir}/modules -cp -prv library/Icinga %{buildroot}/%{phpdir} -cp -prv library/vendor/{dompdf,HTMLPurifier*,JShrink,lessphp,Parsedown,Zend} %{buildroot}/%{basedir}/library/vendor -cp -prv public/{css,font,img,js,error_norewrite.html,error_unavailable.html} %{buildroot}/%{basedir}/public -%if 0%{?php_fpm:1} -cp -pv packages/files/apache/icingaweb2.fpm.conf %{buildroot}/%{wwwconfigdir}/icingaweb2.conf -%else -cp -pv packages/files/apache/icingaweb2.conf %{buildroot}/%{wwwconfigdir}/icingaweb2.conf -%endif -cp -pv packages/files/bin/icingacli %{buildroot}/%{bindir} -%if 0%{?php_bin:1} -sed -i '1 s~#!.*~#!%{php_bin}~' %{buildroot}/%{bindir}/icingacli -%endif -cp -pv packages/files/public/index.php %{buildroot}/%{basedir}/public -cp -prv etc/schema %{buildroot}/%{docsdir} -cp -prv packages/files/config/modules/{setup,translation} %{buildroot}/%{configdir}/modules -%if 0%{?use_selinux} -cd selinux -for selinuxvariant in %{selinux_variants} -do - install -d %{buildroot}%{_datadir}/selinux/${selinuxvariant} - install -p -m 644 icingaweb2.pp.${selinuxvariant} %{buildroot}%{_datadir}/selinux/${selinuxvariant}/icingaweb2.pp -done -cd - -# TODO: Fix build problems on Icinga, see https://github.com/Icinga/puppet-icinga_build/issues/11 -#/usr/sbin/hardlink -cv %{buildroot}%{_datadir}/selinux -%endif - -%pre -getent group icingacmd >/dev/null || groupadd -r icingacmd -%if 0%{?suse_version} && 0%{?suse_version} < 01200 -usermod -A icingacmd,%{icingawebgroup} %{wwwuser} -%else -usermod -a -G icingacmd,%{icingawebgroup} %{wwwuser} -%endif -exit 0 - -%clean -rm -rf %{buildroot} - -%files -%defattr(-,root,root) -%{basedir}/application/controllers -%{basedir}/application/fonts -%{basedir}/application/forms -%{basedir}/application/layouts -%{basedir}/application/views -%{basedir}/application/VERSION -%{basedir}/doc -%{basedir}/modules -%{basedir}/public -%if 0%{?suse_version} -# for lint on OBS -%dir %{dirname:%{wwwconfigdir}} -%dir %{wwwconfigdir} -%endif -%config(noreplace) %{wwwconfigdir}/icingaweb2.conf -%attr(2775,root,%{icingawebgroup}) %dir %{logdir} -%attr(2770,root,%{icingawebgroup}) %config(noreplace) %dir %{configdir}/modules/setup -%attr(0660,root,%{icingawebgroup}) %config(noreplace) %{configdir}/modules/setup/config.ini -%attr(2770,root,%{icingawebgroup}) %config(noreplace) %dir %{configdir}/modules/translation -%attr(0660,root,%{icingawebgroup}) %config(noreplace) %{configdir}/modules/translation/config.ini -%{docsdir} -%docdir %{docsdir} - - -%pre common -getent group %{icingawebgroup} >/dev/null || groupadd -r %{icingawebgroup} -exit 0 - -%files common -%defattr(-,root,root) -%dir %{basedir} -%dir %{basedir}/application -%dir %{basedir}/library -%dir %{basedir}/library/vendor -%dir %{basedir}/modules -%{basedir}/application/locale -%attr(2770,root,%{icingawebgroup}) %config(noreplace) %dir %{configdir} -%attr(2770,root,%{icingawebgroup}) %config(noreplace) %dir %{configdir}/modules - - -%files -n php-Icinga -%defattr(-,root,root) -%if 0%{?suse_version} -# for lint on OBS -%dir %{phpdir} -%endif -%{phpdir}/Icinga - - -%files -n icingacli -%defattr(-,root,root) -%{basedir}/application/clicommands -%{_sysconfdir}/bash_completion.d/icingacli -%attr(0755,root,root) %{bindir}/icingacli - - -%if 0%{?use_selinux} -%post selinux -for selinuxvariant in %{selinux_variants} -do - %{_sbindir}/semodule -s ${selinuxvariant} -i %{_datadir}/selinux/${selinuxvariant}/icingaweb2.pp &> /dev/null || : -done -%{_sbindir}/restorecon -R %{basedir} &> /dev/null || : -%{_sbindir}/restorecon -R %{configdir} &> /dev/null || : -%{_sbindir}/restorecon -R %{logdir} &> /dev/null || : - -%postun selinux -if [ $1 -eq 0 ] ; then - for selinuxvariant in %{selinux_variants} - do - %{_sbindir}/semodule -s ${selinuxvariant} -r icingaweb2 &> /dev/null || : - done - [ -d %{basedir} ] && %{_sbindir}/restorecon -R %{basedir} &> /dev/null || : - [ -d %{configdir} ] && %{_sbindir}/restorecon -R %{configdir} &> /dev/null || : - [ -d %{logdir} ] && %{_sbindir}/restorecon -R %{logdir} &> /dev/null || : -fi - -%files selinux -%defattr(-,root,root,0755) -%doc selinux/* -%{_datadir}/selinux/*/icingaweb2.pp -%endif - - -%files vendor-dompdf -%defattr(-,root,root) -%{basedir}/library/vendor/dompdf - - -%files vendor-HTMLPurifier -%defattr(-,root,root) -%{basedir}/library/vendor/HTMLPurifier -%{basedir}/library/vendor/HTMLPurifier.autoload.php -%{basedir}/library/vendor/HTMLPurifier.php - - -%files vendor-JShrink -%defattr(-,root,root) -%{basedir}/library/vendor/JShrink - - -%files vendor-lessphp -%defattr(-,root,root) -%{basedir}/library/vendor/lessphp - - -%files vendor-Parsedown -%defattr(-,root,root) -%{basedir}/library/vendor/Parsedown - - -%files vendor-zf1 -%defattr(-,root,root) -%{basedir}/library/vendor/Zend - -%changelog -* Tue Aug 18 2020 Johannes Meyer 2.8.2-1 -- Update to 2.8.2 - -* Mon Jun 29 2020 Johannes Meyer 2.8.1-1 -- Update to 2.8.1 - -* Mon Jun 8 2020 Johannes Meyer 2.8.0-1 -- Update to 2.8.0 -- Add new requirement for package icinga-l10n -- [EPEL 7] We now require PHP 7.3 instead of PHP 7.1 -- Please check uprading docs at /usr/share/icingaweb2/doc/80-Upgrading.md - -* Fri Oct 18 2019 Johannes Meyer 2.7.3-1 -- Update to 2.7.3 - -* Wed Oct 16 2019 Johannes Meyer 2.7.2-1 -- Update to 2.7.2 - -* Wed Aug 14 2019 Johannes Meyer 2.7.1-1 -- Update to 2.7.1 - -* Tue Jul 30 2019 Johannes Meyer 2.7.0-1 -- Update to 2.7.0 - -* Wed Apr 24 2019 Johannes Meyer 2.6.3-1 -- Update to 2.6.3 - -* Wed Nov 21 2018 Eric Lippmann 2.6.2-1 -- Update to 2.6.2 - -* Thu Aug 02 2018 Eric Lippmann 2.6.1-1 -- Update to 2.6.1 - -* Thu Jul 19 2018 Blerim Sheqa 2.6.0-1 -- Update to 2.6.0 - -* Fri Apr 27 2018 Eric Lippmann 2.5.3-1 -- Update to 2.5.3 - -* Thu Apr 26 2018 Eric Lippmann 2.5.2-1 -- Update to 2.5.2 - -* Mon Jan 22 2018 Markus Frosch 2.5.1-1 -- Update to 2.5.1 -- Remove FPM patches - -* Wed Nov 29 2017 Eric Lippmann 2.5.0-2 -- FPM: Add patch to support both Apache >= 2.4 and Apache < 2.4 - -* Tue Nov 28 2017 Eric Lippmann 2.5.0-1 -- Install error_unavailable.html -- Add patch to fix Apache FPM config - -* Mon Nov 27 2017 Markus Frosch 2.5.0-1 -- Update to 2.5.0 -- All packages now require PHP >= 5.6 -- [EPEL 6 + 7] We now require PHP 7 from SCL packages, php-fpm as runtime engine -- [SUSE / openSUSE] Requirements will force the installation of php7 -- Please check upgrading docs at /usr/share/icingaweb2/doc/80-Upgrading.md - -* Thu Sep 28 2017 Markus Frosch 2.4.2-1 -- Update to 2.4.2 diff --git a/fedora/SPECS/mod_auth_openidc.spec b/fedora/SPECS/mod_auth_openidc.spec index 8068251..b910a9a 100644 --- a/fedora/SPECS/mod_auth_openidc.spec +++ b/fedora/SPECS/mod_auth_openidc.spec @@ -14,7 +14,7 @@ %global httpd_pkg_cache_dir /var/cache/httpd/mod_auth_openidc Name: mod_auth_openidc -Version: 2.4.12 +Version: 2.4.12.1 Release: 1%{?dist} Summary: OpenID Connect auth module for Apache HTTP Server @@ -94,11 +94,9 @@ install -m 700 -d $RPM_BUILD_ROOT%{httpd_pkg_cache_dir}/cache %dir %attr(0700, apache, apache) %{httpd_pkg_cache_dir}/cache %changelog -* Wed Oct 19 2022 Daniel Steiner -- Update to 2.4.12. - -* Fri Aug 26 2022 Daniel Steiner -- Update to 2.4.11.3. +* Fri Nov 25 2022 Daniel Steiner +- Update to 2.4.12.1. +- First build on Fedora 37. * Fri Jun 24 2022 Daniel Steiner - Update to 2.4.11.2. diff --git a/fedora/SPECS/mod_tile.spec b/fedora/SPECS/mod_tile.spec index 478b469..faaf4f7 100644 --- a/fedora/SPECS/mod_tile.spec +++ b/fedora/SPECS/mod_tile.spec @@ -107,6 +107,9 @@ fi %attr(0775, %{geo_user}, %{geo_user}) %dir %{_rundir}/%{daemon_name} %changelog +* Fri Nov 25 2022 Daniel Steiner +- First build on Fedora 37. + * Fri Mar 25 2022 Daniel Steiner - Build dependencies added diff --git a/fedora/SPECS/mydumper.spec b/fedora/SPECS/mydumper.spec index a9cad37..0f305dc 100644 --- a/fedora/SPECS/mydumper.spec +++ b/fedora/SPECS/mydumper.spec @@ -1,17 +1,15 @@ # to build agains mariadb libraries, set it to 0 -%define _ver 3 %define _mysql 0 -# leaf it empty, if the original release is with -X at the end: -%define subver -%{_ver} +%define _rel 3 Name: mydumper Summary: mydumper and myloader MySQL backup tools Version: 0.12.7 -Release: %{_ver}%{?dist} +Release: 1%{?dist} Group: Applications/Databases License: GPL Vendor: Max Bubenick URL: https://github.com/maxbube/mydumper -Source: mydumper-%{version}%{subver}.tar.gz +Source: mydumper-%{version}-%{_rel}.tar.gz BuildArch: x86_64 AutoReq: no %if 0%{?_mysql} @@ -42,7 +40,7 @@ easier to manage output, consistency, manageability. myloader is a tool used for multi-threaded restoration of mydumper backups. %prep -%setup -q -n %{name}-%{version}%{subver} +%setup -q -n %{name}-%{version}-%{_rel} %build # required for Fedora 36: @@ -68,10 +66,8 @@ rm -rf ${RPM_BUILD_ROOT} %{_mandir}/man1/* %changelog -* Fri Sep 23 2022 Daniel Steiner -- Update to 0.12.7-3. - -* Fri Sep 16 2022 Daniel Steiner +* Fri Nov 25 2022 Daniel Steiner +- First build on Fedora 37. - Update to 0.12.7. * Fri Jun 24 2022 Daniel Steiner diff --git a/fedora/SPECS/navidrome.spec b/fedora/SPECS/navidrome.spec index a415b9b..20abaf8 100644 --- a/fedora/SPECS/navidrome.spec +++ b/fedora/SPECS/navidrome.spec @@ -3,7 +3,7 @@ %define debug_package %{nil} Name: navidrome Version: 0.48.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Navidrome is a self-hosted, open source music server and streamer Group: System @@ -100,6 +100,9 @@ fi %{_systemd_util_dir}/system/%{name}.service %changelog +* Fri Nov 25 2022 Daniel Steiner +- Fix for systemd configuration. + * Fri Nov 25 2022 Daniel Steiner - First build for Fedora 37.