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

[glen]

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

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

---- Diffs:

================================================================
Index: packages/nagios/nagios.spec
diff -u packages/nagios/nagios.spec:1.182 packages/nagios/nagios.spec:1.183
--- packages/nagios/nagios.spec:1.182	Mon May 28 23:17:15 2012
+++ packages/nagios/nagios.spec	Mon May 28 23:18:56 2012
@@ -41,6 +41,7 @@
 Patch7:		%{name}-doc-usermacros.patch
 Patch8:		archivelog-timeformat.patch
 Patch9:		system-magpierss.patch
+Patch10:	system-jquery.patch
 URL:		http://www.nagios.org/
 BuildRequires:	autoconf
 BuildRequires:	automake
@@ -142,6 +143,7 @@
 Requires:	%{name}-imagepaks
 Requires:	%{name}-theme
 Requires:	group(http)
+Requires:	jquery
 Requires:	php-magpierss >= 0.72
 Requires:	webapps
 Requires:	webserver
@@ -239,6 +241,7 @@
 %patch7 -p1
 %patch8 -p1
 %patch9 -p1
+%patch10 -p1
 
 find -name .cvsignore -o -name .gitignore | xargs rm
 
@@ -577,6 +580,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.183  2012/05/28 21:18:56  glen
+- use system jquery package
+
 Revision 1.182  2012/05/28 21:17:15  glen
 - use system magpierss package
 

================================================================
Index: packages/nagios/system-jquery.patch
diff -u /dev/null packages/nagios/system-jquery.patch:1.1
--- /dev/null	Mon May 28 23:19:02 2012
+++ packages/nagios/system-jquery.patch	Mon May 28 23:18:56 2012
@@ -0,0 +1,44 @@
+--- 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" />
+ <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>
++<script type="text/javascript" src="/js/jquery/jquery.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"
+ 
+ 	/********************************* JAVASCRIPT INCLUDES **********************/
+-#define JQUERY_JS		"jquery-1.7.1.min.js"	
++#define JQUERY_JS		"/js/jquery/jquery.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 @@
+ 		}
+ 	
+ 	/* 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() ); });");	
+--- 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 @@
+ 	do $(INSTALL) -m 664 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/stylesheets; done
+ 	for file in contexthelp/*.html; \
+ 	do $(INSTALL) -m 664 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/contexthelp; done
+-	for file in 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
+ #	for file in docs/images/*.*; \
================================================================

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