[man-pages] - update to 3.28 - move all additional man-pages to one source (man-pages-additional-20101006.ta

[Ivana Varekova]

commit f27a7a1b6a0fe2d41c4df6ebe0a962042a98c7dc
Author: Ivana Hutarova Varekova <varekova at redhat.com>
Date:   Wed Oct 6 13:09:44 2010 +0200

    - update to 3.28
    - move all additional man-pages to one source
        (man-pages-additional-20101006.tar.bz2)
    - remove additional man-pages without the info about license

 .gitignore                    |    7 +-
 man-pages-1.51-iconv.patch    |   11 -
 man-pages-2.63-getent.patch   |   43 ---
 man-pages-2.63-iconv.patch    |   19 --
 man-pages-3.22-gai.conf.patch |   29 --
 man-pages-3.23-iconv.patch    |   65 ----
 man-pages.spec                |   43 +--
 mmap.2                        |  675 -----------------------------------------
 sources                       |    7 +-
 9 files changed, 18 insertions(+), 881 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 6a31a38..841d88f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,3 @@
-man-pages-extralocale.tar.bz2
-man-suid-bins.tar.bz2
 man-pages-posix-2003-a.tar.bz2
-man-pages_add-02.tar.bz2
-man-pages_syscalls-03.tar.bz2
-/man-pages-3.27.tar.bz2
+/man-pages-3.28.tar.bz2
+/man-pages-additional-20101006.tar.bz2
diff --git a/man-pages.spec b/man-pages.spec
index 31b56da..e703893 100644
--- a/man-pages.spec
+++ b/man-pages.spec
@@ -3,36 +3,27 @@
 
 Summary: Man (manual) pages from the Linux Documentation Project
 Name: man-pages
-Version: 3.27
-Release: 3%{?dist}
+Version: 3.28
+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/
-
 Source0: http://www.kernel.org/pub/linux/docs/manpages/man-pages-%{version}.tar.bz2
 # POSIX man pages
 Source1: http://www.kernel.org/pub/linux/docs/man-pages/man-pages-posix/man-pages-posix-%{posix_version}-%{posix_release}.tar.bz2
-Source2: man-pages_add-02.tar.bz2
-Source3: man-pages-extralocale.tar.bz2
-Source4: man-pages_syscalls-03.tar.bz2
-# IBM-supplied man pages for suid binaries:
-Source5: man-suid-bins.tar.bz2
-Source6: mmap.2
-Patch1: man-pages-1.51-iconv.patch
+# additional man-pages, the source tarball is fedora only
+# all man-pages have a license info
+Source2: man-pages-additional-20101006.tar.bz2
 Patch28: man-pages-2.46-nscd.patch
 Patch36: man-pages-2.63-unimplemented.patch
 Patch45: man-pages-2.48-passwd.patch
 Patch46: man-pages-2.51-nscd-conf.patch
-Patch49: man-pages-2.63-getent.patch
-Patch50: man-pages-2.63-iconv.patch
 Patch53: man-pages-2.78-stream.patch
 Patch54: man-pages-2.80-malloc_h.patch
-Patch55: man-pages-3.22-gai.conf.patch
 Patch57: man-pages-3.22-nsswitch.conf.patch
 Patch58: man-pages-3.23-proc.patch
 Patch59: man-pages-3.23-ld.so.patch
 Patch60: man-pages-3.22-sched_setaffinity.patch
-Patch61: man-pages-3.23-iconv.patch
 Patch62: man-pages-3.23-printf.patch
 Patch63: man-pages-3.24-getnameinfo.patch
 Patch67: man-pages-3.24-mmap64.patch
@@ -48,27 +39,21 @@ A large collection of man pages (documentation) from the Linux
 Documentation Project (LDP).
 
 %prep
-%setup -q -n %{name}-%{version} -a 1 -a 2 -a 3 -a 4 -a 5
+%setup -q -n %{name}-%{version} -a 1 -a 2
 
-mv  man-pages-posix-%{posix_version}-%{posix_release}/* ./
+mv man-pages-posix-%{posix_version}-%{posix_release}/Changes{,.posix}
+mv man-pages-posix-%{posix_version}-%{posix_release}/* ./
 rmdir man-pages-posix-%{posix_version}-%{posix_release}
-cp %{SOURCE6} man2/mmap.2
-
-%patch1 -p1
 %patch28 -p1
 %patch36 -p1
 %patch45 -p1
 %patch46 -p1
-%patch49 -p1
-%patch50 -p1
 %patch53 -p1
 %patch54 -p1
-%patch55 -p1
 %patch57 -p1
 %patch58 -p1
 %patch59 -p1
 %patch60 -p1
-%patch61 -p1
 %patch62 -p1
 %patch63 -p1
 %patch67 -p1
@@ -89,15 +74,9 @@ rm -v man2/{,f,l}{get,list,remove,set}xattr.2
 # Problem with db x db4 (#198597) - man pages are obsolete
 rm -v man3/{db,btree,dbopen,hash,mpool,recno}.3
 
-# Remove rpcinfo page - obsolete
-rm -v man8/rpcinfo.8
-
 # Deprecated
 rm -v man2/pciconfig_{write,read,iobase}.2
 
-# Part of squid
-rm -v man8/ncsa_auth.8
-
 # Part of numactl package
 rm -v man5/numa_maps.5
 
@@ -144,6 +123,12 @@ rm -rf $RPM_BUILD_ROOT
 %lang(en) %{_mandir}/en/man*/*
 
 %changelog
+* Wed Oct  6 2010 Ivana Hutarova Varekova <varekova at redhat.com> - 3.28-1
+- update to 3.28
+- move all additional man-pages to one source
+    (man-pages-additional-20101006.tar.bz2)
+- remove additional man-pages without the info about license
+
 * Thu Sep 23 2010 Ivana Hutarova Varekova <varekova at redhat.com> - 3.27-3
 - Resolves: #634626
   remove link to non-existing man page
diff --git a/sources b/sources
index ccc41e4..57c41ce 100644
--- a/sources
+++ b/sources
@@ -1,6 +1,3 @@
-57f2e0500d177e05647990eae439a8ee  man-pages-extralocale.tar.bz2
-a9c6a14e5b34c18c3684a0b68322572f  man-suid-bins.tar.bz2
 7c78aff03c0a6767ba483d34f19e4b09  man-pages-posix-2003-a.tar.bz2
-4a222811a5589cf6d80cb0b4e1789fe8  man-pages_add-02.tar.bz2
-bf80e51c1db4fdf6d0ee21e2f9c49485  man-pages_syscalls-03.tar.bz2
-e09dbba0bba9b54c2253a550fdb602cc  man-pages-3.27.tar.bz2
+adc79328fce994eb88e9ac9ddfd84b6f  man-pages-3.28.tar.bz2
+6cea268fa2debf9b6440ee5c37cd4bc8  man-pages-additional-20101006.tar.bz2