- use system magpierss package

Changed files:
    nagios.spec -> 1.182
    system-magpierss.patch -> 1.1

diff --git a/nagios.spec b/nagios.spec
index 17dea4c8dc02756ba1dadb2a556f3d779617db84..90016eb745fd55e4e719dfc358064d885cc6b099 100644 (file)
--- a/nagios.spec
+++ b/nagios.spec
@@ -1,6 +1,5 @@
 # TODO
 # - /var/log/nagios/archives -> /var/log/archive/nagios
-# - system php-magpierss
 # - system jquery
 # - don't fetch rss if update fetching is disabled (privacy!)
 #
@@ -40,6 +39,7 @@ Patch5:               config.patch
 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
@@ -141,6 +141,7 @@ Requires:   %{name} = %{version}-%{release}
 Requires:      %{name}-imagepaks
 Requires:      %{name}-theme
 Requires:      group(http)
+Requires:      php-magpierss >= 0.72
 Requires:      webapps
 Requires:      webserver
 Requires:      webserver(access)
@@ -236,6 +237,7 @@ mv %{name}/* .
 %patch6 -p1
 %patch7 -p1
 %patch8 -p1
+%patch9 -p1
 
 find -name .cvsignore -o -name .gitignore | xargs rm
 

diff --git a/system-magpierss.patch b/system-magpierss.patch
new file mode 100644 (file)
index 0000000..89e970a
--- /dev/null
+++ b/system-magpierss.patch
@@ -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