packages: nagios/nagios.spec - use favicon.ico from tarball

[glen]

Author: glen                         Date: Thu Oct 22 14:25:02 2009 GMT
Module: packages                      Tag: HEAD
---- Log message:
- use favicon.ico from tarball

---- Files affected:
packages/nagios:
   nagios.spec (1.146 -> 1.147) 

---- Diffs:

================================================================
Index: packages/nagios/nagios.spec
diff -u packages/nagios/nagios.spec:1.146 packages/nagios/nagios.spec:1.147
--- packages/nagios/nagios.spec:1.146	Tue Sep 15 13:54:13 2009
+++ packages/nagios/nagios.spec	Thu Oct 22 16:24:56 2009
@@ -18,11 +18,9 @@
 Source1:	%{name}-apache.conf
 Source2:	%{name}.init
 Source3:	%{name}.sysconfig
-Source4:	http://www.nagios.org/images/favicon.ico
-# Source4-md5:	1c4201c7da53d6c7e48251d3a9680449
-Source5:	%{name}-config-20090914.tar.bz2
-# Source5-md5:	605f1cd28c00db961dad6f529d849f16
-Source6:	%{name}-lighttpd.conf
+Source4:	%{name}-config-20090914.tar.bz2
+# Source4-md5:	605f1cd28c00db961dad6f529d849f16
+Source5:	%{name}-lighttpd.conf
 Patch0:		%{name}-resources.patch
 Patch1:		%{name}-iconv-in-libc.patch
 Patch2:		%{name}-webapps.patch
@@ -173,7 +171,7 @@
 aplicativos para o Nagios.
 
 %prep
-%setup -q -a5
+%setup -q -a4
 %patch0 -p0
 %patch1 -p1
 %patch2 -p1
@@ -195,7 +193,7 @@
 ' $(find contrib/eventhandlers -type f)
 
 sed -e 's,%{_prefix}/lib/,%{_libdir}/,' %{SOURCE1} > apache.conf
-sed -e 's,%{_prefix}/lib/,%{_libdir}/,' %{SOURCE6} > lighttpd.conf
+sed -e 's,%{_prefix}/lib/,%{_libdir}/,' %{SOURCE5} > lighttpd.conf
 
 # fixup cgi config
 %{__sed} -i -e '
@@ -249,7 +247,6 @@
 
 install -p %{SOURCE2} $RPM_BUILD_ROOT/etc/rc.d/init.d/%{name}
 cp -a %{SOURCE3} $RPM_BUILD_ROOT/etc/sysconfig/%{name}
-cp -a %{SOURCE4} $RPM_BUILD_ROOT%{_datadir}
 
 # install templated configuration files
 for a in nagios.cfg resource.cfg commands.cfg contactgroups.cfg contacts.cfg templates.cfg timeperiods.cfg; do
@@ -420,18 +417,19 @@
 %dir %{_datadir}/includes
 %dir %{_datadir}/images
 %dir %{_datadir}/stylesheets
-%{_datadir}/favicon.ico
 %{_datadir}/robots.txt
 %{_datadir}/contexthelp
 %{_datadir}/docs
 %{_datadir}/media
 %{_datadir}/ssi
+%{_datadir}/images/favicon.ico
 
 %files theme-default
 %defattr(644,root,root,755)
 %{_datadir}/*.php
 %{_datadir}/includes/*
 %{_datadir}/images/*
+%exclude %{_datadir}/images/favicon.ico
 %{_datadir}/stylesheets/*
 
 %files devel
@@ -445,6 +443,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.147  2009/10/22 14:24:56  glen
+- use favicon.ico from tarball
+
 Revision 1.146  2009/09/15 11:54:13  glen
 - utf8 fixes in cgi, spec cosmetics; rel 6
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/nagios/nagios.spec?r1=1.146&r2=1.147&f=u