From 6dfe53d1010ed5a4994824889a103331f798759b Mon Sep 17 00:00:00 2001 From: Ivana Varekova Date: Thu, 1 Jul 2010 13:45:07 +0000 Subject: [PATCH] - Update to 3.25 --- .cvsignore | 2 +- man-pages-3.24-ext4.patch | 15 --------------- man-pages-3.24-recv.patch | 14 -------------- man-pages-3.24-sysconf.patch | 12 ------------ man-pages.spec | 13 +++++-------- sources | 2 +- 6 files changed, 7 insertions(+), 51 deletions(-) delete mode 100644 man-pages-3.24-ext4.patch delete mode 100644 man-pages-3.24-recv.patch delete mode 100644 man-pages-3.24-sysconf.patch diff --git a/.cvsignore b/.cvsignore index b92112f..737c693 100644 --- a/.cvsignore +++ b/.cvsignore @@ -3,4 +3,4 @@ man-suid-bins.tar.bz2 man-pages-posix-2003-a.tar.bz2 man-pages_add-02.tar.bz2 man-pages_syscalls-03.tar.bz2 -man-pages-3.24.tar.bz2 +man-pages-3.25.tar.bz2 diff --git a/man-pages-3.24-ext4.patch b/man-pages-3.24-ext4.patch deleted file mode 100644 index 2f05880..0000000 --- a/man-pages-3.24-ext4.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff -up man-pages-3.24/man5/filesystems.5.pom man-pages-3.24/man5/filesystems.5 ---- man-pages-3.24/man5/filesystems.5.pom 2010-02-26 05:46:53.000000000 +0100 -+++ man-pages-3.24/man5/filesystems.5 2010-06-24 14:12:54.000000000 +0200 -@@ -77,6 +77,11 @@ is a journaling version of the ext2 file - It is easy to - switch back and forth between ext2 and ext3. - .TP -+.B ext4 -+is the next generation of the ext filesystem series. In addition to -+journaling, ext4 supports larger files and filesystems than ext3, and provides -+other modern features such as preallocation and an extent-based allocator. -+.TP - .B Reiserfs - is a journaling file system, designed by Hans Reiser, - that was integrated into Linux in kernel 2.4.1. diff --git a/man-pages-3.24-recv.patch b/man-pages-3.24-recv.patch deleted file mode 100644 index 84f5c13..0000000 --- a/man-pages-3.24-recv.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff -up man-pages-3.24/man2/recv.2.pom man-pages-3.24/man2/recv.2 ---- man-pages-3.24/man2/recv.2.pom 2010-02-26 05:46:37.000000000 +0100 -+++ man-pages-3.24/man2/recv.2 2010-05-31 10:02:35.000000000 +0200 -@@ -379,10 +379,6 @@ buffer for ancillary data. - .TP - .B MSG_OOB - is returned to indicate that expedited or out-of-band data were received. --.TP --.B MSG_ERRQUEUE --indicates that no data was received but an extended error from the socket --error queue. - .SH "RETURN VALUE" - These calls return the number of bytes received, or \-1 - if an error occurred. diff --git a/man-pages-3.24-sysconf.patch b/man-pages-3.24-sysconf.patch deleted file mode 100644 index 240ca21..0000000 --- a/man-pages-3.24-sysconf.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -up man-pages-3.24/man3/sysconf.3.pom man-pages-3.24/man3/sysconf.3 ---- man-pages-3.24/man3/sysconf.3.pom 2010-02-26 05:46:50.000000000 +0100 -+++ man-pages-3.24/man3/sysconf.3 2010-05-10 10:24:56.000000000 +0200 -@@ -44,7 +44,7 @@ and testing the value of certain macros. - .LP - At run time, one can ask for numerical values using the present function - .BR sysconf (). --On can ask for numerical values that may depend -+One can ask for numerical values that may depend - on the file system a file is in using the calls - .BR fpathconf (3) - and diff --git a/man-pages.spec b/man-pages.spec index 9c9fb92..f328a58 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.24 -Release: 7%{?dist} +Version: 3.25 +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/ @@ -36,10 +36,7 @@ Patch61: man-pages-3.23-iconv.patch Patch62: man-pages-3.23-printf.patch Patch63: man-pages-3.24-getnameinfo.patch Patch64: man-pages-3.24-atanh.patch -Patch65: man-pages-3.24-sysconf.patch -Patch66: man-pages-3.24-recv.patch Patch67: man-pages-3.24-mmap64.patch -Patch68: man-pages-3.24-ext4.patch Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Autoreq: false @@ -74,10 +71,7 @@ cp %{SOURCE6} man2/mmap.2 %patch62 -p1 %patch63 -p1 %patch64 -p1 -%patch65 -p1 -%patch66 -p1 %patch67 -p1 -%patch68 -p1 ### And now remove those we are not going to use: @@ -148,6 +142,9 @@ rm -rf $RPM_BUILD_ROOT %lang(en) %{_mandir}/en/man*/* %changelog +* Thu Jul 1 2010 Ivana Hutarova Varekova - 3.25-1 +- Update to 3.25 + * Thu Jun 24 2010 Ivana Hutarova Varekova - 3.24-7 - resolves: #606038 filesystems.5 makes no mention of ext4 diff --git a/sources b/sources index 9a9011d..3f0aac6 100644 --- a/sources +++ b/sources @@ -3,4 +3,4 @@ a9c6a14e5b34c18c3684a0b68322572f man-suid-bins.tar.bz2 7c78aff03c0a6767ba483d34f19e4b09 man-pages-posix-2003-a.tar.bz2 4a222811a5589cf6d80cb0b4e1789fe8 man-pages_add-02.tar.bz2 bf80e51c1db4fdf6d0ee21e2f9c49485 man-pages_syscalls-03.tar.bz2 -aca98183e51772ce81e17c78a46bea5d man-pages-3.24.tar.bz2 +3c1fbd5b8905e471827daa0ad937f6b1 man-pages-3.25.tar.bz2