- package classicui theme, new theme provided by nagios-theme-exfoliation package

Changed files:
    config.patch -> 1.7
    nagios.spec -> 1.171

diff --git a/config.patch b/config.patch
index 2ffe54084c5c5fbd65d14bb15c63ac06233617d2..d8af64d89098001a9265851b0cc2215b18211b07 100644 (file)
--- a/config.patch
+++ b/config.patch
@@ -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@';
+ 

diff --git a/nagios.spec b/nagios.spec
index afa43ace4ab155bff14e19a6abe73b3b0cb26cac..a0601890f0938942670e958b74c2b2bbea589164 100644 (file)
--- a/nagios.spec
+++ b/nagios.spec
@@ -12,7 +12,7 @@ Summary(pl.UTF-8):    Program do monitorowania serwerów/usług/sieci
 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
@@ -169,21 +169,29 @@ Group:            Documentation
 %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
@@ -526,7 +534,7 @@ done
 %{htmldir}/images/marker.png
 %{htmldir}/images/shadow50.png
 
-%files theme-default
+%files theme-classicui
 %defattr(644,root,root,755)
 %{htmldir}/*.php
 %{htmldir}/includes/*
@@ -536,6 +544,9 @@ done
 %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}