Merge pull request #2 from thardeck/opensuse-sles-changes

Fix issues and improve spec for SLE submit request
This commit is contained in:
Markus Frosch 2018-02-19 07:53:59 +01:00 committed by GitHub
commit 37104df3f5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -81,8 +81,8 @@ Summary: Network monitoring application
Name: icinga2
Version: 2.8.1
Release: %{revision}%{?dist}
License: GPLv2+
URL: https://www.icinga.com/
License: GPL-2.0+
Url: https://www.icinga.com/
Group: System/Monitoring
Source: https://github.com/Icinga/%{name}/archive/v%{version}.tar.gz
@ -108,14 +108,14 @@ BuildRequires: libedit-devel
BuildRequires: ncurses-devel
%if "%{_vendor}" == "suse" && 0%{?suse_version} < 1210
BuildRequires: gcc48-c++
BuildRequires: libstdc++48-devel
BuildRequires: libopenssl1-devel
BuildRequires: libstdc++48-devel
%else
%if "%{_vendor}" == "redhat" && (0%{?el5} || 0%{?rhel} == 5 || "%{?dist}" == ".el5" || 0%{?el6} || 0%{?rhel} == 6 || "%{?dist}" == ".el6")
# Requires devtoolset-2 scl
BuildRequires: devtoolset-2-binutils
BuildRequires: devtoolset-2-gcc-c++
BuildRequires: devtoolset-2-libstdc++-devel
BuildRequires: devtoolset-2-binutils
%define scl_enable scl enable devtoolset-2 --
%else
BuildRequires: gcc-c++
@ -123,9 +123,9 @@ BuildRequires: libstdc++-devel
%endif
BuildRequires: openssl-devel
%endif
BuildRequires: bison
BuildRequires: cmake
BuildRequires: flex >= 2.5.35
BuildRequires: bison
BuildRequires: make
%if 0%{?build_icinga_org} && "%{_vendor}" == "redhat" && (0%{?el5} || 0%{?rhel} == 5 || "%{?dist}" == ".el5" || 0%{?el6} || 0%{?rhel} == 6 || "%{?dist}" == ".el6")
@ -137,10 +137,10 @@ BuildRequires: boost153-devel
BuildRequires: boost153-devel
%else
%if "%{_vendor}" == "suse" && 0%{?suse_version} > 1320
BuildRequires: libboost_thread-devel >= 1.48
BuildRequires: libboost_program_options-devel >= 1.48
BuildRequires: libboost_regex-devel >= 1.48
BuildRequires: libboost_system-devel >= 1.48
BuildRequires: libboost_thread-devel >= 1.48
%else
%if (0%{?el5} || 0%{?rhel} == 5 || "%{?dist}" == ".el5" || 0%{?el6} || 0%{?rhel} == 6 || "%{?dist}" == ".el6")
# Requires EPEL repository
@ -252,16 +252,17 @@ IDOUtils schema >= 1.12
%package selinux
Summary: SELinux policy module supporting icinga2
Group: System/Base
BuildRequires: checkpolicy, selinux-policy-devel, hardlink
BuildRequires: checkpolicy
BuildRequires: hardlink
BuildRequires: selinux-policy-devel
Requires: %{name} = %{version}-%{release}
Requires(post): policycoreutils-python
Requires(postun): policycoreutils-python
%description selinux
SELinux policy module supporting icinga2
SELinux policy module supporting icinga2.
%endif
%package -n vim-icinga2
Summary: Vim syntax highlighting for icinga2
Group: Productivity/Text/Editors
@ -273,7 +274,7 @@ Requires: vim-filesystem
%endif
%description -n vim-icinga2
Vim syntax highlighting for icinga2
Provides Vim syntax highlighting for icinga2.
%package -n nano-icinga2
@ -282,10 +283,14 @@ 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 %{name}-%{version}
# 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
%build
CMAKE_OPTS="-DCMAKE_INSTALL_PREFIX=/usr \
@ -377,9 +382,14 @@ rm -f %{buildroot}/%{_sysconfdir}/%{name}/features-enabled/*.conf
%else
ln -sf ../../%{_initrddir}/%{name} "%{buildroot}%{_sbindir}/rc%{name}"
%endif
%if ( 0%{?sle_version} >= 150000 && 0%{?is_opensuse} ) || 0%{?suse_version} > 1500
mkdir -p "%{buildroot}%{_fillupdir}/"
mv "%{buildroot}%{_sysconfdir}/sysconfig/%{name}" "%{buildroot}%{_fillupdir}/sysconfig.%{name}"
%else
mkdir -p "%{buildroot}%{_localstatedir}/adm/fillup-templates/"
mv "%{buildroot}%{_sysconfdir}/sysconfig/%{name}" "%{buildroot}%{_localstatedir}/adm/fillup-templates/sysconfig.%{name}"
%endif
%endif
%if 0%{?use_selinux}
cd tools/selinux
@ -631,7 +641,11 @@ fi
%endif
%if "%{_vendor}" == "suse"
%{_sbindir}/rc%{name}
%if ( 0%{?sle_version} >= 150000 && 0%{?is_opensuse} ) || 0%{?suse_version} > 1500
%{_fillupdir}/sysconfig.%{name}
%else
%{_localstatedir}/adm/fillup-templates/sysconfig.%{name}
%endif
%else
%config(noreplace) %{_sysconfdir}/sysconfig/%{name}
%endif
@ -659,13 +673,12 @@ 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
%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
%attr(0750,%{icinga_user},%{icinga_group}) %dir %{_datadir}/%{name}/include
%{_datadir}/%{name}/include
%attr(0750,%{icinga_user},%{icinga_group}) %{_datadir}/%{name}/include
%files doc
%defattr(-,root,root,-)