packages: nagios/nagios.spec, nagios/system-magpierss.patch (NEW)=?UTF-8?Q?=20?=- use sys...

[glen]

Author: glen                         Date: Mon May 28 21:17:21 2012 GMT
Module: packages                      Tag: HEAD
---- Log message:
- use system magpierss package

---- Files affected:
packages/nagios:
   nagios.spec (1.181 -> 1.182) , system-magpierss.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/nagios/nagios.spec
diff -u packages/nagios/nagios.spec:1.181 packages/nagios/nagios.spec:1.182
--- packages/nagios/nagios.spec:1.181	Mon May 28 23:14:38 2012
+++ packages/nagios/nagios.spec	Mon May 28 23:17:15 2012
@@ -1,7 +1,6 @@
 # $Revision$, $Date$
 # TODO
 # - /var/log/nagios/archives -> /var/log/archive/nagios
-# - system php-magpierss
 # - system jquery
 # - don't fetch rss if update fetching is disabled (privacy!)
 #
@@ -41,6 +40,7 @@
 Patch6:		%{name}-googlemap.patch
 Patch7:		%{name}-doc-usermacros.patch
 Patch8:		archivelog-timeformat.patch
+Patch9:		system-magpierss.patch
 URL:		http://www.nagios.org/
 BuildRequires:	autoconf
 BuildRequires:	automake
@@ -142,6 +142,7 @@
 Requires:	%{name}-imagepaks
 Requires:	%{name}-theme
 Requires:	group(http)
+Requires:	php-magpierss >= 0.72
 Requires:	webapps
 Requires:	webserver
 Requires:	webserver(access)
@@ -237,6 +238,7 @@
 %patch6 -p1
 %patch7 -p1
 %patch8 -p1
+%patch9 -p1
 
 find -name .cvsignore -o -name .gitignore | xargs rm
 
@@ -575,6 +577,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.182  2012/05/28 21:17:15  glen
+- use system magpierss package
+
 Revision 1.181  2012/05/28 21:14:38  glen
 - up to 3.4.1
 

================================================================
Index: packages/nagios/system-magpierss.patch
diff -u /dev/null packages/nagios/system-magpierss.patch:1.1
--- /dev/null	Mon May 28 23:17:21 2012
+++ packages/nagios/system-magpierss.patch	Mon May 28 23:17:15 2012
@@ -0,0 +1,45 @@
+--- nagios-3.4.1/html/rss-corefeed.php~	2012-05-28 23:27:38.000000000 +0300
++++ nagios-3.4.1/html/rss-corefeed.php	2012-05-28 23:49:41.701706368 +0300
+@@ -1,11 +1,11 @@
+ <?php
+ 
+ // RSS reader
+-define('MAGPIE_DIR', './includes/rss/');
++define('MAGPIE_DIR', '/usr/share/php/magpierss/');
+ define('MAGPIE_CACHE_ON', 0);
+ define('MAGPIE_CACHE_AGE', 0);
+ define('MAGPIE_CACHE_DIR', '/tmp/magpie_cache');
+-require_once(MAGPIE_DIR.'rss_fetch.inc');
++require_once(MAGPIE_DIR . 'rss_fetch.inc');
+ 
+ 
+ //build splash divs to ajax load 
+--- nagios-3.4.1/html/rss-newsfeed.php~	2012-05-28 23:27:38.000000000 +0300
++++ nagios-3.4.1/html/rss-newsfeed.php	2012-05-28 23:49:56.285653400 +0300
+@@ -1,11 +1,11 @@
+ <?php 
+ 
+ // RSS reader
+-define('MAGPIE_DIR', './includes/rss/');
++define('MAGPIE_DIR', '/usr/share/php/magpierss/');
+ define('MAGPIE_CACHE_ON', 0);
+ define('MAGPIE_CACHE_AGE', 0);
+ define('MAGPIE_CACHE_DIR', '/tmp/magpie_cache');
+-require_once(MAGPIE_DIR.'rss_fetch.inc');
++require_once(MAGPIE_DIR . 'rss_fetch.inc');
+ 
+ 
+ //build splash divs to ajax load 
+--- nagios-3.4.1/html/Makefile.in~	2012-02-13 22:40:42.000000000 +0200
++++ nagios-3.4.1/html/Makefile.in	2012-05-28 23:52:30.828823727 +0300
+@@ -79,10 +79,6 @@
+ 	do $(INSTALL) -m 664 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/images/logos; done
+ 	for file in includes/*.*; \
+ 	do $(INSTALL) -m 664 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/includes; done
+-	for file in includes/rss/*.*; \
+-	do $(INSTALL) -m 664 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/includes/rss; done
+-	for file in includes/rss/extlib/*.*; \
+-	do $(INSTALL) -m 664 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/includes/rss/extlib; done
+ 
+ install-unstripped:
+ 	$(MAKE) install
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/packages/nagios/nagios.spec?r1=1.181&r2=1.182