Changes - j0ke.net Open Build Service

Difference Between Revision 4 and server:monitoring / icinga-web

[-] [+]	Changed	icinga-web.changes
@@ -1,64 +1,4 @@ ------------------------------------------------------------------- -Wed May 1 09:51:42 UTC 2013 - cs@linux-administrator.com - -- update to release 1.8.3 - -------------------------------------------------------------------- -Wed Feb 13 10:45:59 UTC 2013 - cs@linux-administrator.com - -- update to release 1.8.2 - -------------------------------------------------------------------- -Sun Oct 21 10:33:07 UTC 2012 - cs@linux-administrator.com - -- update to release 1.8.0 - -------------------------------------------------------------------- -Tue Jun 19 08:28:52 UTC 2012 - cs@linux-administrator.com - -- update to release 1.7.1 - -------------------------------------------------------------------- -Tue May 15 20:34:50 UTC 2012 - cs@linux-administrator.com - -- update to release 1.7.0 - -------------------------------------------------------------------- -Thu Mar 1 18:46:41 UTC 2012 - cs@linux-administrator.com - -- update to release 1.6.2 - -------------------------------------------------------------------- -Fri Dec 23 19:07:24 UTC 2011 - cs@linux-administrator.com - -- update to release 1.6.1 - -------------------------------------------------------------------- -Fri Dec 2 21:10:37 UTC 2011 - cs@linux-administrator.com - -- update to release 1.6.0 - -------------------------------------------------------------------- -Mon Sep 26 18:12:35 UTC 2011 - cs@linux-administrator.com - -- update to release 1.5.2 - -------------------------------------------------------------------- -Fri Sep 9 20:47:57 UTC 2011 - cs@linux-administrator.com - -- update to release 1.5.1 - -------------------------------------------------------------------- -Thu Aug 25 21:16:00 UTC 2011 - cs@linux-administrator.com - -- update to release 1.5.0 - -------------------------------------------------------------------- -Mon Aug 15 20:16:06 UTC 2011 - cs@linux-administrator.com - -- update to release 1.5.0 beta - -------------------------------------------------------------------- Mon Aug 1 07:20:48 UTC 2011 - cs@linux-administrator.com - fix filelist entrys for config files
[-] [+]	Changed	icinga-web.spec ^
@@ -1,4 +1,9 @@ -%define pkgversion 1.8.3 +# $Id$ +# Authority: michael.friedrich(at)univie.ac.at +# Upstream: The icinga devel team <icinga-devel at lists.sourceforge.net> +# Needs icinga-api +# ExcludeDist: el4 el3 + %if "%{_vendor}" == "suse" %define apacheconfdir %{_sysconfdir}/apache2/conf.d %define apacheuser wwwrun @@ -15,17 +20,16 @@ Summary: Open Source host, service and network monitoring Web UI Name: icinga-web -Version: 1.8.3 +Version: 1.4.1 Release: 1 License: GPL Group: Applications/System URL: http://www.icinga.org/ -Source0: icinga-web-%{pkgversion}.tar.bz2 +Source0: icinga-web-%{version}.tar.bz2 Source1: icinga-web-rpmlintrc -Patch0: icinga-web-1.6.2-apacheconfig-install.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root -BuildRequires: php >= 5.2.3 php-pear php-gd php-xml php-ldap php-pdo php-dom php-spl php-xsl php-mysql php-sockets php-json pcre >= 7.6 +BuildRequires: php >= 5.2.3 php-pear php-gd php-xml php-ldap php-pdo php-dom php-spl php-xsl php-mysql pcre >= 7.6 icinga-api BuildRequires: mysql-client BuildRequires: phing @@ -39,10 +43,9 @@ Requires: php-spl Requires: php-xsl Requires: php-mysql -Requires: php-sockets -Requires: php-json Requires: pcre >= 7.6 Requires: mysql-client +Requires: icinga-api Requires: python Requires: perl AutoReqProv: off @@ -55,8 +58,7 @@ %prep ############################## -%setup -q -n %{name}-%{pkgversion} -%patch0 +%setup -q -n %{name}-%{version} ############################## %build @@ -76,14 +78,18 @@ --datarootdir="%{_datadir}/icinga-web" \ --with-web-user='%{apacheuser}' \ --with-web-group='%{apacheuser}' \ - --with-web-apache-path='%{apacheconfdir}' \ - --with-api-cmd-file=/var/log/icinga/rw/icinga.cmd \ - --with-log-dir=/var/log/icinga/api \|\| cat config.log + --with-icinga-api='%{_datadir}/icinga/icinga-api' \|\| cat config.log + +# --with-db-type, --with-db-host, --with-db-port, --with-db-name, --with-db-user, --with-db-pass + +# resolve possible wrong files for makefile +#%{__make} devclean ############################## %install ############################## +%{__rm} -rf %{buildroot} %{__make} install \ DESTDIR="%{buildroot}" \ INSTALL_OPTS="" \ @@ -91,13 +97,7 @@ INSTALL_OPTS_WEB="" \ COMMAND_OPTS="" \ INIT_OPTS="" -mkdir -p %{buildroot}%{apacheconfdir} -%{__make} install-apache-config \ - DESTDIR="%{buildroot}" -mkdir -p %{buildroot}/var/log/icinga/api -# cleanup .orig files -find %{buildroot} -name \.orig -exec rm {} \; ############################## %pre ############################## @@ -116,10 +116,13 @@ %post ############################## +### apply fixes after install +#mkdir %{_datadir}/icinga-web/app/cache + ### fix-privs taken from Makefile.in chown -R %{apacheuser}.%{apachegroup} \ %{_datadir}/icinga-web/app/cache \ - /var/log/icinga/api + %{_datadir}/icinga-web/app/data/log chmod -R 775 %{_datadir}/icinga-web/app/cache chmod +x \ %{_datadir}/icinga-web/bin/agavi \ @@ -142,18 +145,24 @@ %files ############################## %defattr(755,root,root) -%config %{apacheconfdir}/icinga-web.conf %dir %{_datadir}/icinga-web %dir %{_datadir}/icinga-web/app %dir %{_datadir}/icinga-web/app/cache %dir %{_datadir}/icinga-web/app/cache/config %dir %{_datadir}/icinga-web/app/config -%dir %attr(-,icinga,icinga) /var/log/icinga -%dir /var/log/icinga/api -%config %{_datadir}/icinga-web/app/config/cronks.xml -%config %{_datadir}/icinga-web/app/config/css.xml -%config %{_datadir}/icinga-web/app/config/javascript.xml -%config %{_datadir}/icinga-web/app/config/menu.xml +%config(noreplace) %{_datadir}/icinga-web/app/config/translation.site.xml +%config(noreplace) %{_datadir}/icinga-web/app/config/factories.site.xml +%config(noreplace) %{_datadir}/icinga-web/app/config/icinga.site.xml +%config(noreplace) %{_datadir}/icinga-web/app/config/databases.site.xml +%config(noreplace) %{_datadir}/icinga-web/app/config/settings.site.xml +%config(noreplace) %{_datadir}/icinga-web/app/modules/Cronks/config/cronks.site.xml +%config(noreplace) %{_datadir}/icinga-web/app/modules/Cronks/config/module.site.xml +%config(noreplace) %{_datadir}/icinga-web/app/modules/Web/config/icinga-io.site.xml +%config(noreplace) %{_datadir}/icinga-web/app/modules/Web/config/module.site.xml +%config(noreplace) %{_datadir}/icinga-web/app/modules/Api/config/module.site.xml +%config(noreplace) %{_datadir}/icinga-web/app/modules/AppKit/config/auth.site.xml +%config(noreplace) %{_datadir}/icinga-web/app/modules/AppKit/config/module.site.xml + %config %{_datadir}/icinga-web/app/config/action_filters.xml %config %{_datadir}/icinga-web/app/config/autoload.xml %config %{_datadir}/icinga-web/app/config/compile.xml @@ -171,16 +180,45 @@ %config %{_datadir}/icinga-web/app/config/translation.xml %config %{_datadir}/icinga-web/app/config/validators.xml %config %{_datadir}/icinga-web/app/config/routing.modules.xml + %{_datadir}/icinga-web/app/data + %{_datadir}/icinga-web/app/lib %{_datadir}/icinga-web/app/modules %{_datadir}/icinga-web/app/templates + %{_datadir}/icinga-web/app/config.php + %{_datadir}/icinga-web/bin + %{_datadir}/icinga-web/etc -%config(noreplace) %{_datadir}/icinga-web/etc/conf.d/.xml +#%{_datadir}/icinga-web/etc/build.properties +#%{_datadir}/icinga-web/etc/build.xml + %{_datadir}/icinga-web/doc %{_datadir}/icinga-web/lib %{_datadir}/icinga-web/pub + +############################## %changelog +############################## +* Thu Mar 31 2011 Carsten Schoene <cs@linux-administrator.com> - 1.3.1-1 +- update to release 1.3.1 + +* Wed Feb 16 2011 Carsten Schoene <cs@linux-administrator.com> - 1.3.0-1 +- update to release 1.3.0 + +* Mon Oct 25 2010 Carsten Schoene <cs@linux-administrator.com> - 1.2.1-1 +- update to release 1.2.1 + +* Wed Aug 18 2010 Carsten Schoene <cs@linux-administrator.com> - 1.0.3-1 +- update to release 1.0.3 + +* Tue Jun 29 2010 Michael Friedrich <michael.friedrich@univie.ac.at> - 1.0.1-1 +- updated for 1.0.1 + +* Fri Apr 16 2010 Michael Friedrich <michael.friedrich@univie.ac.at> - 0.9.1-1 +- initial creation + +
[-] [+]	Deleted	icinga-web-1.6.2-apacheconfig-install.patch ^
@@ -1,12 +0,0 @@ ---- Makefile.in.orig 2012-03-01 19:56:25.982906745 +0100 -+++ Makefile.in 2012-03-01 19:56:36.062236577 +0100 -@@ -205,7 +205,7 @@ - ln -sf $(DESTDIR)$(prefix)/lib/ext3 $(DESTDIR)$(prefix)/pub/js/ext3 - - install-apache-config: -- ${INSTALL} -b -m 664 $(INSTALL_OPTS) etc/apache2/icinga-web.conf $(DESTDIR)$(WEB_APACHE_PATH)/icinga-web.conf -+ ${INSTALL} -b -m 664 etc/apache2/icinga-web.conf $(DESTDIR)$(WEB_APACHE_PATH)/icinga-web.conf - @printf "\nInstalled configuration in '%s'.\n" "$(WEB_APACHE_PATH)" - @printf "Please make sure that the directory is included or \n" - @printf "include %s/icinga-web.conf manually.\n" "$(WEB_APACHE_PATH)" -
	Changed	icinga-web-1.4.1.tar.bz2 ^