diff --git a/.gitignore b/.gitignore index 5615a1a..7e58308 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,3 @@ /man-pages-posix-2013-a.tar.xz /man-pages-additional-20140218.tar.xz -/man-pages-3.79.tar.xz +/man-pages-3.80.tar.xz diff --git a/man-pages-3.32-host.patch b/man-pages-3.32-host.patch deleted file mode 100644 index 5102184..0000000 --- a/man-pages-3.32-host.patch +++ /dev/null @@ -1,32 +0,0 @@ -diff -up man-pages-3.32/man5/host.conf.5.pom man-pages-3.32/man5/host.conf.5 ---- man-pages-3.32/man5/host.conf.5.pom 2010-12-03 08:02:02.000000000 +0100 -+++ man-pages-3.32/man5/host.conf.5 2011-04-22 15:40:45.000000000 +0200 -@@ -33,15 +33,9 @@ contains configuration information speci - It should contain one configuration keyword per line, followed by - appropriate configuration information. - The keywords recognized are --.IR order ", " trim ", " multi ", " nospoof ", " spoof ", and " reorder . -+.IR trim ", " multi ", " nospoof ", " spoof ", and " reorder . - These keywords are described below. - .TP --.I order --This keyword specifies how host lookups are to be performed. --It should be followed by one or more lookup methods, separated by commas. --Valid methods are --.IR bind ", " hosts ", and " nis . --.TP - .I trim - This keyword may be listed more than once. - Each time it should be -@@ -141,11 +135,6 @@ override the behavior which is configure - If set, this variable points to a file that should be read instead of - .IR /etc/host.conf . - .TP --.B RESOLV_SERV_ORDER --Overrides the --.I order --command. --.TP - .B RESOLV_SPOOF_CHECK - Overrides the - .IR nospoof ", " spoofalert " and " spoof diff --git a/man-pages.spec b/man-pages.spec index 273f898..40db6c0 100644 --- a/man-pages.spec +++ b/man-pages.spec @@ -6,7 +6,7 @@ Summary: Linux kernel and C library user-space interface documentation Name: man-pages -Version: 3.79 +Version: 3.80 Release: 1%{?dist} License: GPL+ and GPLv2+ and BSD and MIT and Copyright only and IEEE Group: Documentation @@ -26,9 +26,6 @@ BuildArch: noarch # Currently none # Regular man pages -# resolves: #698149 -# http://thread.gmane.org/gmane.linux.man/3413 -Patch20: man-pages-3.32-host.patch # resolves: #650985 # https://bugzilla.kernel.org/show_bug.cgi?id=53781 Patch21: man-pages-3.42-close.patch @@ -39,7 +36,6 @@ A large collection of manual pages from the Linux Documentation Project (LDP). %prep %setup -q -a 1 -a 2 -%patch20 -p1 %patch21 -p1 # rename posix README so we don't have conflict @@ -77,6 +73,10 @@ popd %{_mandir}/man*/* %changelog +* Sun Feb 22 2015 jchaloup - 3.80-1 +- updated to 3.80 + resolves: #1194974 + * Mon Feb 02 2015 jchaloup - 3.79-1 - updated to 3.79 resolves: #1188036 diff --git a/sources b/sources index 3d4fc6c..7a8cbe3 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ 825fde78e6fddd02426ecdd50e2cbe0d man-pages-posix-2013-a.tar.xz dbd7fac6b9f9d39f0667138ad841c4b9 man-pages-additional-20140218.tar.xz -938950106f4483383dd367fe9e8aab9f man-pages-3.79.tar.xz +d06a8440349a2c2450ea59412fa653f8 man-pages-3.80.tar.xz