]> granicus.if.org Git - icinga2/blobdiff - icinga2.spec
projects / icinga2 / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Docs: Add a note for upgrading with removed classicui-config package
[icinga2] / icinga2.spec
diff --git a/icinga2.spec b/icinga2.spec
index f19dcd8934e71cdae2b3b87cd97d75fcdfe649ef..4eaa3e72c083b683145b9a1f89ac79263aab91c8 100644 (file)
--- a/icinga2.spec
+++ b/icinga2.spec
@@ -25,13 +25,14 @@
 %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%{?el5}%{?el6}%{?amzn}
 %define use_systemd 0
 %if %(uname -m) != "x86_64"
 %define march_flag -march=i686
@@ -43,6 +44,7 @@
 %endif
 
 %if "%{_vendor}" == "suse"
+%define plugindir %{_prefix}/lib/nagios/plugins
 %define apachename apache2
 %define apacheconfdir  %{_sysconfdir}/apache2/conf.d
 %define apacheuser wwwrun
@@ -60,14 +62,11 @@
 %define icingaweb2name icingaweb2
 %define icingaweb2version 2.0.0
 
-# DEPRECATED
-%define icingaclassicconfdir %{_sysconfdir}/icinga
-
 %define logmsg logger -t %{name}/rpm
 
 Summary: Network monitoring application
 Name: icinga2
-Version: 2.6.3
+Version: 2.7.1
 Release: %{revision}%{?dist}
 License: GPL-2.0+
 Group: Applications/System
@@ -102,6 +101,7 @@ BuildRequires: libopenssl1-devel
 # Requires devtoolset-2 scl
 BuildRequires: devtoolset-2-gcc-c++
 BuildRequires: devtoolset-2-libstdc++-devel
+BuildRequires: devtoolset-2-binutils
 %define scl_enable scl enable devtoolset-2 --
 %else
 BuildRequires: gcc-c++
@@ -148,12 +148,23 @@ Provides binaries for Icinga 2 Core.
 %package common
 Summary:      Common Icinga 2 configuration
 Group:        Applications/System
-%if "%{_vendor}" == "redhat"
-Requires(pre): shadow-utils
+%if (0%{?amzn} || 0%{?fedora} || 0%{?rhel})
+Requires(pre):  shadow-utils
 Requires(post): shadow-utils
 %endif
 %if "%{_vendor}" == "suse"
-Recommends:   logrotate
+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
@@ -213,25 +224,6 @@ Requires: %{name} = %{version}-%{release}
 Icinga 2 IDO PostgreSQL database backend. Compatible with Icinga 1.x
 IDOUtils schema >= 1.12
 
-
-# DEPRECATED
-%package classicui-config
-Summary:      Icinga 2 Classic UI Standalone configuration
-Group:        Applications/System
-BuildRequires: %{apachename}
-Requires:     %{apachename}
-Requires:     %{name} = %{version}-%{release}
-%if "%{_vendor}" == "suse"
-Recommends:   icinga-www
-%endif
-Provides:     icinga-classicui-config
-Conflicts:    icinga-gui-config
-
-# DEPRECATED
-%description classicui-config
-Icinga 1.x Classic UI Standalone configuration with locations
-for Icinga 2.
-
 %if "%{_vendor}" == "redhat" && !(0%{?el5} || 0%{?rhel} == 5 || "%{?dist}" == ".el5" || 0%{?el6} || 0%{?rhel} == 6 || "%{?dist}" == ".el6")
 %global selinux_variants mls targeted
 %{!?_selinux_policy_version: %global _selinux_policy_version %(sed -e 's,.*selinux-policy-\\([^/]*\\)/.*,\\1,' /usr/share/selinux/devel/policyhelp 2>/dev/null)}
@@ -269,9 +261,10 @@ Provides a GUI for the Icinga 2 API.
 Summary:      Vim syntax highlighting for icinga2
 Group:        Applications/System
 %if "%{_vendor}" == "suse"
-Requires:     vim-data
+BuildRequires: vim
+Requires:      vim
 %else
-Requires:     vim-filesystem
+Requires:      vim-filesystem
 %endif
 
 %description -n vim-icinga2
@@ -279,9 +272,9 @@ 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:         Applications/System
+Requires:      nano
 
 %description -n nano-icinga2
 Nano syntax highlighting for icinga2
@@ -297,6 +290,7 @@ CMAKE_OPTS="-DCMAKE_INSTALL_PREFIX=/usr \
          -DICINGA2_LTO_BUILD=ON \
          -DCMAKE_VERBOSE_MAKEFILE=ON \
          -DBoost_NO_BOOST_CMAKE=ON \
+         -DICINGA2_PLUGINDIR=%{plugindir} \
          -DICINGA2_RUNDIR=%{_rundir} \
          -DICINGA2_USER=%{icinga_user} \
          -DICINGA2_GROUP=%{icinga_group} \
@@ -324,10 +318,7 @@ CMAKE_OPTS="$CMAKE_OPTS \
 %endif
 %endif
 
-%if "%{_vendor}" != "suse"
-CMAKE_OPTS="$CMAKE_OPTS -DICINGA2_PLUGINDIR=%{_libdir}/nagios/plugins"
-%else
-%if 0%{?suse_version} < 1310
+%if "%{_vendor}" == "suse" && 0%{?suse_version} < 1310
 CMAKE_OPTS="$CMAKE_OPTS -DBOOST_LIBRARYDIR=%{_libdir}/boost153 \
  -DBOOST_INCLUDEDIR=/usr/include/boost153 \
  -DBoost_ADDITIONAL_VERSIONS='1.53;1.53.0' \
@@ -335,8 +326,6 @@ CMAKE_OPTS="$CMAKE_OPTS -DBOOST_LIBRARYDIR=%{_libdir}/boost153 \
  -DBUILD_TESTING=FALSE \
  -DBoost_NO_BOOST_CMAKE=TRUE"
 %endif
-CMAKE_OPTS="$CMAKE_OPTS -DICINGA2_PLUGINDIR=%{_prefix}/lib/nagios/plugins"
-%endif
 
 %if 0%{?use_systemd}
 CMAKE_OPTS="$CMAKE_OPTS -DUSE_SYSTEMD=ON"
@@ -367,12 +356,6 @@ cd -
 make install \
        DESTDIR="%{buildroot}"
 
-# DEPRECATED
-# 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
-
 # remove features-enabled symlinks
 rm -f %{buildroot}/%{_sysconfdir}/%{name}/features-enabled/*.conf
 
@@ -397,7 +380,8 @@ do
 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
 
 %if 0%{?fedora}
@@ -419,13 +403,8 @@ Keywords=Monitoring;" > %{buildroot}%{_datadir}/applications/icinga2-studio.desk
 %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
@@ -508,7 +487,7 @@ exit 0
 %postun common
 # suse
 %if "%{_vendor}" == "suse"
-%if 0%{?using_systemd}
+%if 0%{?use_systemd}
   %service_del_postun %{name}.service
 %else
   %restart_on_update %{name}
@@ -599,31 +578,6 @@ fi
 
 exit 0
 
-# DEPRECATED
-%post classicui-config
-if [ ${1:-0} -eq 1 ]
-then
-        # initial installation, enable features
-       for feature in statusdata compatlog command; do
-               ln -sf ../features-available/${feature}.conf %{_sysconfdir}/%{name}/features-enabled/${feature}.conf
-       done
-fi
-
-%logmsg "The icinga2-classicui-config package has been deprecated and will be removed in future releases."
-
-exit 0
-
-# DEPRECATED
-%postun classicui-config
-if [ "$1" = "0" ]; then
-        # deinstallation of the package - remove feature
-       for feature in statusdata compatlog command; do
-               rm -f %{_sysconfdir}/%{name}/features-enabled/${feature}.conf
-       done
-fi
-
-exit 0
-
 %if "%{_vendor}" == "redhat" && !(0%{?el5} || 0%{?rhel} == 5 || "%{?dist}" == ".el5" || 0%{?el6} || 0%{?rhel} == 6 || "%{?dist}" == ".el6")
 %post selinux
 for selinuxvariant in %{selinux_variants}
@@ -654,10 +608,11 @@ fi
 
 %files bin
 %defattr(-,root,root,-)
-%doc COPYING COPYING.Exceptions README.md NEWS AUTHORS ChangeLog
+%doc COPYING COPYING.Exceptions README.md NEWS AUTHORS CHANGELOG.md
 %{_sbindir}/%{name}
 %dir %{_libdir}/%{name}/sbin
 %{_libdir}/%{name}/sbin/%{name}
+%{plugindir}/check_nscp_api
 %{_datadir}/%{name}
 %exclude %{_datadir}/%{name}/include
 %{_mandir}/man8/%{name}.8.gz
@@ -674,7 +629,7 @@ fi
 
 %files libs
 %defattr(-,root,root,-)
-%doc COPYING COPYING.Exceptions README.md NEWS AUTHORS ChangeLog
+%doc COPYING COPYING.Exceptions README.md NEWS AUTHORS CHANGELOG.md
 %exclude %{_libdir}/%{name}/libdb_ido_mysql*
 %exclude %{_libdir}/%{name}/libdb_ido_pgsql*
 %dir %{_libdir}/%{name}
@@ -682,7 +637,7 @@ fi
 
 %files common
 %defattr(-,root,root,-)
-%doc COPYING COPYING.Exceptions README.md NEWS AUTHORS ChangeLog tools/syntax
+%doc COPYING COPYING.Exceptions README.md NEWS AUTHORS CHANGELOG.md tools/syntax
 %attr(0750,%{icinga_user},%{icingacmd_group}) %dir %{_localstatedir}/log/%{name}
 %config(noreplace) %{_sysconfdir}/logrotate.d/%{name}
 %{_sysconfdir}/bash_completion.d/%{name}
@@ -731,26 +686,18 @@ fi
 
 %files ido-mysql
 %defattr(-,root,root,-)
-%doc COPYING COPYING.Exceptions README.md NEWS AUTHORS ChangeLog
+%doc COPYING COPYING.Exceptions 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*
 %{_datadir}/icinga2-ido-mysql
 
 %files ido-pgsql
 %defattr(-,root,root,-)
-%doc COPYING COPYING.Exceptions README.md NEWS AUTHORS ChangeLog
+%doc COPYING COPYING.Exceptions 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*
 %{_datadir}/icinga2-ido-pgsql
 
-# DEPRECATED
-%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")
 %files selinux
 %defattr(-,root,root,0755)
@@ -769,13 +716,8 @@ fi
 %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
@@ -783,6 +725,11 @@ fi
 
 %files -n nano-icinga2
 %defattr(-,root,root,-)
+%if "%{_vendor}" == "suse"
+%dir %{_datadir}/nano
+%endif
 %{_datadir}/nano/%{name}.nanorc
 
 %changelog
+* Tue Jun 20 2017 Markus Frosch <markus.frosch@icinga.com> 2.7.0-1
+- Update to 2.7.0
Unnamed repository; edit this file 'description' to name the repository.