From a9c44de31b9d6e18a1927bf512354b5f2777baaa Mon Sep 17 00:00:00 2001 From: Peter Schiffer Date: Wed, 29 Jan 2014 19:56:49 +0100 Subject: [PATCH] Updated to POSIX.1 2013 - resolves: #1056781 --- .gitignore | 2 +- man-pages-posix-2003-awk.patch | 12 ------------ man-pages-posix-2003-man.patch | 15 --------------- man-pages-posix-2003-printf.patch | 13 ------------- man-pages-posix-2003-readlink3p.patch | 12 ------------ man-pages-posix-2013-man.patch | 16 ++++++++++++++++ man-pages.spec | 16 +++++----------- sources | 2 +- 8 files changed, 23 insertions(+), 65 deletions(-) delete mode 100644 man-pages-posix-2003-awk.patch delete mode 100644 man-pages-posix-2003-man.patch delete mode 100644 man-pages-posix-2003-printf.patch delete mode 100644 man-pages-posix-2003-readlink3p.patch create mode 100644 man-pages-posix-2013-man.patch diff --git a/.gitignore b/.gitignore index e79eb34..c629bbc 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,3 @@ -/man-pages-posix-2003-a.tar.xz +/man-pages-posix-2013-a.tar.xz /man-pages-additional-20131204.tar.xz /man-pages-3.57.tar.xz diff --git a/man-pages-posix-2003-awk.patch b/man-pages-posix-2003-awk.patch deleted file mode 100644 index 8cc6f55..0000000 --- a/man-pages-posix-2003-awk.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -ur man-pages-3.42.orig/man-pages-posix-2003-a/man1p/awk.1p man-pages-3.42/man-pages-posix-2003-a/man1p/awk.1p ---- man-pages-3.42.orig/man-pages-posix-2003-a/man1p/awk.1p 2008-06-05 11:22:12.000000000 +0200 -+++ man-pages-3.42/man-pages-posix-2003-a/man1p/awk.1p 2012-09-11 10:53:09.542957878 +0200 -@@ -2197,7 +2197,7 @@ - .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 --git a/man-pages-posix-2003-man.patch b/man-pages-posix-2003-man.patch deleted file mode 100644 index 8e6cf5a..0000000 --- a/man-pages-posix-2003-man.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff -ur man-pages-3.42.orig/man-pages-posix-2003-a/man1p/man.1p man-pages-3.42/man-pages-posix-2003-a/man1p/man.1p ---- man-pages-3.42.orig/man-pages-posix-2003-a/man1p/man.1p 2008-06-05 11:22:12.000000000 +0200 -+++ man-pages-3.42/man-pages-posix-2003-a/man1p/man.1p 2012-09-11 10:55:29.899852315 +0200 -@@ -44,10 +44,7 @@ - .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 deleted file mode 100644 index 56f5dd8..0000000 --- a/man-pages-posix-2003-printf.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff -ur man-pages-3.42.orig/man-pages-posix-2003-a/man1p/printf.1p man-pages-3.42/man-pages-posix-2003-a/man1p/printf.1p ---- man-pages-3.42.orig/man-pages-posix-2003-a/man1p/printf.1p 2008-06-05 11:22:12.000000000 +0200 -+++ man-pages-3.42/man-pages-posix-2003-a/man1p/printf.1p 2012-09-11 10:56:23.003676775 +0200 -@@ -144,7 +144,8 @@ - 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-posix-2003-readlink3p.patch b/man-pages-posix-2003-readlink3p.patch deleted file mode 100644 index e350c81..0000000 --- a/man-pages-posix-2003-readlink3p.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -ur man-pages-3.42.orig/man-pages-posix-2003-a/man3p/readlink.3p man-pages-3.42/man-pages-posix-2003-a/man3p/readlink.3p ---- man-pages-3.42.orig/man-pages-posix-2003-a/man3p/readlink.3p 2008-06-05 11:22:12.000000000 +0200 -+++ man-pages-3.42/man-pages-posix-2003-a/man3p/readlink.3p 2012-09-11 10:57:03.913771772 +0200 -@@ -96,7 +96,7 @@ - .sp - - char buf[1024]; --ssizet_t len; -+ssize_t len; - \&... - if ((len = readlink("/modules/pass1", buf, sizeof(buf)-1)) != -1) - buf[len] = '\\0'; diff --git a/man-pages-posix-2013-man.patch b/man-pages-posix-2013-man.patch new file mode 100644 index 0000000..0fbc83b --- /dev/null +++ b/man-pages-posix-2013-man.patch @@ -0,0 +1,16 @@ +diff -up man-pages-3.57/man-pages-posix-2013-a/man1p/man.1p.orig man-pages-3.57/man-pages-posix-2013-a/man1p/man.1p +--- man-pages-3.57/man-pages-posix-2013-a/man1p/man.1p.orig 2014-01-29 19:18:00.646179114 +0100 ++++ man-pages-3.57/man-pages-posix-2013-a/man1p/man.1p 2014-01-29 19:29:06.326005795 +0100 +@@ -55,11 +55,7 @@ equivalent of the output of the followin + .RS 4 + .nf + \fB +-grep \(miEi ' +-\fIname +-name\fP +-\&... +-\&' \fIsummary-database\fR ++grep \(miEi '\fIname name\fP\&...\&' \fIsummary-database\fR + .fi \fR + .P + .RE diff --git a/man-pages.spec b/man-pages.spec index 91a241f..d38aecd 100644 --- a/man-pages.spec +++ b/man-pages.spec @@ -1,4 +1,4 @@ -%global posix_version 2003 +%global posix_version 2013 %global posix_release a %global posix_name man-pages-posix-%{posix_version}-%{posix_release} %global additional_version 20131204 @@ -20,11 +20,7 @@ Source2: %{additional_name}.tar.xz ## Patches ## # POSIX man pages -Patch00: man-pages-posix-2003-awk.patch -Patch01: man-pages-posix-2003-man.patch -Patch02: man-pages-posix-2003-printf.patch -# resolves: #723578 -Patch03: man-pages-posix-2003-readlink3p.patch +Patch00: man-pages-posix-2013-man.patch # Regular man pages # resolves: #698149 @@ -49,9 +45,6 @@ Documentation Project (LDP). %setup -q -a 1 -a 2 %patch00 -p1 -%patch01 -p1 -%patch02 -p1 -%patch03 -p1 %patch20 -p1 %patch21 -p1 @@ -110,12 +103,11 @@ for sec in 0p 1 1p 2 3 3p 4 5 6 7 8; do done cd %{posix_name} -%{__mv} Changes %{posix_name}.Changes %{__mv} README %{posix_name}.README cd .. %files -%doc README man-pages-%{version}.Announce Changes %{posix_name}/POSIX-COPYRIGHT %{posix_name}/%{posix_name}.{README,Announce,Changes} +%doc README man-pages-%{version}.Announce Changes %{posix_name}/POSIX-COPYRIGHT %{posix_name}/%{posix_name}.{README,Announce} %{_mandir}/man*/* %lang(en) %{_mandir}/en/man*/* @@ -123,6 +115,8 @@ cd .. * Wed Jan 29 2014 Peter Schiffer - 3.57-1 - resolves: #1058001 updated to 3.57 +- resolves: #1056781 + updated to POSIX.1 2013 * Wed Jan 15 2014 Peter Schiffer - 3.56-1 - resolves: #1051765 diff --git a/sources b/sources index 51b7c11..4804f23 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -ec0a97ccb2ff9e4c32fac67111dbc99a man-pages-posix-2003-a.tar.xz +825fde78e6fddd02426ecdd50e2cbe0d man-pages-posix-2013-a.tar.xz ff3655a145cfc50eddc1f15f6ef41d81 man-pages-additional-20131204.tar.xz 18bba89745fecdfddad3caaef7cde5f4 man-pages-3.57.tar.xz