From a23ebf05bf4c033c4cf5136c854969fb4216cfe1 Mon Sep 17 00:00:00 2001
From: Ivana Hutarova Varekova <varekova@redhat.com>
Date: Oct 25 2010 08:10:49 +0000
Subject: - update 3.29

  several bug fixes

---

diff --git a/.gitignore b/.gitignore
index 841d88f..420773f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,3 @@
 man-pages-posix-2003-a.tar.bz2
-/man-pages-3.28.tar.bz2
 /man-pages-additional-20101006.tar.bz2
+/man-pages-3.29.tar.bz2
diff --git a/man-pages-2.80-malloc_h.patch b/man-pages-2.80-malloc_h.patch
deleted file mode 100644
index 83390d7..0000000
--- a/man-pages-2.80-malloc_h.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff -up man-pages-2.80/man3/malloc_hook.3.pom man-pages-2.80/man3/malloc_hook.3
---- man-pages-2.80/man3/malloc_hook.3.pom	2008-06-03 11:50:24.000000000 +0200
-+++ man-pages-2.80/man3/malloc_hook.3	2008-06-11 09:20:59.000000000 +0200
-@@ -72,6 +72,12 @@ The variable
- points at a function that is called each time after
- .BR sbrk (2)
- was asked for more memory.
-+.LP
-+Hook variables are not thread-safe so they are deprecated now.
-+Programmers should instead preempt callst to the relevant functions
-+by defining and exporting functions like "malloc" and "free".
-+
-+
- .SH "CONFORMING TO"
- These functions are GNU extensions.
- .SH "EXAMPLE"
diff --git a/man-pages-3.28-typo.patch b/man-pages-3.28-typo.patch
deleted file mode 100644
index d1a0bbd..0000000
--- a/man-pages-3.28-typo.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-diff -up man-pages-3.28/man3/gai_cancel.3.pom man-pages-3.28/man3/gai_cancel.3
---- man-pages-3.28/man3/gai_cancel.3.pom	2010-10-04 05:04:35.000000000 +0200
-+++ man-pages-3.28/man3/gai_cancel.3	2010-10-06 16:31:24.000000000 +0200
-@@ -180,7 +180,7 @@ The
- .BR gai_suspend ()
- function suspends execution of the calling thread,
- waiting for the completion of one or more requests in the array
--.ID list .
-+.IR list .
- The
- .I nitems
- argument specifies the size of the array
-diff -up man-pages-3.28/man3/gai_error.3.pom man-pages-3.28/man3/gai_error.3
---- man-pages-3.28/man3/gai_error.3.pom	2010-10-04 05:04:35.000000000 +0200
-+++ man-pages-3.28/man3/gai_error.3	2010-10-06 16:35:57.000000000 +0200
-@@ -180,7 +180,7 @@ The
- .BR gai_suspend ()
- function suspends execution of the calling thread,
- waiting for the completion of one or more requests in the array
--.ID list .
-+.IR list .
- The
- .I nitems
- argument specifies the size of the array
-diff -up man-pages-3.28/man3/gai_suspend.3.pom man-pages-3.28/man3/gai_suspend.3
---- man-pages-3.28/man3/gai_suspend.3.pom	2010-10-04 05:04:35.000000000 +0200
-+++ man-pages-3.28/man3/gai_suspend.3	2010-10-06 16:33:01.000000000 +0200
-@@ -180,7 +180,7 @@ The
- .BR gai_suspend ()
- function suspends execution of the calling thread,
- waiting for the completion of one or more requests in the array
--.ID list .
-+.IR list .
- The
- .I nitems
- argument specifies the size of the array
diff --git a/man-pages-3.29-uri.patch b/man-pages-3.29-uri.patch
new file mode 100644
index 0000000..281ad29
--- /dev/null
+++ b/man-pages-3.29-uri.patch
@@ -0,0 +1,16 @@
+diff -up man-pages-3.29/man7/.rrr man-pages-3.29/man7/
+diff -up man-pages-3.29/man7/uri.7.rrr man-pages-3.29/man7/uri.7
+--- man-pages-3.29/man7/uri.7.rrr	2010-10-19 19:17:20.000000000 +0200
++++ man-pages-3.29/man7/uri.7	2010-10-22 17:37:25.000000000 +0200
+@@ -238,9 +238,8 @@ An example is <news:comp.lang.ada>.
+ A
+ .I message-id
+ corresponds to the Message-ID of
+-.UR http://www.ietf.org/rfc/rfc1036.txt
+-IETF RFC\ 1036,
+-.UE
++IETF RFC\ 1036
++.RI ( http://www.ietf.org/rfc/rfc1036.txt )
+ without the enclosing "<"
+ and ">"; it takes the form
+ .IR unique @ full_domain_name .
diff --git a/man-pages-posix-2003-awk.patch b/man-pages-posix-2003-awk.patch
new file mode 100644
index 0000000..f1be9b4
--- /dev/null
+++ b/man-pages-posix-2003-awk.patch
@@ -0,0 +1,13 @@
+diff -up man-pages-3.29/man1p/awk.1p.qqq man-pages-3.29/man1p/awk.1p
+--- man-pages-3.29/man1p/awk.1p.qqq	2008-06-05 11:22:12.000000000 +0200
++++ man-pages-3.29/man1p/awk.1p	2010-10-22 15:45:44.000000000 +0200
+@@ -2197,7 +2197,7 @@ necessary to use parentheses to enforce 
+ .LP
+ The \fIawk\fP program specified in the command line is most easily
+ specified within single-quotes (for example,
+-'\fIprogram\fP') for applications using \fIsh\fP, because \fIawk\fP
++\fI'program'\fP) for applications using \fIsh\fP, because \fIawk\fP
+ programs commonly contain
+ characters that are special to the shell, including double-quotes.
+ In the cases where an \fIawk\fP program contains single-quote
+diff -up man-pages-3.29/man1p/.qqq man-pages-3.29/man1p/
diff --git a/man-pages-posix-2003-man.patch b/man-pages-posix-2003-man.patch
new file mode 100644
index 0000000..1f5aef0
--- /dev/null
+++ b/man-pages-posix-2003-man.patch
@@ -0,0 +1,16 @@
+diff -up man-pages-3.29/man1p/man.1p.pom man-pages-3.29/man1p/man.1p
+--- man-pages-3.29/man1p/man.1p.pom	2008-06-05 11:22:12.000000000 +0200
++++ man-pages-3.29/man1p/man.1p	2010-10-22 13:35:55.000000000 +0200
+@@ -44,10 +44,7 @@ command: 
+ .RS
+ .nf
+ 
+-\fBgrep -Ei '
+-\fP\fIname
+-name\fP\fB...
+-'\fP \fIsummary-database\fP
++\fBgrep -Ei '\fP\fIname name\fP\fB...' \fP \fIsummary-database\fP
+ .fi
+ .RE
+ .LP
+
diff --git a/man-pages-posix-2003-printf.patch b/man-pages-posix-2003-printf.patch
new file mode 100644
index 0000000..bf03f2a
--- /dev/null
+++ b/man-pages-posix-2003-printf.patch
@@ -0,0 +1,13 @@
+diff -up man-pages-3.29/man1p/printf.1p.ppp man-pages-3.29/man1p/printf.1p
+--- man-pages-3.29/man1p/printf.1p.ppp	2008-06-05 11:22:12.000000000 +0200
++++ man-pages-3.29/man1p/printf.1p	2010-10-22 15:33:14.000000000 +0200
+@@ -144,7 +144,8 @@ octal number that shall be converted to 
+ numeric value specified by the octal number
+ .LP
+ .IP " *" 3
+-\fB'\\c'\fP, which shall not be written and shall cause \fIprintf\fP
++sequence \fB'\\c'\fP
++which shall not be written and shall cause \fIprintf\fP
+ to ignore any remaining characters in the string
+ operand containing it, any remaining string operands, and any additional
+ characters in the \fIformat\fP operand
diff --git a/man-pages.spec b/man-pages.spec
index 4cde76e..af3b407 100644
--- a/man-pages.spec
+++ b/man-pages.spec
@@ -3,8 +3,8 @@
 
 Summary: Man (manual) pages from the Linux Documentation Project
 Name: man-pages
-Version: 3.28
-Release: 3%{?dist}
+Version: 3.29
+Release: 1%{?dist}
 License: GPLv2+ and GPL+ and BSD and MIT and Copyright only and IEEE
 Group: Documentation
 URL: http://www.kernel.org/pub/linux/docs/manpages/
@@ -19,7 +19,6 @@ Patch36: man-pages-2.63-unimplemented.patch
 Patch45: man-pages-2.48-passwd.patch
 Patch46: man-pages-2.51-nscd-conf.patch
 Patch53: man-pages-2.78-stream.patch
-Patch54: man-pages-2.80-malloc_h.patch
 Patch57: man-pages-3.22-nsswitch.conf.patch
 Patch58: man-pages-3.23-proc.patch
 Patch59: man-pages-3.23-ld.so.patch
@@ -29,7 +28,10 @@ Patch63: man-pages-3.24-getnameinfo.patch
 Patch67: man-pages-3.24-mmap64.patch
 Patch68: man-pages-3.26-rcmd.patch
 Patch69: man-pages-3.27-sd.patch
-Patch70: man-pages-3.28-typo.patch
+Patch70: man-pages-3.29-uri.patch
+Patch71: man-pages-posix-2003-awk.patch
+Patch72: man-pages-posix-2003-man.patch
+Patch73: man-pages-posix-2003-printf.patch
 
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Autoreq: false
@@ -50,7 +52,6 @@ rmdir man-pages-posix-%{posix_version}-%{posix_release}
 %patch45 -p1
 %patch46 -p1
 %patch53 -p1
-%patch54 -p1
 %patch57 -p1
 %patch58 -p1
 %patch59 -p1
@@ -61,6 +62,9 @@ rmdir man-pages-posix-%{posix_version}-%{posix_release}
 %patch68 -p1
 %patch69 -p1
 %patch70 -p1
+%patch71 -p1
+%patch72 -p1
+%patch73 -p1
 
 ### And now remove those we are not going to use:
 
@@ -116,6 +120,10 @@ rm -rf $RPM_BUILD_ROOT
 %lang(en) %{_mandir}/en/man*/*
 
 %changelog
+* Mon Oct 25 2010 Ivana Hutarova Varekova <varekova@redhat.com> - 3.29-1
+- update 3.29
+  several bug fixes
+
 * Wed Oct  6 2010 Ivana Hutarova Varekova <varekova@redhat.com> - 3.28-3
 - don't remove numa_maps, now the man page is not in numactl
 - don't remove getipnodeby{name,addr}.3 and freehostent.3
diff --git a/sources b/sources
index 57c41ce..6a09610 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
 7c78aff03c0a6767ba483d34f19e4b09  man-pages-posix-2003-a.tar.bz2
-adc79328fce994eb88e9ac9ddfd84b6f  man-pages-3.28.tar.bz2
 6cea268fa2debf9b6440ee5c37cd4bc8  man-pages-additional-20101006.tar.bz2
+a3728993981c335888e67ad6e146d6fe  man-pages-3.29.tar.bz2