diff --git a/.cvsignore b/.cvsignore index a753ced..7459274 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1,3 +1,3 @@ -man-pages-1.35.tar.bz2 +man-pages-1.38.tar.bz2 man-pages-extralocale.tar.bz2 man2.tar.gz diff --git a/man-pages.spec b/man-pages.spec index 49a0ae9..a7904ba 100644 --- a/man-pages.spec +++ b/man-pages.spec @@ -1,8 +1,8 @@ Summary: Man (manual) pages from the Linux Documentation Project. Name: man-pages -Version: 1.35 -Release: 5p -Copyright: distributable +Version: 1.38 +Release: 3 +License: distributable Group: Documentation Source0: ftp://ftp.win.tue.nl/pub/linux/docs/manpages/man-pages-%{version}.tar.bz2 Source1: rpcgen.1 @@ -11,15 +11,16 @@ Source4: ldd.1 Source5: ldconfig.8 Source6: man-pages-extralocale.tar.bz2 Source9: man2.tar.gz -Patch1: man-pages-1.30-ctype.patch -Patch2: man-pages-1.31.iconv.patch -Patch3: man-pages-1.35-pathupdate.patch -Patch4: man-pages-1.35-unicodeurl.patch -Patch5: man-pages-1.35-roffix.patch -Patch6: man-pages-1.35-mssync.patch +Patch0: man-pages-1.36-wctype.patch +Patch1: man-pages-1.31.iconv.patch +Patch2: man-pages-1.36-pathupdate.patch +Patch3: man-pages-1.36-mssync.patch +Patch4: man-pages-1.35-latin.patch +Patch5: man-pages-1.36-bootparam.patch +Patch6: man-pages-1.38-regcompcollate.patch +Patch7: man-pages-1.38-nsf.patch Buildroot: %{_tmppath}/%{name}-%{version}-root Autoreqprov: false -BuildRequires: bzip2 BuildArchitectures: noarch %description @@ -42,12 +43,13 @@ cp -a %{SOURCE3} man8 cp -a %{SOURCE4} man1 cp -a %{SOURCE5} man8 +%patch0 -p1 %patch1 -p1 %patch2 -p1 -%patch3 -p1 -%patch4 -p1 +#patch3 -p1 %patch5 -p1 -%patch6 -p1 +%patch6 -p1 +%patch7 -p1 %build rm -fv man1/README @@ -58,6 +60,9 @@ rm -fv man1/{chgrp,chmod,chown,cp,dd,df,dircolors,du,install}.1 rm -fv man1/{ln,ls,mkdir,mkfifo,mknod,mv,rm,rmdir,touch}.1 rm -fv man1/{dir,vdir}.1 +# Part of diffutils +rm -fv man1/diff.1 + # Part of quota rm -fv man2/quotactl.2 @@ -74,7 +79,7 @@ rm -fv man5/nfs.5 # Part of bind-utils rm -fv man5/resolver.5 -rm -fv man5/resolv.conf.5 +#rm -fv man5/resolv.conf.5 - kept anyway, as it makes sense to have available # Obsolete rm -f man3/infnan.3 @@ -82,7 +87,9 @@ rm -f man3/infnan.3 # Part of mount rm -fv man5/fstab.5 - +# Part of libcap +rm -fv man2/capget.2 +rm -fv man2/capset.2 find . -name "*sudo*" -exec rm {} \; @@ -106,6 +113,34 @@ rm -rf $RPM_BUILD_ROOT %{_mandir}/man*/* %changelog +* Tue Jul 24 2001 Trond Eivind Glomsrød +- s/NSF/NFS/ in initrd.4 - (#48322) + +* Mon Jul 2 2001 Trond Eivind Glomsrød +- regcomp and friends support collating elements now (#46939) + +* Thu Jun 21 2001 Trond Eivind Glomsrød +- 1.38 + +* Fri Jun 8 2001 Trond Eivind Glomsrød +- 1.37 + +* Thu Jun 7 2001 Trond Eivind Glomsrød +- Remove capset(2) - part of libcap (#43828) + +* Fri Jun 1 2001 Trond Eivind Glomsrød +- Remove diff.1 - let diffutils include it instead +- Remove capget.2 - it's included in libcap +- Keep resolv.conf.5 - it's useful on systems without bind packages +- Fix bootparam.7 (patch from Tim Waugh (twaugh@redhat.com) + +* Tue May 22 2001 Trond Eivind Glomsrød +- 1.36 +- drop some old patches, redo others + +* Thu May 17 2001 Trond Eivind Glomsrød +- Work around bug in groff for latin1.7 (#41118) + * Wed Apr 4 2001 Trond Eivind Glomsrød - use MS_SYNCHRONOUS instead of MS_SYNC in mount(2) (#34665) diff --git a/sources b/sources index 5cbe2e8..c82421e 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -d90821c16b7bd1fae88467b6c49d7b84 man-pages-1.35.tar.bz2 +a2c3cdd3ca934286e519a5526d4e2950 man-pages-1.38.tar.bz2 57f2e0500d177e05647990eae439a8ee man-pages-extralocale.tar.bz2 af09d031dcee66929510e078d00066f2 man2.tar.gz