[packages/nagios-theme-exfoliation] Up to 4.5.3
arekm
arekm at pld-linux.org
Thu Aug 1 12:12:22 CEST 2024
commit 13267553f1cc63599bbd31e79a88ced236cbc251
Author: Arkadiusz Miśkiewicz <arekm at maven.pl>
Date: Thu Aug 1 11:11:44 2024 +0200
Up to 4.5.3
nagios-theme-exfoliation.spec | 18 ++++++++-------
system-jquery.patch | 53 ++++++++++++++++++++++++++-----------------
system-magpierss.patch | 45 ------------------------------------
3 files changed, 42 insertions(+), 74 deletions(-)
---
diff --git a/nagios-theme-exfoliation.spec b/nagios-theme-exfoliation.spec
index 46292d7..bc7b4e8 100644
--- a/nagios-theme-exfoliation.spec
+++ b/nagios-theme-exfoliation.spec
@@ -1,15 +1,16 @@
Summary: Exfoliation Nagios theme
Name: nagios-theme-exfoliation
-Version: 3.4.1
+Version: 4.5.3
Release: 1
License: GPL v2+
Group: Applications/WWW
-Source0: http://downloads.sourceforge.net/nagios/nagios-%{version}.tar.gz
-# Source0-md5: 2fa8acfb2a92b1bf8d173a855832de1f
+# https://www.nagios.org/downloads/nagios-core/thanks/?product_download=nagioscore-source
+Source0: https://assets.nagios.com/downloads/nagioscore/releases/nagios-%{version}.tar.gz
+# Source0-md5: b77fd2fb656245dd0097c8e7b1310d3e
Patch0: system-jquery.patch
-Patch1: system-magpierss.patch
URL: http://lancet.mit.edu/mwall/projects/nagios/exfoliation.html
BuildRequires: sed >= 4.0
+Requires: jquery >= 3.7.1
Requires: nagios-cgi >= 3.4.1-0.8
Requires: webserver(php)
Provides: nagios-theme
@@ -25,13 +26,12 @@ Exfoliation is a simple makeover for the Nagios Core web interface.
%prep
%setup -qc
-cd nagios
+cd nagios-%{version}
%patch0 -p1
-%patch1 -p1
cd ..
-mv nagios/contrib/exfoliation/* .
+mv nagios-%{version}/contrib/exfoliation/* .
# need some files from nagios tarball the way themes are made
-mv nagios/html .
+mv nagios-%{version}/html .
%{__sed} -e '
s#@cgiurl@#/nagios/cgi-bin#
@@ -46,6 +46,8 @@ mv nagios/html .
rm -rf $RPM_BUILD_ROOT
install -d $RPM_BUILD_ROOT%{htmldir}
+# keep synced with install-exfoliation Makefile.in target
+
# base files, not present in the exfoliation
cp -a html/*.php html/includes $RPM_BUILD_ROOT%{htmldir}
diff --git a/system-jquery.patch b/system-jquery.patch
index a89bf09..dff7516 100644
--- a/system-jquery.patch
+++ b/system-jquery.patch
@@ -1,43 +1,54 @@
--- nagios-3.4.1/html/main.php~ 2012-05-12 03:00:53.000000000 +0300
+++ nagios-3.4.1/html/main.php 2012-05-28 23:55:54.310721306 +0300
-@@ -12,7 +12,7 @@
- <meta name="ROBOTS" content="NOINDEX, NOFOLLOW" />
+@@ -14,7 +14,7 @@ $this_year = '2017';
<title>Nagios Core</title>
- <link rel='stylesheet' type='text/css' href='stylesheets/common.css' />
--<script type="text/javascript" src="js/jquery-1.7.1.min.js"></script>
+ <link rel="stylesheet" type="text/css" href="stylesheets/common.css?<?php echo $this_version; ?>" />
+ <link rel="stylesheet" type="text/css" href="stylesheets/nag_funcs.css?<?php echo $this_version; ?>" />
+-<script type="text/javascript" src="js/jquery-3.7.1.min.js"></script>
+<script type="text/javascript" src="/js/jquery/jquery.js"></script>
+ <script type="text/javascript" src="js/nag_funcs.js"></script>
<script type='text/javascript'>
-
--- nagios-3.4.1/include/cgiutils.h~ 2012-05-24 17:15:30.000000000 +0300
+++ nagios-3.4.1/include/cgiutils.h 2012-05-28 23:56:18.921757228 +0300
-@@ -80,7 +80,7 @@
- #define SUMMARY_CSS "summary.css"
+@@ -93,7 +93,7 @@ NAGIOS_BEGIN_DECL
+ #define NAGFUNCS_CSS "nag_funcs.css"
/********************************* JAVASCRIPT INCLUDES **********************/
--#define JQUERY_JS "jquery-1.7.1.min.js"
-+#define JQUERY_JS "/js/jquery/jquery.js"
+-#define JQUERY_JS "jquery-3.7.1.min.js"
++#define JQUERY_JS "/js/jquery/jquery.js"
+ #define NAGFUNCS_JS "nag_funcs.js"
/********************************* ICONS ************************************/
-
--- nagios-3.4.1/cgi/status.c~ 2012-05-24 17:15:30.000000000 +0300
+++ nagios-3.4.1/cgi/status.c 2012-05-28 23:57:04.933694000 +0300
-@@ -558,7 +558,7 @@
+@@ -531,7 +531,7 @@ void document_header(int use_stylesheet)
}
-
- /* added jquery library 1/31/2012 */
-- printf("<script type='text/javascript' src='%s%s'></script>\n",url_js_path, JQUERY_JS);
-+ printf("<script type='text/javascript' src='%s'></script>\n", JQUERY_JS);
- /* JS function to append content to elements on page */
- printf("<script type='text/javascript'>\n");
- printf("$(document).ready(function() { $('#top_page_numbers').append($('#bottom_page_numbers').html() ); });");
+
+ /* added jquery library 1/31/2012 */
+- printf("<script type='text/javascript' src='%s%s'></script>\n", url_js_path, JQUERY_JS);
++ printf("<script type='text/javascript' src='%s'></script>\n",JQUERY_JS);
+ printf("<script type='text/javascript' src='%s%s'></script>\n", url_js_path, NAGFUNCS_JS);
+ /* JS function to append content to elements on page */
+ printf("<script type='text/javascript'>\n");
+--- nagios-4.5.3/html/jsonquery.html~ 2024-06-11 16:50:20.000000000 +0200
++++ nagios-4.5.3/html/jsonquery.html 2024-08-01 10:44:22.443304502 +0200
+@@ -4,7 +4,7 @@
+ <head>
+ <title>JSON Query Generator</title>
+ <link rel="stylesheet" type="text/css" href="stylesheets/jsonquery.css"/>
+- <script type="text/javascript" src="js/jquery-3.7.1.min.js"></script>
++ <script type="text/javascript" src="js/jquery/jquery.js"></script>
+ <script type="text/javascript" src="js/jsonquery.js"></script>
+ </head>
+ <body>
--- nagios-3.4.1/html/Makefile.in~ 2012-05-28 23:52:30.000000000 +0300
+++ nagios-3.4.1/html/Makefile.in 2012-05-28 23:59:43.973722231 +0300
-@@ -61,8 +61,6 @@
+@@ -106,8 +106,6 @@ install:
do $(INSTALL) -m 664 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/stylesheets; done
- for file in contexthelp/*.html; \
+ for file in $(srcdir)/contexthelp/*.html; \
do $(INSTALL) -m 664 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/contexthelp; done
-- for file in js/*.js; \
+- for file in $(srcdir)/js/*.js; \
- do $(INSTALL) -m 664 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/js; done
# for file in docs/*.html; \
# do $(INSTALL) -m 664 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/docs; done
diff --git a/system-magpierss.patch b/system-magpierss.patch
deleted file mode 100644
index 89e970a..0000000
--- a/system-magpierss.patch
+++ /dev/null
@@ -1,45 +0,0 @@
---- 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
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/nagios-theme-exfoliation.git/commitdiff/13267553f1cc63599bbd31e79a88ced236cbc251
More information about the pld-cvs-commit
mailing list