diff --git a/.gitignore b/.gitignore index 5a23b67..67bfe8d 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,3 @@ /man-pages-posix-2003-a.tar.bz2 /man-pages-additional-20101006.tar.bz2 -/man-pages-3.41.tar.xz +/man-pages-3.42.tar.xz diff --git a/man-pages-3.29-uri.patch b/man-pages-3.29-uri.patch deleted file mode 100644 index 281ad29..0000000 --- a/man-pages-3.29-uri.patch +++ /dev/null @@ -1,16 +0,0 @@ -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 . - 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-3.32-readdir.patch b/man-pages-3.32-readdir.patch deleted file mode 100644 index 137b853..0000000 --- a/man-pages-3.32-readdir.patch +++ /dev/null @@ -1,16 +0,0 @@ -diff -up man-pages-3.32/man3/readdir.3.pom man-pages-3.32/man3/readdir.3 ---- man-pages-3.32/man3/readdir.3.pom 2010-12-03 08:02:01.000000000 +0100 -+++ man-pages-3.32/man3/readdir.3 2011-01-27 16:05:54.000000000 +0100 -@@ -226,8 +226,10 @@ as follows: - .in +4n - .nf - --len = offsetof(struct dirent, d_name) + -- pathconf(dirpath, _PC_NAME_MAX) + 1 -+len = (offsetof(struct dirent, d_name) + -+ pathconf(dirpath, _PC_NAME_MAX) + 1 + sizeof(long)) -+ & -sizeof(long); -+ - entryp = malloc(len); - - .fi diff --git a/man-pages.spec b/man-pages.spec index ad28e42..6ecfe66 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.41 -Release: 2%{?dist} +Version: 3.42 +Release: 1%{?dist} License: GPLv2+ and GPL+ and BSD and MIT and Copyright only and IEEE Group: Documentation URL: http://man7.org/linux/man-pages/ @@ -24,8 +24,6 @@ Patch59: man-pages-3.23-ld.so.patch Patch60: man-pages-3.22-sched_setaffinity.patch # Declined by upstream Patch63: man-pages-3.24-getnameinfo.patch -# Declined by upstream -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 @@ -33,8 +31,6 @@ Patch73: man-pages-posix-2003-printf.patch Patch75: man-pages-3.30-prctl.patch #Resolves: #652870 Patch76: man-pages-3.32-strtol.patch -#Resolves: #652869 -Patch77: man-pages-3.32-readdir.patch #Resolves: #679899 Patch78: man-pages-2.39-gai.conf.patch #Resolves: #675544 @@ -69,13 +65,11 @@ rmdir man-pages-posix-%{posix_version}-%{posix_release} %patch59 -p1 %patch60 -p1 %patch63 -p1 -%patch70 -p1 %patch71 -p1 %patch72 -p1 %patch73 -p1 %patch75 -p1 %patch76 -p1 -%patch77 -p1 %patch78 -p1 %patch79 -p1 %patch80 -p1 @@ -136,6 +130,10 @@ rm -rf $RPM_BUILD_ROOT %lang(en) %{_mandir}/en/man*/* %changelog +* Mon Sep 10 2012 Peter Schiffer - 3.42-1 +- resolves: #847941 + update to 3.42 + * Thu Jul 19 2012 Fedora Release Engineering - 3.41-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild diff --git a/sources b/sources index 95e626d..53f2f3e 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ 7c78aff03c0a6767ba483d34f19e4b09 man-pages-posix-2003-a.tar.bz2 6cea268fa2debf9b6440ee5c37cd4bc8 man-pages-additional-20101006.tar.bz2 -7395d284fa1b9e112006d736865781b0 man-pages-3.41.tar.xz +2392bb23db94f344f493c4beca41398f man-pages-3.42.tar.xz