X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=man-pages.spec;h=8365edfb634bc8633e1998b13aa09b9cb422ffd3;hb=b749372feced2911b49c1e658bad6e76561c8861;hp=a5e40908c37c2d06dddc2ef6edfd6639b9a7a7d8;hpb=52efd71a624ccec17544074ace08d3f6129bb470;p=packages%2Fman-pages.git

diff --git a/man-pages.spec b/man-pages.spec
index a5e4090..8365edf 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:	3.34
+Version:	3.48
 Release:	1
 License:	distributable
 Group:		Documentation
@@ -39,9 +39,8 @@ Group:		Documentation
 %define		ru_asp_version		1.4
 %define		tr_version		1.0.3
 %define		zh_version		1.5
-#Source0:	http://www.kernel.org/pub/linux/docs/manpages/%{name}-%{version}.tar.gz
-Source0:	http://man7.org/linux/man-pages/download/%{name}-%{version}.tar.gz
-# Source0-md5:	60e5737cd25b8b5ee763056d16e53b70
+Source0:	http://www.kernel.org/pub/linux/docs/man-pages/%{name}-%{version}.tar.xz
+# Source0-md5:	16cb409678ad97f936a452f47f806044
 Source1:	ftp://ftp.linux.cz/pub/localization/linux/czman/%{name}-cs-%{cs_version}.tar.gz
 # Source1-md5:	e8036794c1762804f2e242cc5b52001e
 # there is no LDP man page here, yet - but include it in sources for completeness
@@ -106,7 +105,6 @@ Patch1:		%{name}-zh_fixes.patch
 Patch2:		%{name}-misc.patch
 Patch3:		%{name}-extra.patch
 URL:		http://www.kernel.org/doc/man-pages/
-BuildRequires:	iconv
 BuildRequires:	sed >= 4.0
 Obsoletes:	man-pages-cs
 Obsoletes:	man-pages-de
@@ -318,11 +316,9 @@ mv -f manpages-hu-%{hu_version}.orig/usr/share/man/hu hu
 mv -f man-pages-it-%{it_version} it
 mv -f man-pages-ja-%{ja_version}/manual/LDP_man-pages ja
 # duplicates of LDP man pages
-rm -rf man-pages-ja-%{ja_version}/manual/{gnumaniak,ld.so,modutils/man2,glibc-linuxthreads/man3,netkit/{man3/{daemon,err,login}.3,man5/ftpusers.5},bind/{man5/resolver.5,man7/mailaddr.7},util-linux/man1/tailf.1}
+rm -rf man-pages-ja-%{ja_version}/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},util-linux/man1/tailf.1}
 # shadow manuals already in shadow package
 rm -rf man-pages-ja-%{ja_version}/manual/shadow
-# we have man not man-db
-rm -rf man-pages-ja-%{ja_version}/manual/man-db
 # dhcp 3 not dhcp2
 rm -rf man-pages-ja-%{ja_version}/manual/dhcp2
 # nfs-utils not nfs-server
@@ -353,12 +349,6 @@ rm -f zh_CN/man1/perltw.1
 # would go in gb18030, but not gb2312
 rm -f zh_CN/man8/{chat,printcap}.8
 
-# these man-pages are in UTF-8
-for f in zh_CN/man?/* ; do
-	iconv -f UTF8 -t GB2312 $f > ${f}.tmp
-	mv -f ${f}.tmp $f
-done
-
 mv -f cs/man8/at.1 cs/man1
 # unify name
 mv -f de/man7/{iso_8859_1,iso_8859-1}.7
@@ -400,9 +390,8 @@ rm -f man1/COPYING
 rm -f man*/README*
 
 for n in man{1,2,3,4,5,6,7,8,0p,1p,3p}/* */man{1,2,3,4,5,6,7,8,9}/* ; do
-	x=`echo $n | sed -e 's,^.*man\([^/]\)/.*,\1,'`
-	if head -n 1 $n| grep "^\.so man$x/" >/dev/null 2>&1 ; then
-		sed -i -e 's,\.so man./,.so ,' $n
+	if head -n 1 $n | grep "^\.so [^/]*$" >/dev/null 2>&1 ; then
+		sed -i -e 's,.so \([^\.]*\)\.\(.*\),.so man\2/\1.\2,' $n
 	fi
 done
 
@@ -416,6 +405,8 @@ rm -f man8/sync.8
 rm -f man1/time.1
 # ftp servers
 rm -f man5/ftpusers.5
+# glibc
+rm -f man8/ld-linux{,.so}.8
 
 %if %{with tars}
 package=NONE