Do not package nagioswall.php twice

[packages/nagios.git] / nagios.spec

diff --git a/nagios.spec b/nagios.spec
index 28f02aa50b2159cc44f91ec283e99688e44f1ae1..0955580a51cbc9296d8cff00551bfcd22f428ba4 100644 (file)
--- a/nagios.spec
+++ b/nagios.spec
@@ -1,7 +1,5 @@
 # TODO
 # - /var/log/nagios/archives -> /var/log/archive/nagios
-# - system jquery
-# - don't fetch rss if update fetching is disabled (privacy!)
 #
 # Conditional build:
 %bcond_without gd      # without statusmap and trends, which require gd library
@@ -13,12 +11,12 @@ Summary:    Host/service/network monitoring program
 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.4.1
-Release:       0.8
+Version:       3.4.3
+Release:       1
 License:       GPL v2+
 Group:         Networking
 Source0:       http://downloads.sourceforge.net/nagios/%{name}-%{version}.tar.gz
-# Source0-md5: 2fa8acfb2a92b1bf8d173a855832de1f
+# Source0-md5: adb04a255a3bb1574840ebd4a0f2eb76
 Source1:       %{name}-apache.conf
 Source2:       %{name}.init
 Source3:       %{name}.sysconfig
@@ -30,6 +28,7 @@ Source6:      http://www.google.com/mapfiles/shadow50.png
 Source7:       http://www.google.com/mapfiles/marker.png
 # Source7-md5: edefef4bdfc29e1c953694651f05b466
 Source8:       googlemap.js
+Source9:       nagioswall.php
 Patch0:                %{name}-resources.patch
 Patch1:                %{name}-iconv-in-libc.patch
 Patch2:                %{name}-webapps.patch
@@ -41,6 +40,7 @@ Patch7:               %{name}-doc-usermacros.patch
 Patch8:                archivelog-timeformat.patch
 Patch9:                system-magpierss.patch
 Patch10:       system-jquery.patch
+Patch11:       do-not-fetch-rss.patch
 URL:           http://www.nagios.org/
 BuildRequires: autoconf
 BuildRequires: automake
@@ -143,7 +143,6 @@ Requires:   %{name}-imagepaks
 Requires:      %{name}-theme
 Requires:      group(http)
 Requires:      jquery
-Requires:      php-magpierss >= 0.72
 Requires:      webapps
 Requires:      webserver
 Requires:      webserver(access)
@@ -152,6 +151,7 @@ Requires:   webserver(auth)
 Requires:      webserver(cgi)
 Requires:      webserver(indexfile)
 Suggests:      %{name}-doc
+Suggests:      php-magpierss >= 0.72
 
 %description cgi
 CGI webinterface for Nagios.
@@ -241,6 +241,7 @@ mv %{name}/* .
 %patch8 -p1
 %patch9 -p1
 %patch10 -p1
+%patch11 -p1
 
 find -name .cvsignore -o -name .gitignore | xargs rm
 
@@ -356,6 +357,7 @@ cp -p sample-config/cgi.cfg $RPM_BUILD_ROOT%{_webapps}/%{_webapp}
 cp -p %{SOURCE6} $RPM_BUILD_ROOT%{htmldir}/images
 cp -p %{SOURCE7} $RPM_BUILD_ROOT%{htmldir}/images
 cp -p %{SOURCE8} $RPM_BUILD_ROOT%{htmldir}/images
+cp -p %{SOURCE9} $RPM_BUILD_ROOT%{htmldir}
 > $RPM_BUILD_ROOT%{_webapps}/%{_webapp}/passwd
 echo 'nagios:' > $RPM_BUILD_ROOT%{_webapps}/%{_webapp}/group
 
@@ -554,9 +556,11 @@ done
 %{htmldir}/images/favicon.ico
 %{htmldir}/images/marker.png
 %{htmldir}/images/shadow50.png
+%{htmldir}/nagioswall.php
 
 %files theme-classicui
 %defattr(644,root,root,755)
+%exclude %{htmldir}/nagioswall.php
 %{htmldir}/*.php
 %{htmldir}/includes/*
 %{htmldir}/images/*