Browse Source

man-pages: update to 3.66

git-svn-id: http://trac.vinelinux.org/repos/projects/specs@8464 ec354946-7b23-47d6-9f5a-488ba84defc7
daisuke 10 years ago
parent
commit
5b14ab66c5
1 changed files with 40 additions and 94 deletions
  1. 40 94
      m/man-pages/man-pages-vl.spec

+ 40 - 94
m/man-pages/man-pages-vl.spec

@@ -1,38 +1,29 @@
-%define posix_version 2003
+%define posix_version 2013
 %define posix_release a
+%global posix_name man-pages-posix-%{posix_version}-%{posix_release}
 
 Summary: Man (manual) pages from the Linux Documentation Project.
 Summary(ja): Linux ドキュメンテーションプロジェクトの Man (manual) ページ
 Name: man-pages
-Version: 3.23
+Version: 3.66
 Release: 1%{?_dist_release}
 License: GPLv2+ and GPL+ and BSD and MIT and Copyright only and IEEE
 Group:   Applications/Documentation
+URL: http://www.kernel.org/doc/man-pages/
 
-Source0: http://www.kernel.org/pub/linux/docs/manpages/man-pages-%{version}.tar.bz2
+Source0: http://www.kernel.org/pub/linux/docs/man-pages/man-pages-%{version}.tar.xz
 # 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-01.tar.bz2
-Source3: man-pages-extralocale.tar.bz2
-Source4: man-pages_syscalls-01.tar.bz2
-# IBM-supplied man pages for suid binaries:
-Source5: man-suid-bins.tar.bz2
-Patch1: man-pages-1.51-iconv.patch
-Patch28: man-pages-2.46-nscd.patch
-Patch36: man-pages-2.63-unimplemented.patch
-Patch41: man-pages-2.43-rt_spm.patch
-Patch44: man-pages-2.43-fadvise.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
-Patch56: man-pages-3.22-strcpy.patch
-Patch57: man-pages-3.22-nsswitch.conf.patch
-Patch58: man-pages-3.23-proc.patch
-Patch59: man-pages-3.23-ld.so.patch
+Source1: http://www.kernel.org/pub/linux/docs/man-pages/man-pages-posix/man-pages-posix-%{posix_version}-%{posix_release}.tar.xz
+
+# 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
+# resolves: #392431
+Patch22: man-pages-3.42-connect.patch
 
 Buildroot: %{_tmppath}/%{name}-%{version}-root
 Autoreqprov: false
@@ -43,27 +34,14 @@ 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
-
-mv  man-pages-posix-%{posix_version}-%{posix_release}/* ./
-rmdir man-pages-posix-%{posix_version}-%{posix_release}
-
-%patch1 -p1
-%patch28 -p1
-%patch36 -p1
-%patch41 -p1
-%patch44 -p1
-%patch45 -p1
-%patch46 -p1
-%patch49 -p1
-%patch50 -p1
-%patch53 -p1
-%patch54 -p1
-%patch55 -p1
-%patch56 -p1
-%patch57 -p1
-%patch58 -p1
-%patch59 -p1
+%setup -q -a 1
+
+%patch20 -p1
+%patch21 -p1
+%patch22 -p1
+
+# rename posix README so we don't have conflict
+%{__mv} %{posix_name}/README %{posix_name}/%{posix_name}.README
 
 ### And now remove those we are not going to use:
 
@@ -77,17 +55,11 @@ rm -v man3/getipnodeby{name,addr}.3 man3/freehostent.3
 rm -v man2/{,f,l}{get,list,remove,set}xattr.2
 
 # Problem with db x db4 (#198597) - man pages are obsolete
-rm -v man3/{btree,dbopen,hash,mpool,recno}.3
-
-# Remove rpcinfo page - obsolete
-rm -v man8/rpcinfo.8
+rm -v man3/{db,btree,dbopen,hash,mpool,recno}.3
 
 # 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
 
@@ -101,57 +73,31 @@ rm -v man5/resolv.conf.5
 # Part of bind-utils
 rm -v man5/resolver.5
 
-# Compress/Uncompress man pages
-rm -v man1p/uncompress.1p
-rm -v man1p/compress.1p
-
-# Part of util-linux
-rm -v man1p/renice.1p
-
 # Obsolete
 rm -f man3/infnan.3
 
+# we do not have sccs (#203302)
+%{__rm} %{posix_name}/man1p/{admin,delta,get,prs,rmdel,sact,sccs,unget,val,what}.1p
+
 %build
 
 %install
-rm -rf $RPM_BUILD_ROOT
-
-instdir=$RPM_BUILD_ROOT%{_mandir}
-for sec in 0p 1 1p 2 3 3p 4 5 6 7 8 9; do
-  mkdir -p $instdir{,/en}/man$sec
-  for f in man$sec/*.$sec; do
-    case $f in
-      man$sec/'*'.$sec)
-	# this dir is empty
-	continue ;;
-      man7/iso_8859-*.7)
-	enc=${f#man7/}
-	enc=${enc%.7}
-	enc=ISO-${enc#iso_}
-	LANG=en iconv -f $enc -t utf-8 -o $instdir/$f $f ;;
-      man7/koi8-r.7)
-	enc=${f#man7/}
-	enc=${enc%.7}
-	LANG=en iconv -f $enc -t utf-8 -o $instdir/$f $f ;;
-      *)
-	LANG=en iconv -f latin1 -t utf-8 -o $instdir/en/$f $f
-	LANG=en iconv -f utf-8 -t ascii//translit -o $instdir/$f $instdir/en/$f
-	cmp -s $instdir/$f $instdir/en/$f &&
-	  rm $instdir/en/$f ;;
-    esac
-  done
-done
-
-%clean
-rm -rf $RPM_BUILD_ROOT
+make install DESTDIR=$RPM_BUILD_ROOT
+pushd %{posix_name}
+make install DESTDIR=$RPM_BUILD_ROOT
+popd
 
 %files
 %defattr(0644,root,root,0755)
-%doc README man-pages-%{version}.Announce POSIX-COPYRIGHT
+%doc README man-pages-%{version}.Announce Changes
+%doc %{posix_name}/POSIX-COPYRIGHT %{posix_name}/%{posix_name}.{README,Announce}
 %{_mandir}/man*/*
-%lang(en) %{_mandir}/en/man*
+
 
 %changelog
+* Wed May 21 2014 Daisuke SUZUKI <daisuke@linux.or.jp> 3.66-1
+- update to 3.66
+
 * Sun Nov 22 2009 Ryoichi INAGAKI <ryo1@bc.wakwak.com> 3.23-1
 - added Japanese summary
 - updated Sources and Patches based on Fedora 3.23-3
@@ -297,7 +243,7 @@ rm -rf $RPM_BUILD_ROOT
   they are no longer part of another package
 - include man pages for ld*
 
-* Thu Oct 24 2000 Trond Eivind Glomsr藷?<teg@redhat.com>
+* Tue Oct 24 2000 Trond Eivind Glomsr藷?<teg@redhat.com>
 - remove const from iconv function prototype (#19486)
 
 * Tue Aug 29 2000 Trond Eivind Glomsr藷?<teg@redhat.com>
@@ -320,7 +266,7 @@ rm -rf $RPM_BUILD_ROOT
 * Mon Jun 19 2000 Matt Wilson <msw@redhat.com>
 - defattr before docs in filelist
 
-* Sun Jun 17 2000 Trond Eivind Glomsr藷?<teg@redhat.com>
+* Sat Jun 17 2000 Trond Eivind Glomsr藷?<teg@redhat.com>
 - updated to 1.30
 
 * Tue Jun 06 2000 Trond Eivind Glomsr藷?<teg@redhat.com>