diff --git a/.cvsignore b/.cvsignore index c17b147..5eb757b 100644 --- a/.cvsignore +++ b/.cvsignore @@ -2,4 +2,4 @@ man-pages-extralocale.tar.bz2 man2.tar.gz man2_sys2.1.tar.gz man-suid-bins.tar.bz2 -man-pages-2.67.tar.bz2 +man-pages-2.68.tar.bz2 diff --git a/man-pages-2.65-proc.patch b/man-pages-2.65-proc.patch deleted file mode 100644 index 259b2d6..0000000 --- a/man-pages-2.65-proc.patch +++ /dev/null @@ -1,36 +0,0 @@ ---- man-pages-2.65/man5/slabinfo.5.pom 2007-05-19 06:30:20.000000000 +0200 -+++ man-pages-2.65/man5/slabinfo.5 2007-09-26 15:53:21.000000000 +0200 -@@ -29,10 +29,14 @@ - Frequently used objects in the Linux kernel - (buffer heads, inodes, dentries, etc.) - have their own cache. --The file --.I /proc/slabinfo --gives statistics. --For example: -+Since kernel 2.6.16 the file -+.I /proc/slabinfo -+is only present if the CONFIG_SLAB kernel -+configuration option is enabled. -+ -+An example of -+.I /proc/slabinfo -+is: - .LP - .RS - .nf ---- man-pages-2.65/man5/proc.5.pom 2007-09-10 06:17:16.000000000 +0200 -+++ man-pages-2.65/man5/proc.5 2007-09-26 15:53:11.000000000 +0200 -@@ -1021,7 +1021,11 @@ same process. - .TP - .I /proc/slabinfo - Information about kernel caches. --The columns are: -+Since 2.6.16 the file is only present if the CONFIG_SLAB kernel -+configuration option is enabled. -+The columns which are in -+.I /proc/slabinfo -+are: - .nf - cache-name - num-active-objs diff --git a/man-pages.spec b/man-pages.spec index 9ebd886..a4e228a 100644 --- a/man-pages.spec +++ b/man-pages.spec @@ -1,6 +1,6 @@ Summary: Man (manual) pages from the Linux Documentation Project Name: man-pages -Version: 2.67 +Version: 2.68 Release: 1%{?dist} License: GPLv2+, GLP, BSD, MIT, Copyright only, IEEE Group: Documentation @@ -32,7 +32,6 @@ Patch46: man-pages-2.51-nscd-conf.patch Patch48: man-pages-2.51-sched_setaffinity.patch Patch49: man-pages-2.63-getent.patch Patch50: man-pages-2.63-iconv.patch -Patch51: man-pages-2.65-proc.patch Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Autoreq: false @@ -68,7 +67,6 @@ done %patch48 -p1 %patch49 -p1 %patch50 -p1 -%patch51 -p1 ### And now remove those we are not going to use: @@ -179,10 +177,13 @@ rm -rf $RPM_BUILD_ROOT %lang(en) %{_mandir}/en/man* %changelog -* Mon Oct 22 2007 Ivana Varekova - 2.67-1 +* Thu Nov 22 2007 Ivana Varekova - 2.68-1 +- update to 2.68 + +* Mon Oct 22 2007 Ivana Varekova - 2.67-1 - update to 2.67 -* Tue Oct 9 2007 Ivana Varekova - 2.66-1 +* Tue Oct 9 2007 Ivana Varekova - 2.66-1 - update to 2.66 - add proc man-page patch diff --git a/sources b/sources index ae3df0e..b99c446 100644 --- a/sources +++ b/sources @@ -2,4 +2,4 @@ af09d031dcee66929510e078d00066f2 man2.tar.gz fbc03fdbc665e24961d30dad3ed8596d man2_sys2.1.tar.gz a9c6a14e5b34c18c3684a0b68322572f man-suid-bins.tar.bz2 -d841b9a2a958a2653b7f31b3d95d9e7d man-pages-2.67.tar.bz2 +0d82d2023be313c371237eae460e21a6 man-pages-2.68.tar.bz2