Author: glen Date: Sat Jan 7 16:26:16 2012 GMT Module: packages Tag: HEAD ---- Log message: - package classicui theme, new theme provided by nagios-theme-exfoliation package
---- Files affected: packages/nagios: config.patch (1.6 -> 1.7) , nagios.spec (1.170 -> 1.171) ---- Diffs: ================================================================ Index: packages/nagios/config.patch diff -u packages/nagios/config.patch:1.6 packages/nagios/config.patch:1.7 --- packages/nagios/config.patch:1.6 Wed Sep 9 08:17:19 2009 +++ packages/nagios/config.patch Sat Jan 7 17:26:11 2012 @@ -185,3 +185,25 @@ +--- nagios-3.3.1/Makefile.in~ 2011-07-26 05:02:18.000000000 +0300 ++++ nagios-3.3.1/Makefile.in 2012-01-06 17:31:31.482147956 +0200 +@@ -226,7 +226,7 @@ + cd $(SRC_BASE) && $(MAKE) $@ + cd $(SRC_CGI) && $(MAKE) $@ + cd $(SRC_HTM) && $(MAKE) $@ +- $(MAKE) install-exfoliation ++ $(MAKE) install-classicui + $(MAKE) install-basic + + install-basic: +--- nagios-3.3.1/html/config.inc.php.in~ 2008-12-14 20:00:46.000000000 +0200 ++++ nagios-3.3.1/html/config.inc.php.in 2012-01-06 17:33:57.734940302 +0200 +@@ -2,7 +2,7 @@ + // + + +-$cfg['cgi_config_file']='@sysconfdir@/cgi.cfg'; // location of the CGI config file ++$cfg['cgi_config_file']='/etc/webapps/nagios/cgi.cfg'; // location of the CGI config file + + $cfg['cgi_base_url']='@cgiurl@'; + ================================================================ Index: packages/nagios/nagios.spec diff -u packages/nagios/nagios.spec:1.170 packages/nagios/nagios.spec:1.171 --- packages/nagios/nagios.spec:1.170 Fri Jan 6 14:48:29 2012 +++ packages/nagios/nagios.spec Sat Jan 7 17:26:11 2012 @@ -13,7 +13,7 @@ Summary(pt_BR.UTF-8): Programa para monitoração de máquinas e serviços Name: nagios Version: 3.3.1 -Release: 1 +Release: 2 License: GPL v2+ Group: Networking Source0: http://downloads.sourceforge.net/nagios/%{name}-%{version}.tar.gz @@ -170,21 +170,29 @@ %description doc HTML Documentation for Nagios. -%package theme-default -Summary: Default Nagios theme -Summary(pl.UTF-8): Domyślny motyw Nagiosa +%package theme-classicui +Summary: ClassicUI Nagios theme Group: Applications/WWW Requires: %{name}-cgi = %{version}-%{release} Requires: webserver(php) Provides: nagios-theme Obsoletes: nagios-theme -%description theme-default +%description theme-classicui Original theme from Nagios. -%description theme-default -l pl.UTF-8 +%description theme-classicui -l pl.UTF-8 Oryginalny motyw z Nagiosa. +%package theme-default +Summary: Virtual package to handle Nagios theme migration +Group: Applications/WWW +Requires: nagios-theme +Obsoletes: nagios-theme-default < 3.3.1-1.4 + +%description theme-default +Virtual package to handle Nagios theme migration + %package devel Summary: Include files that Nagios-related applications may compile against Summary(pl.UTF-8): Pliki nagłówkowe, wykorzystywane przez aplikacje nagiosa @@ -527,7 +535,7 @@ %{htmldir}/images/marker.png %{htmldir}/images/shadow50.png -%files theme-default +%files theme-classicui %defattr(644,root,root,755) %{htmldir}/*.php %{htmldir}/includes/* @@ -537,6 +545,9 @@ %exclude %{htmldir}/images/shadow50.png %{htmldir}/stylesheets/* +%files theme-default +%defattr(644,root,root,755) + %files devel %defattr(644,root,root,755) %dir %{_includedir}/%{name} @@ -548,6 +559,9 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.171 2012/01/07 16:26:11 glen +- package classicui theme, new theme provided by nagios-theme-exfoliation package + Revision 1.170 2012/01/06 13:48:29 glen - fix dir ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/nagios/config.patch?r1=1.6&r2=1.7&f=u http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/nagios/nagios.spec?r1=1.170&r2=1.171&f=u _______________________________________________ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
