From 95e06a29c5b198a5b1413bc19b8e44503a1278c5 Mon Sep 17 00:00:00 2001
From: Tim Waugh <twaugh@fedoraproject.org>
Date: Jul 04 2007 15:43:18 +0000
Subject: - Clarification in the ulimit man page (bug #220657).


---

diff --git a/bash-ulimit-m.patch b/bash-ulimit-m.patch
new file mode 100644
index 0000000..39bca85
--- /dev/null
+++ b/bash-ulimit-m.patch
@@ -0,0 +1,22 @@
+--- bash-3.2/builtins/ulimit.def.ulimit-m	2006-03-23 20:51:51.000000000 +0000
++++ bash-3.2/builtins/ulimit.def	2007-07-04 16:42:12.000000000 +0100
+@@ -38,7 +38,7 @@
+     -f	the maximum size of files written by the shell and its children
+     -i	the maximum number of pending signals
+     -l	the maximum size a process may lock into memory
+-    -m	the maximum resident set size
++    -m	the maximum resident set size (has no effect on Linux)
+     -n	the maximum number of open file descriptors
+     -p	the pipe buffer size
+     -q	the maximum number of bytes in POSIX message queues
+--- bash-3.2/doc/bash.1.ulimit-m	2007-07-04 16:41:59.000000000 +0100
++++ bash-3.2/doc/bash.1	2007-07-04 16:42:12.000000000 +0100
+@@ -8545,7 +8545,7 @@
+ The maximum size that may be locked into memory
+ .TP
+ .B \-m
+-The maximum resident set size
++The maximum resident set size (has no effect on Linux)
+ .TP
+ .B \-n
+ The maximum number of open file descriptors (most systems do not
diff --git a/bash.spec b/bash.spec
index 1e882f7..bb52f5d 100644
--- a/bash.spec
+++ b/bash.spec
@@ -1,7 +1,7 @@
 Version: 3.2
 Name: bash
 Summary: The GNU Bourne Again shell (bash) version %{version}
-Release: 9%{?dist}
+Release: 10%{?dist}
 Group: System Environment/Shells
 License: GPL
 Url: http://www.gnu.org/software/bash
@@ -35,6 +35,7 @@ Patch118: bash-tty-tests.patch
 Patch126: bash-setlocale.patch
 Patch130: bash-infotags.patch
 Patch131: bash-cond-rmatch.patch
+Patch132: bash-ulimit-m.patch
 Requires: mktemp
 Requires(post): ncurses
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -79,6 +80,7 @@ compliance over previous versions.
 %patch126 -p1 -b .setlocale
 %patch130 -p1 -b .infotags
 %patch131 -p1 -b .cond-rmatch
+%patch132 -p1 -b .ulimit-m
 
 echo %{version} > _distribution
 echo %{release} > _patchlevel
@@ -220,6 +222,9 @@ fi
 %doc doc/*.ps doc/*.0 doc/*.html doc/article.txt
 
 %changelog
+* Wed Jul  4 2007 Tim Waugh <twaugh@redhat.com> 3.2-10
+- Clarification in the ulimit man page (bug #220657).
+
 * Mon Feb 12 2007 Tim Waugh <twaugh@redhat.com> 3.2-9
 - Rebuild to link with libtinfo instead of libncurses.