Changes - j0ke.net Open Build Service

Changes of Revision 36

[-] [+]	Changed	icinga.changes
@@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Tue May 15 19:57:36 UTC 2012 - cs@linux-administrator.com + +- update to release 1.7.0 + +------------------------------------------------------------------- Fri Dec 2 21:09:39 UTC 2011 - cs@linux-administrator.com - update to release 1.6.1
[-] [+]	Changed	icinga.spec ^
@@ -1,7 +1,7 @@ #!BuildIgnore: post-build-checks %define name icinga -%define version 1.6.1 -%define pkgversion 1.6.1 +%define version 1.7.0 +%define pkgversion 1.7.0 %define release 1 %define nsusr icinga %define nsgrp icinga @@ -62,7 +62,7 @@ Summary: Provides the HTML and CGI files for the Nagios web interface Requires: %{name} = %{version} Requires: http_daemon -Provides: icinga-api = %{version} +#Provides: icinga-api = %{version} %description www Nagios is a program that will monitor hosts and services on your @@ -205,8 +205,9 @@ --with-icinga-group=%{nsgrp} \ --prefix=%{_prefix} \ --exec-prefix=%{_prefix}/sbin \ - --bindir=%{_prefix}/sbin \ + --bindir=%{_sbindir} \ --sbindir=%{_prefix}/lib/icinga/cgi \ + --libdir=%{_libdir}/icinga \ --libexecdir=%{_prefix}/lib/icinga/plugins \ --datarootdir=%{_prefix}/share/icinga \ --datadir=%{_prefix}/share/icinga \ @@ -254,30 +255,30 @@ done cd ../.. -cd module/icinga-api -./configure \ - --host=%{arch}-suse-linux-gnu \ - --build=%{arch}-suse-linux-gnu \ - --target=%{arch}-suse-linux \ - --prefix=%{_prefix} \ - --exec-prefix=%{_prefix}/sbin \ - --bindir=%{_prefix}/sbin \ - --sbindir=%{_prefix}/lib/icinga/cgi \ - --libexecdir=%{_prefix}/lib/icinga/plugins \ - --datarootdir=%{_prefix}/share/icinga \ - --datadir=%{_prefix}/share/icinga \ - --mandir=%{_mandir} \ - --docdir=%{_docdir}/%{name} \ - --sysconfdir=/etc/icinga \ - --localstatedir=/var/log/icinga \ - --with-phpapi-log-dir=%{logdir}/api \ - --with-icinga-user=%{nsusr} \ - --with-icinga-group=%{nsgrp} \ - --with-command-user=%{nsusr} \ - --with-command-group=%{cmdgrp} \ - --with-web-user=%{wwwusr} \ - --with-web-group=%{wwwgrp} -%__make all +#cd module/icinga-api +#./configure \ +# --host=%{arch}-suse-linux-gnu \ +# --build=%{arch}-suse-linux-gnu \ +# --target=%{arch}-suse-linux \ +# --prefix=%{_prefix} \ +# --exec-prefix=%{_prefix}/sbin \ +# --bindir=%{_prefix}/sbin \ +# --sbindir=%{_prefix}/lib/icinga/cgi \ +# --libexecdir=%{_prefix}/lib/icinga/plugins \ +# --datarootdir=%{_prefix}/share/icinga \ +# --datadir=%{_prefix}/share/icinga \ +# --mandir=%{_mandir} \ +# --docdir=%{_docdir}/%{name} \ +# --sysconfdir=/etc/icinga \ +# --localstatedir=/var/log/icinga \ +# --with-phpapi-log-dir=%{logdir}/api \ +# --with-icinga-user=%{nsusr} \ +# --with-icinga-group=%{nsgrp} \ +# --with-command-user=%{nsusr} \ +# --with-command-group=%{cmdgrp} \ +# --with-web-user=%{wwwusr} \ +# --with-web-group=%{wwwgrp} +#%__make all %install [ "$RPM_BUILD_ROOT" != "/" ] && rm -rf $RPM_BUILD_ROOT @@ -333,8 +334,8 @@ done cd ../.. -cd module/icinga-api -make INSTALL=install DESTDIR=${RPM_BUILD_ROOT} INSTALL_OPTS="" INSTALL_OPTS_WEB="" COMMAND_OPTS="" install +#cd module/icinga-api +#make INSTALL=install DESTDIR=${RPM_BUILD_ROOT} INSTALL_OPTS="" INSTALL_OPTS_WEB="" COMMAND_OPTS="" install install -d -m 0755 ${RPM_BUILD_ROOT}/var/log/icinga/rw @@ -358,10 +359,11 @@ %{_sbindir}/mini_epn %{_sbindir}/new_mini_epn %{_sbindir}/ido2db -%{_sbindir}/idomod.o +#%{_sbindir}/idomod.o %{_sbindir}/log2ido %{_sbindir}/rcicinga %{_sbindir}/rcido2db +%{_libdir}/icinga/idomod.so %dir %{_prefix}/lib/icinga/eventhandlers %{_prefix}/lib/icinga/eventhandlers/* %{_sbindir}/convertcfg @@ -401,7 +403,7 @@ %dir %{logdir}/cgi %{logdir}/cgi/index.htm %{logdir}/cgi/.htaccess -%dir %{logdir}/api +##%dir %{logdir}/api %files devel %defattr(-,root,root)
	Changed	icinga-1.7.0.tar.bz2 ^