diff --git a/.gitignore b/.gitignore index 84e68a5..f9f95d3 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.31.tar.bz2 +/man-pages-3.32.tar.bz2 diff --git a/man-pages.spec b/man-pages.spec index 946b9a6..57a81b9 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.31 -Release: 2%{?dist} +Version: 3.32 +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/ @@ -32,8 +32,6 @@ 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 -#Resolves: #650257 -Patch74: man-pages-3.30-open.patch #Resolves: #647269 Patch75: man-pages-3.30-prctl.patch #Resolves: #655961 @@ -70,7 +68,6 @@ rmdir man-pages-posix-%{posix_version}-%{posix_release} %patch71 -p1 %patch72 -p1 %patch73 -p1 -%patch74 -p1 %patch75 -p1 ### And now remove those we are not going to use: @@ -127,6 +124,9 @@ rm -rf $RPM_BUILD_ROOT %lang(en) %{_mandir}/en/man*/* %changelog +* Mon Jan 3 2011 Ivana Hutarova Varekova - 3.31-2 +- update to 3.32 + * Wed Nov 24 2010 Ivana Hutarova Varekova - 3.31-2 - resolves: #655961 add the conflict tag diff --git a/sources b/sources index 8c6524c..8462ba8 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ 7c78aff03c0a6767ba483d34f19e4b09 man-pages-posix-2003-a.tar.bz2 6cea268fa2debf9b6440ee5c37cd4bc8 man-pages-additional-20101006.tar.bz2 -7bcdd983e871eb4453aa994b17001d6f man-pages-3.31.tar.bz2 +1278c5289660e42a597fefd30d9bdcf0 man-pages-3.32.tar.bz2