diff --git a/.cvsignore b/.cvsignore index c9dc6a5..d8edd6d 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1,3 +1,3 @@ -man-pages-1.53.tar.bz2 +man-pages-1.60.tar.bz2 man-pages-extralocale.tar.bz2 man2.tar.gz diff --git a/man-pages-1.60-fs.patch b/man-pages-1.60-fs.patch new file mode 100644 index 0000000..f980a2c --- /dev/null +++ b/man-pages-1.60-fs.patch @@ -0,0 +1,14 @@ +--- man-pages-1.60/man5/fs.5.orig 2003-08-28 16:59:42.000000000 -0400 ++++ man-pages-1.60/man5/fs.5 2003-08-28 17:00:31.000000000 -0400 +@@ -71,10 +71,7 @@ + .TP + .B ext3 + is a journaling version of the ext2 filesystem. It is easy to +-switch back and forth between ext2 and ext3. +-.TP +-.B ext3 +-is a journaling version of the ext2 filesystem. ext3 offers the most ++switch back and forth between ext2 and ext3. ext3 offers the most + complete set of journaling options available among journaling + filesystems. + .\"---------------------------------------------------------------------- diff --git a/man-pages.spec b/man-pages.spec index 924b309..aa46cad 100644 --- a/man-pages.spec +++ b/man-pages.spec @@ -1,11 +1,12 @@ Summary: Man (manual) pages from the Linux Documentation Project. Name: man-pages -Version: 1.53 -Release: 3 +Version: 1.60 +Release: 4 License: distributable Group: Documentation -Source0: ftp://ftp.win.tue.nl/pub/linux/docs/manpages/man-pages-%{version}.tar.bz2 +Source0: http://www.kernel.org/pub/linux/docs/manpages/man-pages-%{version}.tar.bz2 Source1: rpcgen.1 +Source2: semtimedop.2 Source3: ld.so.8 Source4: ldd.1 Source5: ldconfig.8 @@ -17,9 +18,21 @@ Patch2: man-pages-1.51-nopent.patch Patch3: man-pages-1.51-blank.patch Patch4: man-pages-1.53-mtrace.patch Patch5: man-pages-1.53-langinfo.patch +Patch6: man-pages-1.53-semop.patch +Patch7: man-pages-1.53-mlock.patch +Patch8: man-pages-1.60-re_comp.patch +Patch9: man-pages-1.60-strftime.patch +Patch10: man-pages-1.60-fopen.patch +Patch11: man-pages-1.60-shmget.patch +Patch12: man-pages-1.60-wait.patch +Patch13: tldp.dlopen.3.patch +Patch14: man-pages-1.60-fs.patch +Patch15: man-pages-1.60-issue.patch +Patch16: man-pages-1.60-ld.patch +Patch17: man-pages-1.60-rand.patch Buildroot: %{_tmppath}/%{name}-%{version}-root -Autoreqprov: false -BuildArchitectures: noarch +Autoreq: false +BuildArch: noarch %description A large collection of man pages (documentation) from the Linux @@ -30,6 +43,7 @@ Documentation Project (LDP). tar jxf %{SOURCE6} cp -a %{SOURCE1} man1 +cp -a %{SOURCE2} man2 cp -a %{SOURCE3} man8 cp -a %{SOURCE4} man1 cp -a %{SOURCE5} man8 @@ -38,12 +52,24 @@ cp -a %{SOURCE5} man8 %patch1 -p1 %patch2 -p1 %patch3 -p1 -%patch4 -p1 +#%patch4 -p1 %patch5 -p1 +#%patch6 -p1 +%patch7 -p1 +%patch8 -p1 +%patch9 -p1 +%patch10 -p1 +%patch11 -p1 +%patch12 -p1 +%patch13 -p1 +%patch14 -p1 +%patch15 -p1 +%patch16 -p1 +%patch17 -p1 %build -rm -fv man1/README +rm -fv man1/README # These are parts of fileutils rm -fv man1/{chgrp,chmod,chown,cp,dd,df,dircolors,du,install}.1 @@ -86,18 +112,31 @@ rm -f man3/freehostent.3 rm -fv man2/capget.2 rm -fv man2/capset.2 +# Part of libattr-devel +rm -f man2/{fgetxattr,flistxattr,fremovexattr,fsetxattr,getxattr,lgetxattr,listxattr,llistxattr,lremovexattr,lsetxattr,removexattr,setxattr}.2* + find . -name "*sudo*" -exec rm {} \; +for l1 in man[1-8]/* +do mkdir -p $(dirname en/$l1) + mv $l1 en/$l1 + LANG=en iconv -f latin1 -t ascii//translit -o $l1 en/$l1 +done %install rm -rf $RPM_BUILD_ROOT -mkdir -p $RPM_BUILD_ROOT%{_mandir} -for n in 1 2 3 4 5 6 7 8; do - mkdir $RPM_BUILD_ROOT%{_mandir}/man$n +for n in 1 2 3 4 5 6 7 8 +do mkdir -p $RPM_BUILD_ROOT%{_mandir}/man$n + mkdir -p $RPM_BUILD_ROOT%{_mandir}/en/man$n done -for n in man?/*; do - cp -a $n $RPM_BUILD_ROOT%{_mandir}/$n +for n in man?/* +do cp -a $n $RPM_BUILD_ROOT%{_mandir}/$n + if diff -q en/$n $n + then rm -f en/$n + elif [ $? -eq 1 ] + then cp -a en/$n $RPM_BUILD_ROOT%{_mandir}/en/$n + fi done %clean @@ -107,8 +146,47 @@ rm -rf $RPM_BUILD_ROOT %defattr(0644,root,root,0755) %doc README man-pages-%{version}.Announce %{_mandir}/man*/* +%{_mandir}/en/man*/* %changelog +* Wed Sep 24 2003 Adrian Havill 1.60-4 +- transliterated ALL pages with latin-1 characters that would be + displayed as either a fallback from a ascii-superset locale or + from the POSIX locale into ascii (according to glibc transliteration + data for locale "en"). pages with non-ascii are moved into the "en" + locale. (#103214) + +* Thu Aug 28 2003 Adrian Havill 1.60-2 +- transliterated Lichtmaier's first name for the sake of iconv (#103214) + +* Thu Aug 28 2003 Adrian Havill 1.60-1.1 +- bumped n-v-r + +* Thu Aug 28 2003 Adrian Havill 1.60-1 +- bumped version, removed no longer needed patches +- added #define for re_comp() and re_exec() (#79703) +- fixed typo in Era format specifier (#80025) +- fixed ftell info for fopen with mode "a+" (#81359) +- fixed prototype for shmget() (#86258) +- fixed spelling in wait.2 (#86450) +- obsoleted _init and _fini in dlopen() (#88408) +- fixed and merged double ext3 descriptions (#103198) +- issue to refer to mingetty (#86248) +- synced man page with actual ld params (#97176) + +* Fri Aug 01 2003 Elliot Lee 1.58-2 +- Remove libattr conflicts + +* Wed Jul 30 2003 Adrian Havill 1.58-1 +- Bumped version (which also solves n-v-r conflict with RHEL) + +* Fri Jul 11 2003 Ernie Petrides +- Modify mlock.2, mlockall.2, and shmctl.2 for change to locking + permission semantics made in kernel's linux-2.4.21-mlock.patch. + +* Tue Apr 29 2003 Ernie Petrides +- Modify semop.2 for new semtimedop(2) and add semtimedop.2 link. + * Wed Jan 22 2003 Tim Powers - rebuilt diff --git a/sources b/sources index 4ef2f90..4530544 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -e652ef65803a489b558f5197e6070254 man-pages-1.53.tar.bz2 +00403e372a7a06e8ad8e1df8aefb71f8 man-pages-1.60.tar.bz2 57f2e0500d177e05647990eae439a8ee man-pages-extralocale.tar.bz2 af09d031dcee66929510e078d00066f2 man2.tar.gz