X-Git-Url: http://git.pld-linux.org/?p=packages%2Fman-pages.git;a=blobdiff_plain;f=man-pages.spec;h=aef697ed00eabb7bf6ac404556de0c614754d9f3;hp=e59d5127836705554cc3bb8dae285a3137b8d4b7;hb=HEAD;hpb=10cb02d08e488ea1756e5b2cb4bc69b0c12d5b93

diff --git a/man-pages.spec b/man-pages.spec
index e59d512..c8039c0 100644
--- a/man-pages.spec
+++ b/man-pages.spec
@@ -15,7 +15,7 @@ Summary(ru.UTF-8):	Страницы руководства из Проекта 
 Summary(tr.UTF-8):	Linux Belgeleme Projesinin sistem kılavuz sayfaları
 Summary(uk.UTF-8):	Сторінки мануалу (man) з Linux Documentation Project
 Name:		man-pages
-Version:	5.04
+Version:	6.8
 Release:	1
 License:	distributable
 Group:		Documentation
@@ -28,8 +28,8 @@ Group:		Documentation
 %define		fr_version		3.70-1
 %define		hu_version		20010119
 %define		id_version		20011116
-%define		it_version		4.08
-%define		ja_version		20191115
+%define		it_version		5.06
+%define		ja_version		20231115
 %define		ko_version		20050219
 %define		nl_version		0.13.3
 %define		pl_version		20051105
@@ -37,11 +37,11 @@ Group:		Documentation
 %define		ro_version		0.2
 #%%define	ru_version		0.98
 %define		ru_asp_version		1.4
-%define		tr_version		1.0.5
+%define		tr_version		2.0.4
 %define		zh_version		1.5.2
-%define		posix_version		2013-a
+%define		posix_version		2017-a
 Source0:	https://www.kernel.org/pub/linux/docs/man-pages/%{name}-%{version}.tar.xz
-# Source0-md5:	4eb98f597b629f81993c7b71ecab0ab0
+# Source0-md5:	b4bbf3d7ba22877eeec4916168b40268
 Source1:	ftp://ftp.linux.cz/pub/localization/linux/czman/%{name}-cs-%{cs_version}.tar.bz2
 # Source1-md5:	a3df67d98ab63a0a360cd0794ec87e0e
 # there is no LDP man page here, yet - but include it in sources for completeness
@@ -74,11 +74,11 @@ Source9:	http://www.mif.pg.gda.pl/homepages/ankry/man-pages/%{name}-from-www-id-
 # Source9-md5:	34a69de42ec4ae8180b947f8777a3e7a
 # available also as http://
 Source10:	ftp://ftp.pluto.linux.it/pub/pluto/ildp/man/%{name}-it-%{it_version}.tar.xz
-# Source10-md5:	869cf8ff2aa5c11b8d15d1ba7a47f4fa
+# Source10-md5:	80329fc120d4ea29cd3408b7ced4f4c3
 # note: man-pages-it-extra-0.5.0.tar.gz is also covered by the above version
-#Source11Download: http://linuxjm.osdn.jp/download.html
-Source11:	http://linuxjm.osdn.jp/%{name}-ja-%{ja_version}.tar.gz
-# Source11-md5:	32dcc9073f85c1ee7bbfbf098b56f204
+#Source11Download: https://linuxjm.sourceforge.io/download.html
+Source11:	https://linuxjm.sourceforge.io/%{name}-ja-%{ja_version}.tar.gz
+# Source11-md5:	3d6fcdcbbb4452dcb8d4c41b12f8c062
 Source12:	http://download.kldp.net/man/man-pages-ko/%{ko_version}/%{name}-ko-%{ko_version}.tar.gz
 # Source12-md5:	e31dc6a51c02436371373dedaeeeacab
 # TODO: check 20051127 in Debian/Ubuntu?
@@ -98,8 +98,8 @@ Source16:	http://www.rolix.org/man/arhiva/man-pages-ro-%{ro_version}.tar.gz
 # ASP-linux have more up-to-date manpages (but 0.98 contains some updated pages)
 Source17:	http://www.mif.pg.gda.pl/homepages/ankry/man-pages/manpages-ru-asp-%{ru_asp_version}.tar.bz2
 # Source17-md5:	fffb27648417c8dd551e2a4403eefc64
-Source18:	http://downloads.sourceforge.net/belgeler/man-pages-tr-%{tr_version}.tar.gz
-# Source18-md5:	8f322a60c80e31c34ef8979edaf68aae
+Source18:	http://downloads.sourceforge.net/belgeler/manpages-tr-%{tr_version}.tar.gz
+# Source18-md5:	3f5fed164ba9fd9e725117cf4150fad4
 Source19:	http://www.linux.org.ua/twiki/pub/Projects/ManUk/man-pages-uk_UA.alfa.tar.gz
 # Source19-md5:	89576c5b51bb83c8bfa8bda794b96e21
 #Source20Download: https://github.com/lidaobing/manpages-zh/releases
@@ -107,20 +107,19 @@ Source19:	http://www.linux.org.ua/twiki/pub/Projects/ManUk/man-pages-uk_UA.alfa.
 Source20:	https://github.com/lidaobing/manpages-zh/archive/v%{zh_version}/manpages-zh-%{zh_version}.tar.gz
 # Source20-md5:	1bbdc4f32272df0b95146518b27bf4be
 Source30:	https://www.kernel.org/pub/linux/docs/man-pages/man-pages-posix/man-pages-posix-%{posix_version}.tar.xz
-# Source30-md5:	825fde78e6fddd02426ecdd50e2cbe0d
+# Source30-md5:	16972095f1ec0820d51b2390e055c59d
 Source50:	%{name}-links.list
 Source100:	%{name}-tars.list
 Patch0:		%{name}-zh_fixes.patch
 Patch1:		%{name}-misc.patch
 Patch2:		%{name}-extra.patch
-Patch3:		%{name}-tr-bash.patch
-Patch4:		%{name}-tr-so-links.patch
 Patch5:		%{name}-misc-localized.patch
 Patch6:		%{name}-cs-bash.patch
 Patch10:	%{name}-extra-files.patch
 URL:		https://www.kernel.org/doc/man-pages/
 BuildRequires:	autoconf >= 2.61
 BuildRequires:	automake
+BuildRequires:	iconv
 BuildRequires:	rpmbuild(macros) >= 1.566
 BuildRequires:	sed >= 4.0
 BuildRequires:	tar >= 1:1.22
@@ -301,16 +300,14 @@ Summary(pl.UTF-8):	Podręczniki systemowe z Linux Documentation Project dotyczą
 Group:		Documentation
 
 %description posix
-Part of POSIX 1003.1-2003 in man pages format.
+Part of POSIX 1-2017 in man pages format.
 
 %description posix -l pl.UTF-8
-Fragmenty POSIX 1003.1-2003 w postaci stron podręcznika systemowego.
+Fragmenty POSIX 1-2017 w postaci stron podręcznika systemowego.
 
 %prep
 %setup -q -c -a1 -a2 -a3 -a4 -a5 -a6 -a7 -a8 -a9 -a10 -a11 -a13 -a14 -a15 -a16 -a17 -a18 -a19 -a20 -a30
 %patch0 -p1 -d manpages-zh-%{zh_version}
-%patch3 -p1 -d man-pages-tr-%{tr_version}
-%patch4 -p1 -d man-pages-tr-%{tr_version}
 %patch6 -p1 -d man-pages-cs-%{cs_version}
 # man-pages-extra
 %patch10 -p0
@@ -320,8 +317,8 @@ install -d man-pages-extra/C
 
 # prepare somehow unified source trees
 install -d src
-%{__mv} man-pages-%{version} src/C
-%{__mv} man-pages-posix-%{posix_version}/man*p src/C
+%{__mv} man-pages-%{version}/man src/C
+%{__mv} man-pages-posix-%(echo %{posix_version} | sed -e s/-a//)/man*p src/C
 %{__mv} man-pages-cs-%{cs_version} src/cs
 %{__mv} manpages-da-%{da_version} src/da
 %{__mv} manpages-de-%{de_version} src/de
@@ -339,7 +336,7 @@ tar xzf %{SOURCE12} -C src/ko
 %{__mv} man-pages-%{pt_version}-pt_BR src/pt_BR
 %{__mv} man-ro src/ro
 %{__mv} manpages-ru-asp-%{ru_asp_version} src/ru
-%{__mv} man-pages-tr-%{tr_version} src/tr
+%{__mv} manpages-tr-%{tr_version}/source src/tr
 %{__mv} man-pages-uk_UA.alfa src/uk
 %{__mv} manpages-zh-%{zh_version} src/zh
 
@@ -370,6 +367,22 @@ done < %{SOURCE50}
 
 # unify trees for easier processing (where possible)
 
+# C: get rid of man2 and man3 subdirs
+%{__sed} -i -e 's,man3head/,man3/,' src/C/man3/register_printf_*.3
+%{__sed} -i -e 's,man3head/,man3/,' src/C/man3const/PA_*.3const
+%{__sed} -i -e 's,man3head/,man3/,' src/C/man3type/printf_*.3type
+%{__sed} -i -e 's,man3head/,man3/,' src/C/man3type/loff_t.3type
+%{__sed} -i -e 's,man3head/,man3/,' src/C/man3type/sockaddr_storage.3type
+%{__sed} -i -e 's,man3head/,man3/,' src/C/man3type/sockaddr_un.3type
+%{__sed} -i -e 's,man3type/,man3/,' src/C/man7/sigevent.7
+%{__mv} -i src/C/man2type/*.2type src/C/man2
+%{__mv} -i src/C/man3const/*.3const src/C/man3
+%{__mv} -i src/C/man3head/*.3head src/C/man3
+%{__mv} -i src/C/man3type/*.3type src/C/man3
+rmdir src/C/man2type src/C/man3{const,head,type}
+# originally done by `make install`
+%{__sed} -i -e '/^\.TH/ s/(unreleased)/%{version}/' $(grep -l '^\.TH' src/C/man[1-8]/*.[1-8]*)
+
 # da: add man1 subdir
 install -d src/da/man1
 %{__mv} src/da/*.1 src/da/man1
@@ -392,35 +405,52 @@ done
 # ja: merge per-package trees
 %{__mv} src/ja/manual/LDP_man-pages/man* src/ja
 # duplicates of LDP man pages
-%{__rm} -r src/ja/manual/{gnumaniak,ld.so,modutils/man2,glibc-linuxthreads/man3,man/man1/{apropos,man,whatis}.1,netkit/{man3/{daemon,err,login}.3,man5/ftpusers.5},bind/{man5/resolver.5,man7/mailaddr.7}}
+%{__rm} -r src/ja/manual/{gnumaniak,ld.so,modutils/man2,glibc-linuxthreads/man3}
+%{__rm} src/ja/manual/bind/{man5/resolver.5,man7/{hostname,mailaddr}.7}
+%{__rm} src/ja/manual/netkit/{man3/{daemon,err,login}.3,man5/ftpusers.5}
 # shadow manuals already in shadow package
 %{__rm} -r src/ja/manual/shadow
+# PLD uses:
+# coreutils not {file,sh-,text}utils
+%{__rm} -r src/ja/manual/GNU_{fileutils,sh-utils,textutils}
 # dhcp 3 not dhcp2
 %{__rm} -r src/ja/manual/dhcp2
+# kmod not modutils or module-init-tools
+%{__rm} -r src/ja/manual/module-init-tools
+%{__rm} -r src/ja/manual/modutils
 # nfs-utils not nfs-server
 %{__rm} -r src/ja/manual/nfs-server
 # ypbind-mt not ypbind
 %{__rm} -r src/ja/manual/ypbind
-# we use: net-tools/hostname, util-linux/{kill,last,lastb,write}, SysVinit/{mesg,wall,halt,reboot,shutdown}, textutils/od, quota/rquotad
-%{__rm} src/ja/manual/{GNU_sh-utils/man1/hostname.1,SysVinit/man1/{last,lastb}.1,procps/man1/kill.1,util-linux/man1/{mesg,wall}.1,netkit/man1/write.1,nfs-utils/man8/rquotad.8}
-# following modutils changes
-for f in src/ja/manual/modutils/man8/{depmod,insmod,lsmod,modinfo,modprobe,rmmod} ; do
-	%{__mv} ${f}.8 ${f}.modutils.8
-done
-# avoid filename conflict
-%{__mv} src/ja/manual/netkit/man8/ftpd.{8,8n}
-# remove files existing in main man-pages tarball
-# note: (should we keep those from main tarball or ja tarball?)
-%{__rm} src/ja/manual/GNU_fileutils/man1/{chgrp,chmod,chown,cp,dd,df,du,install,ln,ls,mkdir,mkfifo,mknod,mv,rm,rmdir,touch}.1
-%{__rm} src/ja/manual/GNU_sh-utils/man1/{basename,chroot,date,dirname,echo,env,expr,false,groups,hostid,id,logname,nice,nohup,pathchk,printenv,printf,pwd,sleep,stty,su,tee,test,true,tty,uname,users,who,whoami,yes}.1
-%{__rm} src/ja/manual/GNU_textutils/man1/{cat,cksum,comm,csplit,cut,expand,fmt,fold,head,join,md5sum,nl,od,paste,pr,sort,split,sum,tac,tail,tr,unexpand,uniq,wc}.1
-%{__rm} src/ja/manual/lpr-linux/man1/{lpq,lpr,lprm}.1
-%{__rm} src/ja/manual/net-tools/man1/hostname.1
+# byacc not bison
+%{__rm} src/ja/manual/GNU_bison/man1/yacc.1
+# hostname(1) from hostname (ex-net-tools)
+%{__rm} src/ja/manual/GNU_coreutils/man1/hostname.1
+# kill(1) from util-linux
+%{__rm} src/ja/manual/GNU_coreutils/man1/kill.1
+# uptime(1) from procps
+%{__rm} src/ja/manual/GNU_coreutils/man1/uptime.1
+# last(1),lastb(1),mesg(1) from util-linux
+%{__rm} src/ja/manual/SysVinit/man1/{last,lastb,mesg}.1
+# blkid(8) from util-linux
+%{__rm} src/ja/manual/e2fsprogs/man8/blkid.8
+# lpq(1),lpr(1),lprm(1),lpc(8) from cups (or LPRng)
+%{__rm} src/ja/manual/lpr-linux/{man1/{lpq,lpr,lprm}.1,man8/lpc.8}
+# from man-db not man
+%{__rm} src/ja/manual/man/man1/{apropos,man,whatis}.1
+# timeout(1) from coreutils
 %{__rm} src/ja/manual/netatalk/man1/timeout.1
-%{__rm} src/ja/manual/procps/man1/uptime.1
-%{__rm} src/ja/manual/util-linux/man1/kill.1
-%{__rm} src/ja/manual/bind/man7/hostname.7
-%{__rm} src/ja/manual/cups/man8/lpc.8
+# write(1) from util-linux
+%{__rm} src/ja/manual/netkit/man1/write.1
+# rquotad(8) from quota
+%{__rm} src/ja/manual/nfs-utils/man8/rquotad.8
+# kill(1) from util-linux
+%{__rm} src/ja/manual/procps/man1/kill.1
+# wall(1) from SysVinit
+%{__rm} src/ja/manual/util-linux/man1/wall.1
+# resolve conflicts of alternatives
+%{__mv} src/ja/manual/netkit/man8/ftpd.8{,netkit}
+# merge the rest
 for f in 1 3 4 5 6 7 8 ; do
 	mv -i src/ja/manual/*/man${f}/* src/ja/man${f}
 done
@@ -489,10 +519,14 @@ for d in man-pages-extra/cs/man* ; do
 	mv -i $d/*.* src/${d#man-pages-extra/}
 done
 
-# tr: make man pages from XML (note: compiles some utility)
-%{__make} -C src/tr/source
-find src/tr/tr -name '*.gz' | xargs gzip -d
-%{__mv} src/tr/tr/man* src/tr
+# tr: gunzip .so links
+#find src/tr -name '*.gz' | xargs gzip -d
+# ...but currently ".gz" is a lie, files are plain ascii
+for f in src/tr/man?/*.?.gz ; do
+	%{__mv} "$f" "${f%.gz}"
+done
+%{__sed} -i -e 's/\.2\.gz$/.2/' src/tr/man2/{afs_syscall,break,fattach,fdetach,getmsg,getpmsg,gtty,isastream,lock,madvise1,mpx,prof,putmsg,putpmsg,recvfrom,recvmsg,security,sendmsg,sendto,stty,tuxcall,vserver}.2
+%{__sed} -i -e 's/\.4\.gz$/.4/' src/tr/man4/zero.4
 
 # zh: prepare zh_CN and zh_TW
 cd src/zh
@@ -575,6 +609,8 @@ for l in %{man_langs} ; do
 done
 
 # files with just .so links pointing to non-existing man pages
+# groff_man.7 (should belong to groff package)
+%{__rm} $RPM_BUILD_ROOT%{_mandir}/man7/man.7
 # modules.2
 %{__rm} $RPM_BUILD_ROOT%{_mandir}/de/man2/{create_module,delete_module,get_kernel_syms,init_module}.2
 # obsolete.2