- fix $USERx$ doc (it is 256 now)

Changed files:
    nagios-doc-usermacros.patch -> 1.1
    nagios.spec -> 1.156

diff --git a/nagios-doc-usermacros.patch b/nagios-doc-usermacros.patch
new file mode 100644 (file)
index 0000000..0ce0c01
--- /dev/null
+++ b/nagios-doc-usermacros.patch
@@ -0,0 +1,32 @@
+
+Bring doc up to date:
+
+include/macros.h: 
+#define MAX_COMMAND_ARGUMENTS           32  /* maximum number of $ARGx$ macros */
+#define MAX_USER_MACROS             256 /* maximum number of $USERx$ macros */
+
+---
+Signed-Off-By: Elan Ruusamäe <glen@delfi.ee>
+
+--- nagios-3.2.3/html/docs/macrolist.html~     2010-08-28 18:20:57.000000000 +0300
++++ nagios-3.2.3/html/docs/macrolist.html      2010-10-07 16:31:08.073321978 +0300
+@@ -3444,7 +3444,7 @@
+ 
+ <td class="MacroName"><a name="user">$USERn$</a></td>
+ 
+-<td class="MacroDescription">The <i>n</i>th user-definable macro. User macros can be defined in one or more <a href="configmain.html#resource_file">resource files</a>. Nagios supports up to 256 user macros ($USER1$ through $USER32$).</td>
++<td class="MacroDescription">The <i>n</i>th user-definable macro. User macros can be defined in one or more <a href="configmain.html#resource_file">resource files</a>. Nagios supports up to 256 user macros ($USER1$ through $USER256$).</td>
+ 
+ </tr>
+ 
+--- nagios-3.2.3/sample-config/resource.cfg.in 2003-09-12 02:57:51.000000000 +0300
++++ nagios-3.2.3/sample-config/resource.cfg.in 2010-10-07 16:33:41.616639353 +0300
+@@ -15,7 +15,7 @@
+ # The CGIs will not attempt to read the contents of resource files, so
+ # you can set restrictive permissions (600 or 660) on them.
+ #
+-# Nagios supports up to 32 $USERx$ macros ($USER1$ through $USER32$)
++# Nagios supports up to 256 $USERx$ macros ($USER1$ through $USER256$)
+ #
+ # Resource files may also be used to store configuration directives for
+ # external data sources like MySQL...

diff --git a/nagios.spec b/nagios.spec
index f47fa3ba41effb8f994446b6ff58bb3f71f7ab6d..7e16477fc4de49ff13fc085854907e0aa96efb0b 100644 (file)
--- a/nagios.spec
+++ b/nagios.spec
@@ -11,7 +11,7 @@ Summary(pl.UTF-8):    Program do monitorowania serwerów/usług/sieci
 Summary(pt_BR.UTF-8):  Programa para monitoração de máquinas e serviços
 Name:          nagios
 Version:       3.2.3
-Release:       1
+Release:       2
 License:       GPL v2+
 Group:         Networking
 Source0:       http://downloads.sourceforge.net/nagios/%{name}-%{version}.tar.gz
@@ -34,6 +34,7 @@ Patch3:               %{name}-cgi-http_charset.patch
 Patch4:                %{name}-cmd-typo.patch
 Patch5:                config.patch
 Patch6:                %{name}-googlemap.patch
+Patch7:                nagios-doc-usermacros.patch
 URL:           http://www.nagios.org/
 BuildRequires: autoconf
 BuildRequires: automake
@@ -198,6 +199,7 @@ aplicativos para o Nagios.
 %patch4 -p1
 %patch5 -p1
 %patch6 -p1
+%patch7 -p1
 
 find -name .cvsignore -o -name .gitignore | xargs rm