Merge branch 'feature/clean-up-spec-file-6919'

fixes #6919
This commit is contained in:
Gunnar Beutner 2014-08-17 11:41:06 +02:00
commit 738d8c6bdf
1 changed files with 3 additions and 5 deletions

View File

@ -68,8 +68,6 @@ Source: https://github.com/Icinga/%{name}/archive/v%{version}.tar.gz
URL: http://www.icinga.org/ URL: http://www.icinga.org/
BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRoot: %{_tmppath}/%{name}-%{version}-build
Requires: %{name}-bin = %{version} Requires: %{name}-bin = %{version}
#Requires: %{name}-ido-mysql = %{version}
#Requires: %{icingaweb2name} >= %{icingaweb2version}
%description %description
Meta package for Icinga 2 Core, DB IDO and Web. Meta package for Icinga 2 Core, DB IDO and Web.
@ -274,7 +272,7 @@ exit 0
# all restart/feature actions belong to icinga2-bin # all restart/feature actions belong to icinga2-bin
%post bin %post bin
# suse # suse
%if 0%{?suse_version} %if "%{_vendor}" == "suse"
%if 0%{?suse_version} >= 1310 %if 0%{?suse_version} >= 1310
%set_permissions /var/run/icinga2/cmd %set_permissions /var/run/icinga2/cmd
%endif %endif
@ -312,7 +310,7 @@ exit 0
%postun bin %postun bin
# suse # suse
%if 0%{?suse_version} %if "%{_vendor}" == "suse"
%if 0%{?using_systemd} %if 0%{?using_systemd}
%service_del_postun %{name}.service %service_del_postun %{name}.service
%else %else
@ -343,7 +341,7 @@ exit 0
%preun bin %preun bin
# suse # suse
%if 0%{?suse_version} %if "%{_vendor}" == "suse"
%if 0%{?use_systemd} %if 0%{?use_systemd}
%service_del_preun %{name}.service %service_del_preun %{name}.service