Hello community, here is the log from the commit of package icinga2 for openSUSE:Factory checked in at 2018-02-26 23:27:15 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/icinga2 (Old) and /work/SRC/openSUSE:Factory/.icinga2.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "icinga2" Mon Feb 26 23:27:15 2018 rev:4 rq:580326 version:2.8.1 Changes: -------- --- /work/SRC/openSUSE:Factory/icinga2/icinga2.changes 2018-02-12 10:14:00.244123455 +0100 +++ /work/SRC/openSUSE:Factory/.icinga2.new/icinga2.changes 2018-02-26 23:27:35.125082992 +0100 @@ -1,0 +2,5 @@ +Mon Feb 19 18:08:27 UTC 2018 - [email protected] + +- incorporate spec changes from upstream + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ icinga2.spec ++++++ --- /var/tmp/diff_new_pack.g3SOQM/_old 2018-02-26 23:27:36.705026168 +0100 +++ /var/tmp/diff_new_pack.g3SOQM/_new 2018-02-26 23:27:36.709026024 +0100 @@ -52,7 +52,7 @@ %endif %if "%{_vendor}" == "suse" -%define plugindir %{_prefix}/lib/nagios/plugins +%define plugindir %{_libexecdir}/nagios/plugins %define apachename apache2 %define apacheconfdir %{_sysconfdir}/apache2/conf.d %define apacheuser wwwrun @@ -73,8 +73,6 @@ %define icinga_user icinga %define icinga_group icinga %define icingacmd_group icingacmd -%define icingaweb2name icingaweb2 -%define icingaweb2version 2.0.0 %define logmsg logger -t %{name}/rpm @@ -100,7 +98,6 @@ Group: System/Monitoring %if "%{_vendor}" == "suse" -PreReq: permissions Provides: monitoring_daemon Recommends: monitoring-plugins %if 0%{?suse_version} >= 1310 @@ -130,9 +127,6 @@ BuildRequires: cmake BuildRequires: flex >= 2.5.35 BuildRequires: make -%if 0%{?fedora} -BuildRequires: wxGTK3-devel -%endif %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 @@ -159,7 +153,7 @@ %endif %if 0%{?use_systemd} -BuildRequires: systemd +BuildRequires: systemd-devel Requires: systemd %endif @@ -178,6 +172,7 @@ %endif BuildRequires: logrotate %if "%{_vendor}" == "suse" +PreReq: permissions Provides: group(%{icinga_group}) Provides: group(%{icingacmd_group}) Provides: user(%{icinga_user}) @@ -214,7 +209,7 @@ Requires: %{name}-common = %{version}-%{release} %description libs -This subpackage provides the internal libraries for the daemon or studio. +This subpackage provides the internal libraries for the daemon. %package ido-mysql @@ -269,17 +264,6 @@ SELinux policy module supporting icinga2. %endif -%if 0%{?fedora} -%package studio -Summary: Studio for Icinga 2 -Group: System/Monitoring -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: Productivity/Text/Editors @@ -304,8 +288,10 @@ %prep %setup -q -n %{name}-%{version} -#rpmlintrc +# 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 \ @@ -420,24 +406,6 @@ #/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 -%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 @@ -457,27 +425,18 @@ %if 0%{?use_systemd} %service_add_pre %{name}.service %endif -%endif -%if "%{_vendor}" == "suse" -%verifyscript bin +%verifyscript common %verify_permissions -e %{_rundir}/%{name}/cmd %endif -%post bin - +%post common # 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 @@ -649,16 +608,6 @@ %exclude %{_datadir}/%{name}/include %{_mandir}/man8/%{name}.8.gz -%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 %{_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.md @@ -670,7 +619,6 @@ %files common %defattr(-,root,root,-) %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} %if 0%{?use_systemd} @@ -710,11 +658,19 @@ %dir %{_libexecdir}/%{name} %{_libexecdir}/%{name}/prepare-dirs %{_libexecdir}/%{name}/safe-reload +%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 %attr(0750,%{icinga_user},%{icinga_group}) %dir %{_datadir}/%{name}/include -%{_datadir}/%{name}/include +%{_datadir}/%{name}/include/* %files doc %defattr(-,root,root,-) @@ -742,14 +698,6 @@ %{_datadir}/selinux/*/%{selinux_modulename}.pp %endif -%if 0%{?fedora} -%files studio -%defattr(-,root,root,-) -%{_bindir}/icinga-studio -%{_datadir}/icinga2-studio -%{_datadir}/applications/icinga2-studio.desktop -%endif - %files -n vim-icinga2 %defattr(-,root,root,-) %if "%{_vendor}" == "suse"
