X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=glibc.spec;h=df0651edf3525e63602ff31dec74f5c08453ea50;hb=af71227576b00baface65793ff0192cc67cfea56;hp=ca63757db1bd2d18443f1526a08697e8c195cdaf;hpb=3238e0685bfea05dfed2164c91898a9031b319be;p=packages%2Fglibc.git

diff --git a/glibc.spec b/glibc.spec
index ca63757..df0651e 100644
--- a/glibc.spec
+++ b/glibc.spec
@@ -8,21 +8,26 @@
 # - math/{test-fenv,test-tgmath,test-float,test-ifloat}, debug/backtrace-tst(SEGV)  fail on alpha
 #
 # Conditional build:
-# min_kernel	(default is 2.6.32)
+# min_kernel	(default is 3.4.0 except for x86/x86_64 where 2.6.32 suffices)
 %bcond_without	memusage	# don't build memusage utility
 %bcond_without	selinux		# without SELinux support (in nscd)
 %bcond_with	tests		# perform "make test"
 %bcond_without	localedb	# don't build localedb-all (is time consuming)
-%bcond_with	cross		# build using crossgcc (without libgcc_eh)
-%bcond_without	nss_crypt	# don't build localedb-all (is time consuming)
+%bcond_with	cross		# make a cross build, skip native programs
+%bcond_without	nss_crypt	# disable crypt features based on Mozilla NSS library
+%bcond_with	bash_nls	# use bash NLS in shell scripts (ldd, sotruss); restores /bin/bash dep
 #
-%{!?min_kernel:%global		min_kernel	2.6.32}
+%ifarch %{ix86} %{x8664}
+%{!?min_kernel:%global		min_kernel	2.6.32} 
+%else
+%{!?min_kernel:%global		min_kernel	3.4.0}
+%endif
 
 %ifarch sparc64
 %undefine	with_memusage
 %endif
 
-%define		core_version	2.20
+%define		core_version	2.24
 %define		llh_version	7:2.6.32.1-1
 
 Summary:	GNU libc
@@ -36,28 +41,29 @@ Summary(tr.UTF-8):	GNU libc
 Summary(uk.UTF-8):	GNU libc версії
 Name:		glibc
 Version:	%{core_version}
-Release:	6
+Release:	3
 Epoch:		6
 License:	LGPL v2.1+
 Group:		Libraries
 Source0:	http://ftp.gnu.org/gnu/glibc/%{name}-%{version}.tar.xz
-# Source0-md5:	948a6e06419a01bd51e97206861595b0
+# Source0-md5:	97dc5517f92016f3d70d83e3162ad318
 Source2:	nscd.init
 Source3:	nscd.sysconfig
 Source4:	nscd.logrotate
-#Source5:	http://www.mif.pg.gda.pl/homepages/ankry/man-PLD/%{name}-man-pages.tar.bz2
-Source5:	%{name}-man-pages.tar.bz2
-# Source5-md5:	0d93d9628f35f1eae015affb11390df3
+# from man-pages.spec --with tars
+Source5:	%{name}-man-pages.tar.xz
+# Source5-md5:	82537aa7f6ee31dd782e7e085cc21018
 Source6:	%{name}-localedb-gen
 Source7:	%{name}-LD-path.c
-Source8:	nscd.upstart
 Source9:	nscd.tmpfiles
-Patch0:		%{name}-git.patch
+# use branch.sh to update glibc-git.patch
+Patch0:		glibc-git.patch
+# Patch0-md5:	db84fc2f3b428f64896dde0c7b0d8856
 # against GNU TP (libc domain)
 #Patch1:		%{name}-pl.po-update.patch
 Patch2:		%{name}-pld.patch
 Patch3:		%{name}-crypt-blowfish.patch
-Patch4:		%{name}-sotruss-sh.patch
+Patch4:		%{name}-no-bash-nls.patch
 Patch5:		%{name}-sparc-softfp-gcc.patch
 Patch6:		%{name}-paths.patch
 Patch7:		1070_all_glibc-fadvise64_64.patch
@@ -65,7 +71,6 @@ Patch8:		%{name}-missing-nls.patch
 Patch9:		%{name}-nss_include_dirs.patch
 Patch10:	%{name}-info.patch
 Patch11:	%{name}-autoconf.patch
-Patch12:	%{name}-format.patch
 
 Patch14:	%{name}-sparc-errno_fix.patch
 Patch15:	%{name}-new-charsets.patch
@@ -76,23 +81,19 @@ Patch17:	%{name}-morelocales.patch
 Patch18:	%{name}-locale_fixes.patch
 Patch19:	%{name}-ZA_collate.patch
 Patch20:	%{name}-thread_start.patch
-Patch21:	%{name}-cross-gcc_eh.patch
-Patch22:	%{name}-with-stroke.patch
+
 Patch23:	%{name}-pt_pax.patch
-Patch25:	%{name}-cv_gnu89_inline.patch
-Patch26:	%{name}-posix-sh.patch
-Patch27:	%{name}-locale-C.patch.xz
-# Patch27-md5:	34ebe52a2afb923e33af0fb7c541f540
-Patch28:	%{name}-locale-C-pld.patch
+
+# http://pkgs.fedoraproject.org/cgit/rpms/glibc.git/plain/glibc-c-utf8-locale.patch
+Patch27:	%{name}-c-utf8-locale.patch
+
 Patch29:	%{name}-arm-alignment-fix.patch
 Patch30:	glibc-rh1124987.patch
-Patch31:	%{name}-origin.patch
-Patch32:	%{name}-Os-fail-workaround.patch
 
 Patch38:	1055_all_glibc-resolv-dynamic.patch
 URL:		http://www.gnu.org/software/libc/
 %{?with_selinux:BuildRequires:	audit-libs-devel}
-BuildRequires:	autoconf
+BuildRequires:	autoconf >= 2.69
 BuildRequires:	automake
 %ifarch alpha
 BuildRequires:	binutils >= 2:2.17.50.0.7
@@ -101,12 +102,12 @@ BuildRequires:	binutils >= 2:2.15.90.0.3
 %endif
 %{!?with_cross:BuildRequires:	dietlibc-static}
 BuildRequires:	gawk
-BuildRequires:	gcc >= 6:4.3
+BuildRequires:	gcc >= 6:4.7
 %{?with_memusage:BuildRequires:	gd-devel >= 2.0.1}
-BuildRequires:	gettext-devel >= 0.10.36
+BuildRequires:	gettext-tools >= 0.10.36
 %{?with_selinux:BuildRequires:	libselinux-devel >= 1.18}
 BuildRequires:	linux-libc-headers >= %{llh_version}
-BuildRequires:	nss-devel >= 1:3.15.1-2
+%{?with_nss_crypt:BuildRequires:	nss-devel >= 1:3.15.1-2}
 BuildRequires:	perl-base
 BuildRequires:	rpm-build >= 4.3-0.20030610.28
 BuildRequires:	rpmbuild(macros) >= 1.567
@@ -116,6 +117,9 @@ Requires(post):	ldconfig = %{epoch}:%{version}-%{release}
 Requires:	filesystem
 Requires:	uname(release) >= %{min_kernel}
 Provides:	%{name}(%{_target_cpu}) = %{epoch}:%{version}-%{release}
+%ifarch %{ix86}
+Provides:	%{name}(ix86) = %{epoch}:%{version}-%{release}
+%endif
 Provides:	glibc(nptl)
 Provides:	glibc(tls)
 Provides:	rtld(GNU_HASH)
@@ -133,12 +137,12 @@ Conflicts:	kernel < %{min_kernel}
 Conflicts:	kernel24
 Conflicts:	kernel24-smp
 Conflicts:	ld.so < 1.9.9-10
-Conflicts:	man-pages < 1.43
-Conflicts:	poldek < 0.18.8-5
+Conflicts:	man-pages < 4.00
+Conflicts:	poldek < 0.30.1-9
 Conflicts:	rc-scripts < 0.3.1-13
 Conflicts:	rpm < 4.1
 Conflicts:	xorg-driver-video-nvidia-libs < 1:295.33
-ExclusiveArch:	i486 i586 i686 pentium3 pentium4 athlon %{x8664} ia64 alpha s390 s390x sparc sparc64 sparcv9 ppc ppc64 armv5tel
+ExclusiveArch:	i486 i586 i686 pentium3 pentium4 athlon %{x8664} x32 ia64 alpha s390 s390x sparc sparc64 sparcv9 ppc ppc64 armv5tel
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 # avoid -s here (ld.so must not be stripped to allow any program debugging)
@@ -160,9 +164,6 @@ BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 %{expand:%%define	__cc	%{__cc} -m32}
 %endif
 
-# Architectures supported in glibc-ports
-%define		ports_arch		alpha %{arm}
-
 # Xen-friendly glibc
 %define		specflags_ia32		-mno-tls-direct-seg-refs
 %define		specflags_x86_64	-mno-tls-direct-seg-refs -fasynchronous-unwind-tables
@@ -295,8 +296,10 @@ Summary(pl.UTF-8):	Narzędzia i dane używane przez glibc
 Group:		Applications/System
 Requires:	%{name} = %{epoch}:%{version}-%{release}
 %ifarch %{ix86}
+Conflicts:	%{name}(x32)
 Conflicts:	%{name}(x86_64)
 %endif
+Conflicts:	man-pages < 4.00
 
 %description misc
 Utilities and data used by glibc.
@@ -328,6 +331,7 @@ Summary(fr.UTF-8):	Crée un cache de bibliothčque partagée et gčre *.so
 Summary(pl.UTF-8):	Tworzenie cache'u bibliotek dynamicznych i ich dowiązań symbolicznych
 Summary(tr.UTF-8):	Ortak kitaplýk önbelleđi yaratýr ve bađlantýlarý kurar
 Group:		Applications/System
+Requires:	uname(release) >= %{min_kernel}
 # This is needed because previous package (glibc) had autoreq false and had
 # provided this manually. Probably poldek bug that have to have it here.
 Provides:	/sbin/ldconfig
@@ -365,6 +369,116 @@ düzgün bir ţekilde yüklenmesi için gereken simgesel bađlantýlarý
 kurar. Ayrýca ortak kitaplýklarý kullanan programlarýn yüklenmesini
 hýzlandýran /etc/ld.so.cache dosyasýný yaratýr.
 
+%package -n nss_compat
+Summary:	Old style NYS NSS glibc module
+Summary(es.UTF-8):	El antiguo módulo NYS NSS de glibc
+Summary(pl.UTF-8):	Stary moduł NYS NSS glibc
+Group:		Base
+Requires:	%{name} = %{epoch}:%{version}-%{release}
+
+%description -n nss_compat
+Old style NYS NSS glibc module.
+
+%description -n nss_compat -l es.UTF-8
+El antiguo módulo NYS NSS de glibc
+
+%description -n nss_compat -l pl.UTF-8
+Stary moduł NYS NSS glibc.
+
+%package -n nss_dns
+Summary:	BIND NSS glibc module
+Summary(es.UTF-8):	Módulo BIND NSS de glibc
+Summary(pl.UTF-8):	Moduł BIND NSS glibc
+Group:		Base
+Requires:	%{name} = %{epoch}:%{version}-%{release}
+
+%description -n nss_dns
+BIND NSS glibc module.
+
+%description -n nss_dns -l es.UTF-8
+Módulo BIND NSS de glibc.
+
+%description -n nss_dns -l pl.UTF-8
+Moduł BIND NSS glibc.
+
+%package -n nss_files
+Summary:	Traditional files databases NSS glibc module
+Summary(es.UTF-8):	Módulo de tradicionales bases de datos en ficheros para glibc
+Summary(pl.UTF-8):	Moduł tradycyjnych plikowych baz danych NSS glibc
+Group:		Base
+Requires:	%{name} = %{epoch}:%{version}-%{release}
+
+%description -n nss_files
+Traditional files databases NSS glibc module.
+
+%description -n nss_files -l es.UTF-8
+Módulo de tradicionales bases de datos en ficheros para glibc.
+
+%description -n nss_files -l pl.UTF-8
+Moduł tradycyjnych plikowych baz danych NSS glibc.
+
+%package -n nss_hesiod
+Summary:	hesiod NSS glibc module
+Summary(es.UTF-8):	Módulo hesiod NSS de glibc
+Summary(pl.UTF-8):	Moduł hesiod NSS glibc
+Group:		Base
+Requires:	%{name} = %{epoch}:%{version}-%{release}
+
+%description -n nss_hesiod
+glibc NSS (Name Service Switch) module for databases access.
+
+%description -n nss_hesiod -l es.UTF-8
+Módulo hesiod NSS de glibc.
+
+%description -n nss_hesiod -l pl.UTF-8
+Moduł glibc NSS (Name Service Switch) dostępu do baz danych.
+
+%package -n nss_nis
+Summary:	NIS(YP) NSS glibc module
+Summary(es.UTF-8):	Módulo NIS(YP) NSS de glibc
+Summary(pl.UTF-8):	Moduł NIS(YP) NSS glibc
+Group:		Base
+Requires:	%{name} = %{epoch}:%{version}-%{release}
+
+%description -n nss_nis
+glibc NSS (Name Service Switch) module for NIS(YP) databases access.
+
+%description -n nss_nis -l es.UTF-8
+Módulo NSS de glibc para acceder las bases de datos NIS(YP).
+
+%description -n nss_nis -l pl.UTF-8
+Moduł glibc NSS (Name Service Switch) dostępu do baz danych NIS(YP).
+
+%package -n nss_nisplus
+Summary:	NIS+ NSS module
+Summary(es.UTF-8):	Módulo NIS+ NSS
+Summary(pl.UTF-8):	Moduł NIS+ NSS
+Group:		Base
+Requires:	%{name} = %{epoch}:%{version}-%{release}
+
+%description -n nss_nisplus
+glibc NSS (Name Service Switch) module for NIS+ databases access.
+
+%description -n nss_nisplus -l es.UTF-8
+Módulo NSS (Name Service Switch) de glibc para acceder las bases de
+datos NIS+.
+
+%description -n nss_nisplus -l pl.UTF-8
+Moduł glibc NSS (Name Service Switch) dostępu do baz danych NIS+.
+
+%package memusage
+Summary:	Memory usage profiler
+Summary(pl.UTF-8):	Narzędzie do profilowania zużycia pamięci
+Group:		Development/Tools
+Requires:	%{name} = %{epoch}:%{version}-%{release}
+Conflicts:	man-pages < 4.00
+
+%description memusage
+Memory usage profiler.
+
+%description memusage -l pl.UTF-8
+Narzędzie do profilowania zużycia pamięci.
+
 %package devel
 Summary:	Additional libraries required to compile
 Summary(de.UTF-8):	Weitere Libraries zum Kompilieren
@@ -378,17 +492,19 @@ Summary(uk.UTF-8):	Додаткові бібліотеки, потрібні д
 Group:		Development/Libraries
 Requires:	%{name} = %{epoch}:%{version}-%{release}
 Requires:	%{name}-devel-utils = %{epoch}:%{version}-%{release}
-Requires:	%{name}-libcrypt(%{_target_cpu}) = %{epoch}:%{version}-%{release}
-%if "%{_lib}" == "lib64"
-Requires:	%{name}-headers(64bit) = %{epoch}:%{version}-%{release}
-%else
 Requires:	%{name}-headers = %{epoch}:%{version}-%{release}
-%endif
+Requires:	%{name}-libcrypt(%{_target_cpu}) = %{epoch}:%{version}-%{release}
 Provides:	%{name}-devel(%{_target_cpu}) = %{epoch}:%{version}-%{release}
 %ifarch %{ix86}
 Provides:	%{name}-devel(ix86) = %{epoch}:%{version}-%{release}
 %endif
 Obsoletes:	libiconv-devel
+%ifarch %{x8664}
+# see http://lists.pld-linux.org/mailman/pipermail/pld-devel-en/2016-May/024902.html
+%if "%(rpm -q --qf '%{E}:%{V}' binutils)" >= "4:2.26"
+Conflicts: binutils < 4:2.26
+%endif
+%endif
 
 %description devel
 To develop programs which use the standard C libraries (which nearly
@@ -450,10 +566,7 @@ Provides:	%{name}-headers(%{_target_cpu}) = %{epoch}:%{version}-%{release}
 %ifarch %{ix86}
 Provides:	%{name}-headers(ix86) = %{epoch}:%{version}-%{release}
 %endif
-%if "%{_lib}" == "lib64"
-Provides:	%{name}-headers(64bit) = %{epoch}:%{version}-%{release}
-%endif
-%ifarch %{x8664}
+%ifarch %{x8664} x32
 # If both -m32 and -m64 is to be supported on x86_64, x86_64 package
 # have to be installed, not ix86 one.
 Obsoletes:	glibc-headers(athlon)
@@ -461,9 +574,13 @@ Obsoletes:	glibc-headers(i386)
 Obsoletes:	glibc-headers(i486)
 Obsoletes:	glibc-headers(i586)
 Obsoletes:	glibc-headers(i686)
+Obsoletes:	glibc-headers(ix86)
 Obsoletes:	glibc-headers(pentium3)
 Obsoletes:	glibc-headers(pentium4)
 %endif
+%ifarch x32
+Obsoletes:	glibc-headers(x86_64)
+%endif
 %ifarch ppc64
 Obsoletes:	glibc-headers(ppc)
 %endif
@@ -504,7 +621,7 @@ Provides:	%{name}-devel-utils(%{_target_cpu}) = %{epoch}:%{version}-%{release}
 %ifarch %{ix86}
 Provides:	%{name}-devel-utils(ix86) = %{epoch}:%{version}-%{release}
 %endif
-%ifarch %{x8664}
+%ifarch %{x8664} x32
 # If both -m32 and -m64 is to be supported on AMD64, x86_64 package
 # have to be installed, not ix86 one.
 Obsoletes:	glibc-devel-utils(athlon)
@@ -512,9 +629,13 @@ Obsoletes:	glibc-devel-utils(i386)
 Obsoletes:	glibc-devel-utils(i486)
 Obsoletes:	glibc-devel-utils(i586)
 Obsoletes:	glibc-devel-utils(i686)
+Obsoletes:	glibc-devel-utils(ix86)
 Obsoletes:	glibc-devel-utils(pentium3)
 Obsoletes:	glibc-devel-utils(pentium4)
 %endif
+%ifarch x32
+Obsoletes:	glibc-devel-utils(x86_64)
+%endif
 %ifarch ppc64
 Obsoletes:	glibc-devel-utils(ppc)
 %endif
@@ -524,6 +645,7 @@ Obsoletes:	glibc-devel-utils(s390)
 %ifarch sparc64
 Obsoletes:	glibc-devel-utils(sparc)
 %endif
+Conflicts:	man-pages < 4.00
 
 %description devel-utils
 The glibc-devel-utils package contains utilities necessary for
@@ -561,9 +683,13 @@ Obsoletes:	glibc-devel-doc(i386)
 Obsoletes:	glibc-devel-doc(i486)
 Obsoletes:	glibc-devel-doc(i586)
 Obsoletes:	glibc-devel-doc(i686)
+Obsoletes:	glibc-devel-doc(ix86)
 Obsoletes:	glibc-devel-doc(pentium3)
 Obsoletes:	glibc-devel-doc(pentium4)
 %endif
+%ifarch x32
+Obsoletes:	glibc-devel-doc(x86_64)
+%endif
 %ifarch ppc64
 Obsoletes:	glibc-devel-doc(ppc)
 %endif
@@ -573,6 +699,7 @@ Obsoletes:	glibc-devel-doc(s390)
 %ifarch sparc64
 Obsoletes:	glibc-devel-doc(sparc)
 %endif
+Conflicts:	man-pages < 4.00
 
 %description devel-doc
 The glibc-devel-doc package contains info and manual pages necessary
@@ -590,142 +717,6 @@ przez prawie wszystkie programy).
 Ten pakiet należy zainstalować jeśli zamierzamy tworzyć programy
 korzystające ze standardowych bibliotek C.
 
-%package -n nscd
-Summary:	Name Service Caching Daemon
-Summary(es.UTF-8):	Demonio de caché del servicio de nombres
-Summary(ja.UTF-8):	ネームサービスキャッシングデーモン (nacd)
-Summary(pl.UTF-8):	Demon zapamiętujący odpowiedzi serwisów nazw
-Summary(ru.UTF-8):	Кэширующий демон сервисов имен
-Summary(uk.UTF-8):	Кешуючий демон севісів імен
-License:	GPL v2
-Group:		Networking/Daemons
-Requires(post):	fileutils
-Requires(post,preun):	/sbin/chkconfig
-Requires(postun):	/usr/sbin/groupdel
-Requires(postun):	/usr/sbin/userdel
-Requires(pre):	/bin/id
-Requires(pre):	/usr/bin/getgid
-Requires(pre):	/usr/sbin/groupadd
-Requires(pre):	/usr/sbin/useradd
-Requires:	%{name} = %{epoch}:%{version}-%{release}
-%{?with_selinux:Requires:	libselinux >= 1.18}
-Requires:	rc-scripts >= 0.4.3.0
-Provides:	group(nscd)
-Provides:	user(nscd)
-Obsoletes:	gnscd
-Obsoletes:	unscd
-
-%description -n nscd
-nscd caches name service lookups; it can dramatically improve
-performance with NIS+, and may help with DNS as well.
-
-%description -n nscd -l es.UTF-8
-nscd guarda las peticiones del servicio de nombres en una caché; eso
-puede aumentar drásticamente las prestaciones de NIS+, y también puede
-ayudar con DNS.
-
-%description -n nscd -l ja.UTF-8
-Nscd はネームサービス参照をキャッシュし、NIS+ のパフォーマンスを
-ドラマティックに改善することができ、DNS を同様に補助します。
-
-%description -n nscd -l pl.UTF-8
-nscd zapamiętuje zapytania i odpowiedzi NIS oraz DNS. Pozwala
-drastycznie poprawić szybkość działania NIS+.
-
-%description -n nscd -l ru.UTF-8
-nscd кэширует результаты запросов к сервисам имен; это может резко
-увеличить производительность работы с NIS+ и, также, может помочь с
-DNS.
-
-%description -n nscd -l uk.UTF-8
-nscd кешує результати запросів до сервісів імен; це може сильно
-збільшити швидкість роботи з NIS+ і, також, може допомогти з DNS.
-
-%package -n localedb-src
-Summary:	locale database source code
-Summary(es.UTF-8):	Código fuente de la base de datos de los locales
-Summary(pl.UTF-8):	Kod źródłowy bazy locale
-Group:		Libraries
-Requires:	%{name} = %{epoch}:%{version}-%{release}
-Requires:	gzip
-Requires:	sed
-Provides:	localedb
-
-%description -n localedb-src
-This add-on package contains the data needed to build the locale data
-files to use the internationalization features of the GNU libc.
-
-%description -n localedb-src -l es.UTF-8
-Este paquete adicional contiene los datos necesarios para construir
-los ficheros de locale, imprescindibles para usar las cualidades de
-internacionalización de GNU libc.
-
-%description -n localedb-src -l pl.UTF-8
-Pakiet ten zawiera dane niezbędne do zbudowania binarnych plików
-lokalizacyjnych, by móc wykorzystać możliwości oferowane przez GNU
-libc.
-
-%package localedb-all
-Summary:	locale database for all locales supported by glibc
-Summary(es.UTF-8):	Base de datos de todos los locales soportados por glibc
-Summary(pl.UTF-8):	Baza danych locale dla wszystkich lokalizacji obsługiwanych przez glibc
-Group:		Libraries
-Requires:	%{name} = %{epoch}:%{version}-%{release}
-Requires:	iconv = %{epoch}:%{version}-%{release}
-Provides:	localedb
-
-%description localedb-all
-This package contains locale database for all locales supported by
-glibc. In glibc 2.3.x it's one large file (about 39MB) - if you want
-something smaller with support for chosen locales only, consider
-installing localedb-src and regenerating database using localedb-gen
-script (when database is generated, localedb-src can be uninstalled).
-
-%description localedb-all -l es.UTF-8
-Este paquete contiene una base de datos de todos los locales
-soportados por glibc. En glibc 2.3.x ése es un fichero grande (aprox.
-39 MB) -- si prefiere algo más pequeño, sólo con soporte de unos
-locales elegidos, considérese instalar localedb-src y regenerar la
-base de datos usando el escript localedb-gen (una vez que la base de
-datos esté creada, localedb-src se podrá desinstalar).
-
-%description localedb-all -l pl.UTF-8
-Ten pakiet zawiera bazę danych locale dla wszystkich lokalizacji
-obsługiwanych przez glibc. W glibc 2.3.x jest to jeden duży plik
-(około 39MB); aby mieć coś mniejszego, z obsługą tylko wybranych
-lokalizacji, należy zainstalować pakiet localedb-src i przegenerować
-bazę danych przy użyciu skryptu localedb-gen (po wygenerowaniu bazy
-pakiet localedb-src można odinstalować).
-
-%package -n iconv
-Summary:	Convert encoding of given files from one encoding to another
-Summary(es.UTF-8):	Convierte entre varias codificaciones de los ficheros dados
-Summary(pl.UTF-8):	Moduły do konwersji plików tekstowych z jednego kodowania do innego
-Group:		Libraries
-Requires:	%{name} = %{epoch}:%{version}-%{release}
-Provides:	iconv(%{_target_base_arch})
-
-%description -n iconv
-Convert encoding of given files from one encoding to another. You need
-this package if you want to convert some document from one encoding to
-another or if you have installed some programs which use Generic
-Character Set Conversion Interface.
-
-%description -n iconv -l es.UTF-8
-Convierte la codificación de dados ficheros. Necesita este paquete si
-quiere convertir un documento entre una codificación (juego de
-caracteres) y otra, o si tiene instalado algún programa que usa el
-Generic Character Set Conversion Interface (interfaz genérica de
-conversión de juegos de caracteres).
-
-%description -n iconv -l pl.UTF-8
-Moduły do konwersji plików tekstowych z jednego kodowania do innego.
-Trzeba mieć zainstalowany ten pakiet, aby wykonywać konwersję
-dokumentów z jednego kodowania do innego lub do używania programów
-korzystających z Generic Character Set Conversion Interface w glibc,
-czyli z zestawu funkcji z tej biblioteki, które umożliwiają konwersję
-kodowania danych z poziomu dowolnego programu.
-
 %package static
 Summary:	Static GNU libc libraries
 Summary(es.UTF-8):	Bibliotecas estáticas
@@ -825,120 +816,148 @@ archivada (un fichero ar) compuesta de individuales objetos
 compartidos. Es usado para crear una biblioteca que sea un subconjunto
 más pequeño de la biblioteca libc compartida estándar.
 
-%description pic -l pl.UTF-8
-Archiwum PIC biblioteki GNU C zawiera archiwalną bibliotekę (plik ar)
-złożoną z pojedynczych obiektów współdzielonych. Używana jest do
-tworzenia biblioteki będącej mniejszym podzestawem standardowej
-biblioteki współdzielonej libc.
-
-%package -n nss_compat
-Summary:	Old style NYS NSS glibc module
-Summary(es.UTF-8):	El antiguo módulo NYS NSS de glibc
-Summary(pl.UTF-8):	Stary moduł NYS NSS glibc
-Group:		Base
-Requires:	%{name} = %{epoch}:%{version}-%{release}
-
-%description -n nss_compat
-Old style NYS NSS glibc module.
-
-%description -n nss_compat -l es.UTF-8
-El antiguo módulo NYS NSS de glibc
-
-%description -n nss_compat -l pl.UTF-8
-Stary moduł NYS NSS glibc.
-
-%package -n nss_dns
-Summary:	BIND NSS glibc module
-Summary(es.UTF-8):	Módulo BIND NSS de glibc
-Summary(pl.UTF-8):	Moduł BIND NSS glibc
-Group:		Base
-Requires:	%{name} = %{epoch}:%{version}-%{release}
-
-%description -n nss_dns
-BIND NSS glibc module.
-
-%description -n nss_dns -l es.UTF-8
-Módulo BIND NSS de glibc.
-
-%description -n nss_dns -l pl.UTF-8
-Moduł BIND NSS glibc.
+%description pic -l pl.UTF-8
+Archiwum PIC biblioteki GNU C zawiera archiwalną bibliotekę (plik ar)
+złożoną z pojedynczych obiektów współdzielonych. Używana jest do
+tworzenia biblioteki będącej mniejszym podzestawem standardowej
+biblioteki współdzielonej libc.
 
-%package -n nss_files
-Summary:	Traditional files databases NSS glibc module
-Summary(es.UTF-8):	Módulo de tradicionales bases de datos en ficheros para glibc
-Summary(pl.UTF-8):	Moduł tradycyjnych plikowych baz danych NSS glibc
-Group:		Base
+%package -n nscd
+Summary:	Name Service Caching Daemon
+Summary(es.UTF-8):	Demonio de caché del servicio de nombres
+Summary(ja.UTF-8):	ネームサービスキャッシングデーモン (nacd)
+Summary(pl.UTF-8):	Demon zapamiętujący odpowiedzi serwisów nazw
+Summary(ru.UTF-8):	Кэширующий демон сервисов имен
+Summary(uk.UTF-8):	Кешуючий демон севісів імен
+License:	GPL v2
+Group:		Networking/Daemons
+Requires(post):	fileutils
+Requires(post,preun):	/sbin/chkconfig
+Requires(postun):	/usr/sbin/groupdel
+Requires(postun):	/usr/sbin/userdel
+Requires(pre):	/bin/id
+Requires(pre):	/usr/bin/getgid
+Requires(pre):	/usr/sbin/groupadd
+Requires(pre):	/usr/sbin/useradd
 Requires:	%{name} = %{epoch}:%{version}-%{release}
+%{?with_selinux:Requires:	libselinux >= 1.18}
+Requires:	rc-scripts >= 0.4.3.0
+Provides:	group(nscd)
+Provides:	user(nscd)
+Obsoletes:	gnscd
+Obsoletes:	unscd
 
-%description -n nss_files
-Traditional files databases NSS glibc module.
-
-%description -n nss_files -l es.UTF-8
-Módulo de tradicionales bases de datos en ficheros para glibc.
+%description -n nscd
+nscd caches name service lookups; it can dramatically improve
+performance with NIS+, and may help with DNS as well.
 
-%description -n nss_files -l pl.UTF-8
-Moduł tradycyjnych plikowych baz danych NSS glibc.
+%description -n nscd -l es.UTF-8
+nscd guarda las peticiones del servicio de nombres en una caché; eso
+puede aumentar drásticamente las prestaciones de NIS+, y también puede
+ayudar con DNS.
 
-%package -n nss_hesiod
-Summary:	hesiod NSS glibc module
-Summary(es.UTF-8):	Módulo hesiod NSS de glibc
-Summary(pl.UTF-8):	Moduł hesiod NSS glibc
-Group:		Base
-Requires:	%{name} = %{epoch}:%{version}-%{release}
+%description -n nscd -l ja.UTF-8
+Nscd はネームサービス参照をキャッシュし、NIS+ のパフォーマンスを
+ドラマティックに改善することができ、DNS を同様に補助します。
 
-%description -n nss_hesiod
-glibc NSS (Name Service Switch) module for databases access.
+%description -n nscd -l pl.UTF-8
+nscd zapamiętuje zapytania i odpowiedzi NIS oraz DNS. Pozwala
+drastycznie poprawić szybkość działania NIS+.
 
-%description -n nss_hesiod -l es.UTF-8
-Módulo hesiod NSS de glibc.
+%description -n nscd -l ru.UTF-8
+nscd кэширует результаты запросов к сервисам имен; это может резко
+увеличить производительность работы с NIS+ и, также, может помочь с
+DNS.
 
-%description -n nss_hesiod -l pl.UTF-8
-Moduł glibc NSS (Name Service Switch) dostępu do baz danych.
+%description -n nscd -l uk.UTF-8
+nscd кешує результати запросів до сервісів імен; це може сильно
+збільшити швидкість роботи з NIS+ і, також, може допомогти з DNS.
 
-%package -n nss_nis
-Summary:	NIS(YP) NSS glibc module
-Summary(es.UTF-8):	Módulo NIS(YP) NSS de glibc
-Summary(pl.UTF-8):	Moduł NIS(YP) NSS glibc
-Group:		Base
+%package -n localedb-src
+Summary:	locale database source code
+Summary(es.UTF-8):	Código fuente de la base de datos de los locales
+Summary(pl.UTF-8):	Kod źródłowy bazy locale
+Group:		Libraries
 Requires:	%{name} = %{epoch}:%{version}-%{release}
+Requires:	gzip
+Requires:	sed
+Provides:	localedb
 
-%description -n nss_nis
-glibc NSS (Name Service Switch) module for NIS(YP) databases access.
+%description -n localedb-src
+This add-on package contains the data needed to build the locale data
+files to use the internationalization features of the GNU libc.
 
-%description -n nss_nis -l es.UTF-8
-Módulo NSS de glibc para acceder las bases de datos NIS(YP).
+%description -n localedb-src -l es.UTF-8
+Este paquete adicional contiene los datos necesarios para construir
+los ficheros de locale, imprescindibles para usar las cualidades de
+internacionalización de GNU libc.
 
-%description -n nss_nis -l pl.UTF-8
-Moduł glibc NSS (Name Service Switch) dostępu do baz danych NIS(YP).
+%description -n localedb-src -l pl.UTF-8
+Pakiet ten zawiera dane niezbędne do zbudowania binarnych plików
+lokalizacyjnych, by móc wykorzystać możliwości oferowane przez GNU
+libc.
 
-%package -n nss_nisplus
-Summary:	NIS+ NSS module
-Summary(es.UTF-8):	Módulo NIS+ NSS
-Summary(pl.UTF-8):	Moduł NIS+ NSS
-Group:		Base
+%package localedb-all
+Summary:	locale database for all locales supported by glibc
+Summary(es.UTF-8):	Base de datos de todos los locales soportados por glibc
+Summary(pl.UTF-8):	Baza danych locale dla wszystkich lokalizacji obsługiwanych przez glibc
+Group:		Libraries
 Requires:	%{name} = %{epoch}:%{version}-%{release}
+Requires:	iconv = %{epoch}:%{version}-%{release}
+Provides:	localedb
 
-%description -n nss_nisplus
-glibc NSS (Name Service Switch) module for NIS+ databases access.
+%description localedb-all
+This package contains locale database for all locales supported by
+glibc. In glibc 2.3.x it's one large file (about 39MB) - if you want
+something smaller with support for chosen locales only, consider
+installing localedb-src and regenerating database using localedb-gen
+script (when database is generated, localedb-src can be uninstalled).
 
-%description -n nss_nisplus -l es.UTF-8
-Módulo NSS (Name Service Switch) de glibc para acceder las bases de
-datos NIS+.
+%description localedb-all -l es.UTF-8
+Este paquete contiene una base de datos de todos los locales
+soportados por glibc. En glibc 2.3.x ése es un fichero grande (aprox.
+39 MB) -- si prefiere algo más pequeño, sólo con soporte de unos
+locales elegidos, considérese instalar localedb-src y regenerar la
+base de datos usando el escript localedb-gen (una vez que la base de
+datos esté creada, localedb-src se podrá desinstalar).
 
-%description -n nss_nisplus -l pl.UTF-8
-Moduł glibc NSS (Name Service Switch) dostępu do baz danych NIS+.
+%description localedb-all -l pl.UTF-8
+Ten pakiet zawiera bazę danych locale dla wszystkich lokalizacji
+obsługiwanych przez glibc. W glibc 2.3.x jest to jeden duży plik
+(około 39MB); aby mieć coś mniejszego, z obsługą tylko wybranych
+lokalizacji, należy zainstalować pakiet localedb-src i przegenerować
+bazę danych przy użyciu skryptu localedb-gen (po wygenerowaniu bazy
+pakiet localedb-src można odinstalować).
 
-%package memusage
-Summary:	Memory usage profiler
-Summary(pl.UTF-8):	Narzędzie do profilowania zużycia pamięci
-Group:		Development/Tools
+%package -n iconv
+Summary:	Convert encoding of given files from one encoding to another
+Summary(es.UTF-8):	Convierte entre varias codificaciones de los ficheros dados
+Summary(pl.UTF-8):	Moduły do konwersji plików tekstowych z jednego kodowania do innego
+Group:		Libraries
 Requires:	%{name} = %{epoch}:%{version}-%{release}
+Provides:	iconv(%{_target_base_arch})
+Conflicts:	man-pages < 4.00
 
-%description memusage
-Memory usage profiler.
+%description -n iconv
+Convert encoding of given files from one encoding to another. You need
+this package if you want to convert some document from one encoding to
+another or if you have installed some programs which use Generic
+Character Set Conversion Interface.
 
-%description memusage -l pl.UTF-8
-Narzędzie do profilowania zużycia pamięci.
+%description -n iconv -l es.UTF-8
+Convierte la codificación de dados ficheros. Necesita este paquete si
+quiere convertir un documento entre una codificación (juego de
+caracteres) y otra, o si tiene instalado algún programa que usa el
+Generic Character Set Conversion Interface (interfaz genérica de
+conversión de juegos de caracteres).
+
+%description -n iconv -l pl.UTF-8
+Moduły do konwersji plików tekstowych z jednego kodowania do innego.
+Trzeba mieć zainstalowany ten pakiet, aby wykonywać konwersję
+dokumentów z jednego kodowania do innego lub do używania programów
+korzystających z Generic Character Set Conversion Interface w glibc,
+czyli z zestawu funkcji z tej biblioteki, które umożliwiają konwersję
+kodowania danych z poziomu dowolnego programu.
 
 %prep
 %setup -q
@@ -949,9 +968,10 @@ exit 1
 %endif
 
 %patch0 -p1
+
 %patch2 -p1
 %patch3 -p0
-%patch4 -p1
+%{!?with_bash_nls:%patch4 -p1}
 %patch5 -p1
 %patch6 -p1
 %patch7 -p1
@@ -960,7 +980,6 @@ exit 1
 
 %patch10 -p1
 %patch11 -p1
-%patch12 -p1
 
 %patch14 -p0
 %patch15 -p1
@@ -969,18 +988,13 @@ exit 1
 %patch18 -p1
 %patch19 -p1
 %patch20 -p1
-%{?with_cross:%patch21 -p1}
-%patch22 -p1
+
 %patch23 -p0
 
-%patch25 -p1
-%patch26 -p1
 %patch27 -p1
-%patch28 -p1
+
 %patch29 -p1
 %patch30 -p1
-%patch31 -p1
-%patch32 -p1
 
 %patch38 -p1
 
@@ -1004,11 +1018,6 @@ cd builddir
 CC="%{__cc} -m64 -mcpu=ultrasparc -mvis -fcall-used-g6"
 %endif
 
-AddOns=libidn
-%ifarch %{ports_arch}
-AddOns=$AddOns,ports
-%endif
-
 # force ld bfd (instead of gold)
 install -d alt-tools
 ln -sf %{_bindir}/ld.bfd alt-tools/ld
@@ -1016,24 +1025,24 @@ PATH=$(pwd)/alt-tools:$PATH; export PATH
 
 AWK="gawk" \
 ../%configure \
-	--with-bugurl=http://bugs.pld-linux.org/ \
-	--with-binutils=$(pwd)/alt-tools \
+	--enable-add-ons=libidn \
+	--enable-bind-now \
+	--enable-experimental-malloc \
+	--enable-hidden-plt \
 	--enable-kernel="%{min_kernel}" \
-	--with-headers=%{_includedir} \
-	--with%{!?with_selinux:out}-selinux \
-	--with-tls \
+	--enable-nss-crypt%{!?with_nss_crypt:=no} \
 	--enable-obsolete-rpc \
-	--enable-add-ons=$AddOns \
-	--%{?with_nss_crypt:en}%{!?with_nss_crypt:dis}able-nss-crypt \
-	--enable-experimental-malloc \
+	--enable-profile \
 	--enable-stackguard-randomization \
-	--enable-hidden-plt \
-	--enable-bind-now \
-	--enable-profile
+	--with-binutils=$(pwd)/alt-tools \
+	--with-bugurl=http://bugs.pld-linux.org/ \
+	--with-headers=%{_includedir} \
+	--with-selinux%{!?with_selinux:=no} \
+	--with-tls
 
 %{__make} \
 	AWK="gawk" \
-	localedir=%{_prefix}/lib/locale \
+	complocaledir=%{_prefix}/lib/locale \
 	sLIBdir=%{_libdir}
 
 cd ..
@@ -1050,22 +1059,22 @@ diet ${CC#*ccache } %{SOURCE7} %{rpmcflags} -Os -static -o glibc-postinst
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT/etc/{rc.d/init.d,sysconfig,default,logrotate.d,init} \
-	$RPM_BUILD_ROOT{%{_mandir}/man{3,8},/var/log,/var/{lib,run}/nscd} \
+install -d $RPM_BUILD_ROOT/etc/{rc.d/init.d,sysconfig,default,logrotate.d} \
+	$RPM_BUILD_ROOT{%{_mandir},/var/log,/var/{lib,run}/nscd} \
 	$RPM_BUILD_ROOT{/var/cache/ldconfig,%{systemdtmpfilesdir}}
 
 cd builddir
 env LANGUAGE=C LC_ALL=C \
 %{__make} install \
 	install_root=$RPM_BUILD_ROOT \
-	localedir=%{_prefix}/lib/locale \
+	complocaledir=%{_prefix}/lib/locale \
 	infodir=%{_infodir} \
 	mandir=%{_mandir}
 
 %if %{with localedb}
 env LANGUAGE=C LC_ALL=C \
 %{__make} localedata/install-locales \
-	localedir=%{_prefix}/lib/locale \
+	complocaledir=%{_prefix}/lib/locale \
 	install_root=$RPM_BUILD_ROOT
 %else
 install -d $RPM_BUILD_ROOT%{_prefix}/lib/locale
@@ -1090,22 +1099,21 @@ install -p glibc-postinst				$RPM_BUILD_ROOT/sbin
 %{?with_memusage:mv -f $RPM_BUILD_ROOT/%{_lib}/libmemusage.so $RPM_BUILD_ROOT%{_libdir}}
 mv -f $RPM_BUILD_ROOT/%{_lib}/libpcprofile.so	$RPM_BUILD_ROOT%{_libdir}
 
-# moved to tzdata package
-rm -f $RPM_BUILD_ROOT%{_sysconfdir}/localtime
-rm -rf $RPM_BUILD_ROOT%{_datadir}/zoneinfo
-
 # make symlinks across top-level directories absolute
-for l in BrokenLocale anl cidn crypt dl m nsl resolv rt thread_db util; do
+for l in BrokenLocale anl cidn crypt dl \
+%ifarch %{x8664} x32
+	mvec \
+%endif
+	nsl resolv rt thread_db util; do
 	test -L $RPM_BUILD_ROOT%{_libdir}/lib${l}.so || exit 1
-	rm -f $RPM_BUILD_ROOT%{_libdir}/lib${l}.so
+	%{__rm} $RPM_BUILD_ROOT%{_libdir}/lib${l}.so
 	ln -sf /%{_lib}/$(basename $RPM_BUILD_ROOT/%{_lib}/lib${l}.so.*) $RPM_BUILD_ROOT%{_libdir}/lib${l}.so
 done
 
 # linking nss modules directly is not supported
-rm -f $RPM_BUILD_ROOT%{_libdir}/libnss_*.so
+%{__rm} $RPM_BUILD_ROOT%{_libdir}/libnss_*.so
 
 install -p %{SOURCE2}		$RPM_BUILD_ROOT/etc/rc.d/init.d/nscd
-cp -p %{SOURCE8}		$RPM_BUILD_ROOT/etc/init/nscd.conf
 cp -a %{SOURCE3}		$RPM_BUILD_ROOT/etc/sysconfig/nscd
 cp -a %{SOURCE4}		$RPM_BUILD_ROOT/etc/logrotate.d/nscd
 cp -a nscd/nscd.conf		$RPM_BUILD_ROOT%{_sysconfdir}
@@ -1113,31 +1121,29 @@ cp -a posix/gai.conf		$RPM_BUILD_ROOT%{_sysconfdir}
 cp -a nis/nss $RPM_BUILD_ROOT/etc/default/nss
 sed -e 's#\([ \t]\)db\([ \t]\)#\1#g' nss/nsswitch.conf > $RPM_BUILD_ROOT%{_sysconfdir}/nsswitch.conf
 
-bzip2 -dc %{SOURCE5} | tar xf - -C $RPM_BUILD_ROOT%{_mandir}
+xz -dc %{SOURCE5} | tar xf - -C $RPM_BUILD_ROOT%{_mandir}
 : > $RPM_BUILD_ROOT%{_sysconfdir}/ld.so.cache
 install -d $RPM_BUILD_ROOT%{_sysconfdir}/ld.so.conf.d
 echo 'include ld.so.conf.d/*.conf' > $RPM_BUILD_ROOT%{_sysconfdir}/ld.so.conf
 : > $RPM_BUILD_ROOT/var/cache/ldconfig/aux-cache
 
-rm -f $RPM_BUILD_ROOT%{_mandir}/hu/man7/man.7
-
 # doesn't fit with out tzdata concept and configure.in is stupid assuming bash
 # is first posix compatible shell making this script depend on bash.
-rm -f $RPM_BUILD_ROOT%{_bindir}/tzselect
-rm -f $RPM_BUILD_ROOT%{_mandir}/man8/tzselect.8*
-rm -f $RPM_BUILD_ROOT%{_mandir}/*/man8/tzselect.8*
+%{__rm} $RPM_BUILD_ROOT%{_bindir}/tzselect
+%{__rm} $RPM_BUILD_ROOT%{_mandir}/man8/tzselect.8*
+%{__rm} $RPM_BUILD_ROOT%{_mandir}/*/man8/tzselect.8*
 
 : > $RPM_BUILD_ROOT/var/log/nscd
 : > $RPM_BUILD_ROOT/var/lib/nscd/passwd
 : > $RPM_BUILD_ROOT/var/lib/nscd/group
 : > $RPM_BUILD_ROOT/var/lib/nscd/hosts
 
-install %{SOURCE9} $RPM_BUILD_ROOT%{systemdtmpfilesdir}/nscd.conf
+cp -p %{SOURCE9} $RPM_BUILD_ROOT%{systemdtmpfilesdir}/nscd.conf
 
 rm -rf documentation
 install -d documentation
 
-for f in ChangeLog.old DESIGN-{barrier,condvar,rwlock,sem}.txt TODO{,-kernel,-testing}; do
+for f in ChangeLog.old DESIGN-{condvar,rwlock,systemtap-probes}.txt TODO{,-kernel,-testing}; do
 	cp -af nptl/$f documentation/$f.nptl
 done
 cp -af crypt/README.ufc-crypt ChangeLog* documentation
@@ -1161,29 +1167,36 @@ done
 #   tlh - Klingon (bzflag)
 #
 # To be added when they become supported by glibc:
-#   ach (vlc)
-#   ak (gtkspell3)
-#   bal (newt,pessulus)
-#   cgg (vlc)
-#   co  (vlc)
-#   frp (xfce, lxlauncher)
-#   gn  (gn_BR in gnome, maybe gn_PY)
-#   haw (iso-codes, stellarium)
-#   hrx (stellarium)
-#   ilo (kudzu)
-#   io  (gtk+2, gnome, alacarte)
-#   jv  (gmpc, avant-window-navigator, kdesudo)
-#   kmr (vlc)
-#   man (ccsm; incorrectly named md)
-#   mus (bluez-gnome)
-#   nah (mate-system-monitor)
-#   pms (deluge)
-#   sco (gnomad2, picard, stellarium)
-#   son (gtkspell3)
-#   swg (sim)
-#   syr (iso-codes)
-#   tet (vlc)
-#   vec (mate-applet-indicator)
+#   ach    (vlc, libreport)
+#   aln    (vlc, libreport)
+#   bal    (libosinfo, libreport, newt, pessulus)
+#   cgg    (vlc)
+#   co     (vlc)
+#   frp    (xfce, lxlauncher, mate)
+#   gn     (gn_BR in gnome, maybe gn_PY)
+#   haw    (iso-codes, stellarium)
+#   hrx    (stellarium)
+#   ilo    (kudzu, libosinfo, libreport)
+#   io     (gtk+2, gnome, alacarte)
+#   jv     (gmpc, avant-window-navigator, kdesudo, mate)
+#   kmr    (vlc)
+#   ku_IQ  (mate)
+#   kw@kkcor, kw@uccor (libosinfo - currently empty) - add as supported variants when non-empty?
+#   man    (ccsm; incorrectly named md)
+#   mus    (bluez-gnome)
+#   nah    (mate)
+#   nqo	   (mate)
+#   pms    (deluge, mate-tweak)
+#   sco    (gnomad2, picard, stellarium, mate)
+#   son    (gtkspell3)
+#   su     (terminator)
+#   swg    (sim)
+#   syr    (iso-codes)
+#   tet    (vlc)
+#   tpi    (mate-tweak)
+#   tw     (libosinfo)
+#   vec    (mate-applet-indicator)
+#   wba    (libosinfo)
 #
 # To be removed (after fixing packages still using it):
 #   sr@Latn (use sr@latin instead)
@@ -1191,6 +1204,8 @@ done
 #
 # Short forms (omitted country code, used instead of long form) for ambiguous or unclear cases:
 # aa=aa_ER
+# ak=ak_GH
+# anp=anp_IN
 # ar=common? (AE, BH, DZ, EG, IQ, JO, KW, LB, LY, MA, OM, QA, SA, SD, SY, TN, YE)
 # az=az_AZ
 # bn=bn_BD
@@ -1209,6 +1224,7 @@ done
 # fy=fy_NL
 # gez=gez_ET (?)
 # it=it_IT
+# ku=ku_TR
 # li=li_NL
 # nds=nds_DE
 # nl=nl_NL
@@ -1219,6 +1235,7 @@ done
 # quz=quz_PE
 # ru=ru_RU
 # sd=sd_IN
+# shn=shn_MM
 # so=so_SO
 # sr=sr_RS [cyrillic]
 # sr@latin=sr_RS@latin
@@ -1237,14 +1254,14 @@ done
 #   be ca cs da de el en_GB es fi fr gl hr hu it ja ko nb nl pl pt_BR ru rw sk
 #   sv tr zh_CN zh_TW
 #
-for i in aa aa@saaho af am an ang ar ar_TN as ast az az_IR be@latin be@tarask bem \
-	bg bn bn_IN bo br bs byn ca@valencia ckb cmn crh csb cv cy de_AT de_CH dv dz en \
+for i in aa aa@saaho af ak am an ang anp ar ar_TN as ast az az_IR be@latin be@tarask bem \
+	bg bho bn bn_IN bo br brx bs byn ca@valencia ckb cmn crh csb cv cy de_AT de_CH doi dv dz en \
 	en@boldquot en@quot en@shaw en_AU en_CA en_NZ en_US eo es_AR es_CL es_CO es_CR \
 	es_DO es_EC es_GT es_HN es_MX es_NI es_PA es_PE es_PR es_SV es_UY \
 	es_VE et eu fa ff fil fo fr_BE fr_CA fr_CH fur fy ga gd gez gu gv ha he \
 	hi hne hsb hy ia id ig ik is it_CH iu ka kg kk kl km kn kok ks ku kw ky la lb \
-	lg li lo lt lv mai mg mhr mi mk ml mn mr ms mt my nds ne nl_BE nn nr nso \
-	oc om or pa pap ps pt ps quz rm ro sa sc sd se si sid sl so sq sr sr@Latn tl \
+	lg li lo lt lv mai mg mhr mi mk ml mn mni mr ms mt my nds ne nl_BE nn nr nso \
+	oc om or pa pap ps pt ps quz rm ro sa sat sc sd se shn si sid sl so sq sr sr@Latn szl tl \
 	sr@ije sr@ijekavian sr@ijekavianlatin sr@latin ss st sw ta te tg th ti \
 	tig tk tl tlh tn ts tt tt@iqtelif ug uk ur uz uz@cyrillic ve vi wa wal wo xh yi yo \
 	zh_HK zu; do
@@ -1258,7 +1275,7 @@ done
 
 # LC_TIME category, used for localized date formats (at least by coreutils)
 for i in af be bg ca cs da de el en eo es et eu fi fr ga gl hr hu ia id it ja kk ko lg lt \
-	ms nb nl pl pt pt_BR ro ru rw sk sl sv tr uk vi zh_CN zh_TW; do
+	ms nb nl pl pt pt_BR ro ru rw sk sl sr sv tr uk vi zh_CN zh_TW; do
 	if [ ! -d $RPM_BUILD_ROOT%{_localedir}/$i ]; then
 		echo "%lang($lang) %{_localedir}/$i" >> glibc.lang
 	fi
@@ -1266,19 +1283,16 @@ for i in af be bg ca cs da de el en eo es et eu fi fr ga gl hr hu ia id it ja kk
 done
 
 # localedb-gen infrastructure
-sed -e 's,@localedir@,%{_prefix}/lib/locale,' %{SOURCE6} > $RPM_BUILD_ROOT%{_bindir}/localedb-gen
-chmod +x $RPM_BUILD_ROOT%{_bindir}/localedb-gen
-install localedata/SUPPORTED $RPM_BUILD_ROOT%{_datadir}/i18n
+install -p %{SOURCE6} $RPM_BUILD_ROOT%{_bindir}/localedb-gen
+cp -p localedata/SUPPORTED $RPM_BUILD_ROOT%{_datadir}/i18n
 
 # shutup check-files
 %{__rm} $RPM_BUILD_ROOT%{_mandir}/README.*
 rm -f $RPM_BUILD_ROOT%{_infodir}/dir
-# rpcinfo dropped from glibc, provided by rpcbind now
-%{__rm} $RPM_BUILD_ROOT%{_mandir}/{,*/}man8/rpcinfo.8
 
 # stub for man page from man-pages package to make rpm consistency check happy
 # don't package them here
-install -d $RPM_BUILD_ROOT%{_mandir}{/,/ru,/es,/fr,/ja}/man2
+install -d $RPM_BUILD_ROOT%{_mandir}{,/ru,/es,/fr,/ja}/man2
 :>$RPM_BUILD_ROOT%{_mandir}/man2/syslog.2
 :>$RPM_BUILD_ROOT%{_mandir}/ru/man2/syslog.2
 :>$RPM_BUILD_ROOT%{_mandir}/es/man2/syslog.2
@@ -1287,7 +1301,7 @@ install -d $RPM_BUILD_ROOT%{_mandir}{/,/ru,/es,/fr,/ja}/man2
 
 # remove links to non existant translations
 %{__rm} $RPM_BUILD_ROOT%{_mandir}/pl/man3/{alphasort,cfgetispeed,cfgetospeed,cfmakeraw,cfsetispeed,cfsetospeed,closelog,dn_comp,dn_expand,fscanf}.3
-%{__rm} $RPM_BUILD_ROOT%{_mandir}/it/man7/latin2.7
+%{__rm} $RPM_BUILD_ROOT%{_mandir}/tr/man3/{encrypt_r,setkey,setkey_r}.3
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -1310,6 +1324,11 @@ if [ "$1" != 1 ]; then
 	%service -q crond restart
 fi
 
+%triggerin -- apache-base
+if [ "$1" != 1 ]; then
+	%service -q httpd restart
+fi
+
 %ifarch %{x8664}
 # when upgrading from glibc < 6:2.19-3 copy locale-archive
 # from /usr/lib64/locale to /usr/lib/locale
@@ -1332,10 +1351,10 @@ if [ "$SUPPORTED_LOCALES" ]; then
 	localedb-gen || :
 fi
 
-%post devel	-p	/sbin/postshell
+%post devel-doc	-p	/sbin/postshell
 -/usr/sbin/fix-info-dir -c %{_infodir}
 
-%postun devel	-p	/sbin/postshell
+%postun devel-doc	-p	/sbin/postshell
 -/usr/sbin/fix-info-dir -c %{_infodir}
 
 %pre -n nscd
@@ -1382,10 +1401,13 @@ fi
 %ifarch %{x8664}
 %attr(755,root,root) /%{_lib}/ld-linux-x86-64.so.2
 %endif
+%ifarch x32
+%attr(755,root,root) /%{_lib}/ld-linux-x32.so.2
+%endif
 %ifarch ppc64 s390x
 %attr(755,root,root) /%{_lib}/ld64.so.1
 %endif
-%ifnarch %{ix86} sparc sparcv9 sparc64 alpha sh ia64 %{x8664} ppc64 s390x %{arm}
+%ifnarch %{ix86} sparc sparcv9 sparc64 alpha sh ia64 %{x8664} x32 ppc64 s390x %{arm}
 %attr(755,root,root) /%{_lib}/ld.so.1
 %endif
 %attr(755,root,root) /%{_lib}/libBrokenLocale-%{core_version}.so
@@ -1417,6 +1439,10 @@ fi
 %else
 %attr(755,root,root) /%{_lib}/libm.so.6
 %endif
+%ifarch %{x8664} x32
+%attr(755,root,root) /%{_lib}/libmvec-%{core_version}.so
+%attr(755,root,root) /%{_lib}/libmvec.so.1
+%endif
 %attr(755,root,root) /%{_lib}/libnsl-%{core_version}.so
 %ifarch alpha
 %attr(755,root,root) /%{_lib}/libnsl.so.1.1
@@ -1488,17 +1514,25 @@ fi
 %{_mandir}/man1/iconv.1*
 %{_mandir}/man1/locale.1*
 %{_mandir}/man1/rpcgen.1*
+%{_mandir}/man5/gai.conf.5*
 %{_mandir}/man5/locale.5*
+%{_mandir}/man5/nss.5*
 %{_mandir}/man5/nsswitch.conf.5*
+%{_mandir}/man5/repertoiremap.5*
+%{_mandir}/man5/rpc.5*
 %{_mandir}/man5/tzfile.5*
+%{_mandir}/man7/armscii-8.7*
 %{_mandir}/man7/ascii.7*
 %{_mandir}/man7/charsets.7*
+%{_mandir}/man7/cp1251.7*
+%{_mandir}/man7/cp1252.7*
 %{_mandir}/man7/iso-8859-*.7*
 %{_mandir}/man7/iso_8859-*.7*
 %{_mandir}/man7/iso_8859_*.7*
-%{_mandir}/man7/koi8-r.7*
+%{_mandir}/man7/koi8-*.7*
 %{_mandir}/man7/latin*.7*
 %{_mandir}/man7/locale.7*
+%{_mandir}/man7/tis-620.7*
 %{_mandir}/man7/unicode.7*
 %{_mandir}/man7/utf-8.7*
 %{_mandir}/man7/utf8.7*
@@ -1508,13 +1542,36 @@ fi
 %{_mandir}/man8/sln.8*
 %{_mandir}/man8/zdump.8*
 %{_mandir}/man8/zic.8*
-%lang(cs) %{_mandir}/cs/man7/*
+%lang(cs) %{_mandir}/cs/man7/ascii.7*
+%lang(cs) %{_mandir}/cs/man7/locale.7*
+%lang(cs) %{_mandir}/cs/man7/unicode.7*
+%lang(cs) %{_mandir}/cs/man7/utf-8.7*
+%lang(cs) %{_mandir}/cs/man7/utf8.7*
+%lang(de) %{_mandir}/de/man5/rpc.5*
 %lang(de) %{_mandir}/de/man5/tzfile.5*
-%lang(de) %{_mandir}/de/man7/*
+%lang(de) %{_mandir}/de/man7/ascii.7*
+%lang(de) %{_mandir}/de/man7/iso-8859-*.7*
+%lang(de) %{_mandir}/de/man7/iso_8859-*.7*
+%lang(de) %{_mandir}/de/man7/iso_8859_*.7*
+%lang(de) %{_mandir}/de/man7/latin*.7*
+%lang(de) %{_mandir}/de/man7/locale.7*
+%lang(de) %{_mandir}/de/man7/unicode.7*
+%lang(de) %{_mandir}/de/man7/utf-8.7*
+%lang(de) %{_mandir}/de/man7/utf8.7*
 %lang(es) %{_mandir}/es/man5/locale.5*
 %lang(es) %{_mandir}/es/man5/nsswitch.conf.5*
+%lang(es) %{_mandir}/es/man5/rpc.5*
 %lang(es) %{_mandir}/es/man5/tzfile.5*
-%lang(es) %{_mandir}/es/man7/*
+%lang(es) %{_mandir}/es/man7/ascii.7*
+%lang(es) %{_mandir}/es/man7/charsets.7*
+%lang(es) %{_mandir}/es/man7/iso-8859-*.7*
+%lang(es) %{_mandir}/es/man7/iso_8859-*.7*
+%lang(es) %{_mandir}/es/man7/iso_8859_*.7*
+%lang(es) %{_mandir}/es/man7/latin*.7*
+%lang(es) %{_mandir}/es/man7/locale.7*
+%lang(es) %{_mandir}/es/man7/unicode.7*
+%lang(es) %{_mandir}/es/man7/utf-8.7*
+%lang(es) %{_mandir}/es/man7/utf8.7*
 %lang(es) %{_mandir}/es/man8/ld-linux.8*
 %lang(es) %{_mandir}/es/man8/ld-linux.so.8*
 %lang(es) %{_mandir}/es/man8/ld.so.8*
@@ -1522,26 +1579,74 @@ fi
 %lang(es) %{_mandir}/es/man8/zic.8*
 %lang(fr) %{_mandir}/fr/man5/locale.5*
 %lang(fr) %{_mandir}/fr/man5/nsswitch.conf.5*
+%lang(fr) %{_mandir}/fr/man5/rpc.5*
 %lang(fr) %{_mandir}/fr/man5/tzfile.5*
-%lang(fr) %{_mandir}/fr/man7/*
+%lang(fr) %{_mandir}/fr/man7/ascii.7*
+%lang(fr) %{_mandir}/fr/man7/charsets.7*
+%lang(fr) %{_mandir}/fr/man7/iso-8859-*.7*
+%lang(fr) %{_mandir}/fr/man7/iso_8859-*.7*
+%lang(fr) %{_mandir}/fr/man7/iso_8859_*.7*
+%lang(fr) %{_mandir}/fr/man7/koi8-r.7*
+%lang(fr) %{_mandir}/fr/man7/latin*.7*
+%lang(fr) %{_mandir}/fr/man7/locale.7*
+%lang(fr) %{_mandir}/fr/man7/unicode.7*
+%lang(fr) %{_mandir}/fr/man7/utf-8.7*
+%lang(fr) %{_mandir}/fr/man7/utf8.7*
 %lang(fr) %{_mandir}/fr/man8/ld-linux.8*
 %lang(fr) %{_mandir}/fr/man8/ld-linux.so.8*
 %lang(fr) %{_mandir}/fr/man8/ld.so.8*
 %lang(fr) %{_mandir}/fr/man8/zdump.8*
 %lang(fr) %{_mandir}/fr/man8/zic.8*
-%lang(hu) %{_mandir}/hu/man7/*
+%lang(hu) %{_mandir}/hu/man7/ascii.7*
+%lang(hu) %{_mandir}/hu/man7/iso-8859-*.7*
+%lang(hu) %{_mandir}/hu/man7/iso_8859-*.7*
+%lang(hu) %{_mandir}/hu/man7/iso_8859_*.7*
+%lang(hu) %{_mandir}/hu/man7/latin*.7*
+%lang(hu) %{_mandir}/hu/man7/locale.7*
+%lang(hu) %{_mandir}/hu/man7/utf-8.7*
+%lang(hu) %{_mandir}/hu/man7/utf8.7*
 %lang(hu) %{_mandir}/hu/man8/ld-linux.8*
 %lang(hu) %{_mandir}/hu/man8/ld-linux.so.8*
 %lang(hu) %{_mandir}/hu/man8/ld.so.8*
 %lang(hu) %{_mandir}/hu/man8/zdump.8*
 %lang(it) %{_mandir}/it/man5/locale.5*
-%lang(it) %{_mandir}/it/man7/*
+%lang(it) %{_mandir}/it/man7/ascii.7*
+%lang(it) %{_mandir}/it/man7/charsets.7*
+%lang(it) %{_mandir}/it/man7/iso-8859-*.7*
+%lang(it) %{_mandir}/it/man7/iso_8859-*.7*
+%lang(it) %{_mandir}/it/man7/iso_8859_*.7*
+%lang(it) %{_mandir}/it/man7/latin*.7*
+%lang(it) %{_mandir}/it/man7/locale.7*
+%lang(it) %{_mandir}/it/man7/unicode.7*
+%lang(it) %{_mandir}/it/man7/utf-8.7*
+%lang(it) %{_mandir}/it/man7/utf8.7*
 %lang(it) %{_mandir}/it/man8/zdump.8*
+%lang(ja) %{_mandir}/ja/man1/getent.1*
+%lang(ja) %{_mandir}/ja/man1/iconv.1*
+%lang(ja) %{_mandir}/ja/man1/locale.1*
 %lang(ja) %{_mandir}/ja/man1/rpcgen.1*
+%lang(ja) %{_mandir}/ja/man5/gai.conf.5*
 %lang(ja) %{_mandir}/ja/man5/locale.5*
+%lang(ja) %{_mandir}/ja/man5/nss.5*
 %lang(ja) %{_mandir}/ja/man5/nsswitch.conf.5*
+%lang(ja) %{_mandir}/ja/man5/repertoiremap.5*
+%lang(ja) %{_mandir}/ja/man5/rpc.5*
 %lang(ja) %{_mandir}/ja/man5/tzfile.5*
-%lang(ja) %{_mandir}/ja/man7/*
+%lang(ja) %{_mandir}/ja/man7/armscii-8.7*
+%lang(ja) %{_mandir}/ja/man7/ascii.7*
+%lang(ja) %{_mandir}/ja/man7/charsets.7*
+%lang(ja) %{_mandir}/ja/man7/cp1251.7*
+%lang(ja) %{_mandir}/ja/man7/cp1252.7*
+%lang(ja) %{_mandir}/ja/man7/iso-8859-*.7*
+%lang(ja) %{_mandir}/ja/man7/iso_8859-*.7*
+%lang(ja) %{_mandir}/ja/man7/iso_8859_*.7*
+%lang(ja) %{_mandir}/ja/man7/koi8-*.7*
+%lang(ja) %{_mandir}/ja/man7/latin*.7*
+%lang(ja) %{_mandir}/ja/man7/locale.7*
+%lang(ja) %{_mandir}/ja/man7/tis-620.7*
+%lang(ja) %{_mandir}/ja/man7/unicode.7*
+%lang(ja) %{_mandir}/ja/man7/utf-8.7*
+%lang(ja) %{_mandir}/ja/man7/utf8.7*
 %lang(ja) %{_mandir}/ja/man8/ld-linux.8*
 %lang(ja) %{_mandir}/ja/man8/ld-linux.so.8*
 %lang(ja) %{_mandir}/ja/man8/ld.so.8*
@@ -1549,18 +1654,44 @@ fi
 %lang(ja) %{_mandir}/ja/man8/zdump.8*
 %lang(ja) %{_mandir}/ja/man8/zic.8*
 %lang(ko) %{_mandir}/ko/man5/nsswitch.conf.5*
+%lang(ko) %{_mandir}/ko/man5/rpc.5*
 %lang(ko) %{_mandir}/ko/man5/tzfile.5*
-%lang(ko) %{_mandir}/ko/man7/*
+%lang(ko) %{_mandir}/ko/man7/ascii.7*
+%lang(ko) %{_mandir}/ko/man7/iso-8859-*.7*
+%lang(ko) %{_mandir}/ko/man7/iso_8859-*.7*
+%lang(ko) %{_mandir}/ko/man7/iso_8859_*.7*
+%lang(ko) %{_mandir}/ko/man7/latin*.7*
 %lang(ko) %{_mandir}/ko/man8/zdump.8*
 %lang(pl) %{_mandir}/pl/man5/locale.5*
-%lang(pl) %{_mandir}/pl/man7/*
+%lang(pl) %{_mandir}/pl/man5/rpc.5*
+%lang(pl) %{_mandir}/pl/man7/ascii.7*
+%lang(pl) %{_mandir}/pl/man7/iso-8859-*.7*
+%lang(pl) %{_mandir}/pl/man7/iso_8859-*.7*
+%lang(pl) %{_mandir}/pl/man7/iso_8859_*.7*
+%lang(pl) %{_mandir}/pl/man7/koi8-*.7*
+%lang(pl) %{_mandir}/pl/man7/latin*.7*
+%lang(pl) %{_mandir}/pl/man7/locale.7*
+%lang(pl) %{_mandir}/pl/man7/unicode.7*
+%lang(pl) %{_mandir}/pl/man7/utf-8.7*
+%lang(pl) %{_mandir}/pl/man7/utf8.7*
 %lang(pl) %{_mandir}/pl/man8/ld-linux.8*
 %lang(pl) %{_mandir}/pl/man8/ld-linux.so.8*
 %lang(pl) %{_mandir}/pl/man8/ld.so.8*
 %lang(pt) %{_mandir}/pt/man5/locale.5*
 %lang(pt) %{_mandir}/pt/man5/nsswitch.conf.5*
+%lang(pt) %{_mandir}/pt/man5/rpc.5*
 %lang(pt) %{_mandir}/pt/man5/tzfile.5*
-%lang(pt) %{_mandir}/pt/man7/*
+%lang(pt) %{_mandir}/pt/man7/ascii.7*
+%lang(pt) %{_mandir}/pt/man7/charsets.7*
+%lang(pt) %{_mandir}/pt/man7/iso-8859-*.7*
+%lang(pt) %{_mandir}/pt/man7/iso_8859-*.7*
+%lang(pt) %{_mandir}/pt/man7/iso_8859_*.7*
+%lang(pt) %{_mandir}/pt/man7/koi8-*.7*
+%lang(pt) %{_mandir}/pt/man7/latin*.7*
+%lang(pt) %{_mandir}/pt/man7/locale.7*
+%lang(pt) %{_mandir}/pt/man7/unicode.7*
+%lang(pt) %{_mandir}/pt/man7/utf-8.7*
+%lang(pt) %{_mandir}/pt/man7/utf8.7*
 %lang(pt) %{_mandir}/pt/man8/zdump.8*
 %lang(pt) %{_mandir}/pt/man8/zic.8*
 %lang(ru) %{_mandir}/ru/man1/getent.1*
@@ -1569,17 +1700,35 @@ fi
 %lang(ru) %{_mandir}/ru/man1/rpcgen.1*
 %lang(ru) %{_mandir}/ru/man5/locale.5*
 %lang(ru) %{_mandir}/ru/man5/nsswitch.conf.5*
+%lang(ru) %{_mandir}/ru/man5/rpc.5*
 %lang(ru) %{_mandir}/ru/man5/tzfile.5*
-%lang(ru) %{_mandir}/ru/man7/*
+%lang(ru) %{_mandir}/ru/man7/ascii.7*
+%lang(ru) %{_mandir}/ru/man7/charsets.7*
+%lang(ru) %{_mandir}/ru/man7/iso-8859-*.7*
+%lang(ru) %{_mandir}/ru/man7/iso_8859-*.7*
+%lang(ru) %{_mandir}/ru/man7/iso_8859_*.7*
+%lang(ru) %{_mandir}/ru/man7/koi8-*.7*
+%lang(ru) %{_mandir}/ru/man7/latin*.7*
+%lang(ru) %{_mandir}/ru/man7/locale.7*
+%lang(ru) %{_mandir}/ru/man7/unicode.7*
+%lang(ru) %{_mandir}/ru/man7/utf-8.7*
+%lang(ru) %{_mandir}/ru/man7/utf8.7*
 %lang(ru) %{_mandir}/ru/man8/ld-linux.so.8*
 %lang(ru) %{_mandir}/ru/man8/ld.so.8*
 %lang(ru) %{_mandir}/ru/man8/zdump.8*
 %lang(ru) %{_mandir}/ru/man8/zic.8*
 %lang(tr) %{_mandir}/tr/man1/iconv.1*
+%lang(uk) %{_mandir}/uk/man5/rpc.5*
 %lang(zh_CN) %{_mandir}/zh_CN/man1/iconv.1*
 %lang(zh_CN) %{_mandir}/zh_CN/man5/locale.5*
+%lang(zh_CN) %{_mandir}/zh_CN/man5/rpc.5*
 %lang(zh_CN) %{_mandir}/zh_CN/man5/tzfile.5*
-%lang(zh_CN) %{_mandir}/zh_CN/man7/*
+%lang(zh_CN) %{_mandir}/zh_CN/man7/ascii.7*
+%lang(zh_CN) %{_mandir}/zh_CN/man7/charsets.7*
+%lang(zh_CN) %{_mandir}/zh_CN/man7/locale.7*
+%lang(zh_CN) %{_mandir}/zh_CN/man7/unicode.7*
+%lang(zh_CN) %{_mandir}/zh_CN/man7/utf-8.7*
+%lang(zh_CN) %{_mandir}/zh_CN/man7/utf8.7*
 %lang(zh_CN) %{_mandir}/zh_CN/man8/zdump.8*
 %lang(zh_CN) %{_mandir}/zh_CN/man8/zic.8*
 
@@ -1597,11 +1746,15 @@ fi
 
 %{_mandir}/man1/catchsegv.1*
 %{_mandir}/man1/ldd.1*
+%{_mandir}/man1/pldd.1*
+%lang(cs) %{_mandir}/cs/man1/ldd.1*
 %lang(es) %{_mandir}/es/man1/ldd.1*
 %lang(fi) %{_mandir}/fi/man1/ldd.1*
 %lang(fr) %{_mandir}/fr/man1/ldd.1*
 %lang(hu) %{_mandir}/hu/man1/ldd.1*
+%lang(it) %{_mandir}/it/man1/ldd.1*
 %lang(ja) %{_mandir}/ja/man1/ldd.1*
+%lang(ja) %{_mandir}/ja/man1/pldd.1*
 %lang(ko) %{_mandir}/ko/man1/ldd.1*
 %lang(pl) %{_mandir}/pl/man1/ldd.1*
 %lang(ru) %{_mandir}/ru/man1/ldd.1*
@@ -1657,8 +1810,13 @@ fi
 %if %{with memusage}
 %files memusage
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_bindir}/memusage*
+%attr(755,root,root) %{_bindir}/memusage
+%attr(755,root,root) %{_bindir}/memusagestat
 %attr(755,root,root) %{_libdir}/libmemusage.so
+%{_mandir}/man1/memusage.1*
+%{_mandir}/man1/memusagestat.1*
+%lang(ja) %{_mandir}/ja/man1/memusage.1*
+%lang(ja) %{_mandir}/ja/man1/memusagestat.1*
 %endif
 
 %files devel
@@ -1669,6 +1827,9 @@ fi
 %attr(755,root,root) %{_libdir}/libcidn.so
 %attr(755,root,root) %{_libdir}/libdl.so
 %attr(755,root,root) %{_libdir}/libm.so
+%ifarch %{x8664} x32
+%attr(755,root,root) %{_libdir}/libmvec.so
+%endif
 %attr(755,root,root) %{_libdir}/libnsl.so
 %attr(755,root,root) %{_libdir}/libpcprofile.so
 %attr(755,root,root) %{_libdir}/libresolv.so
@@ -1681,6 +1842,9 @@ fi
 %{_libdir}/libc.so
 %{_libdir}/libpthread.so
 # static-only libs
+%ifarch %{x8664} x32
+%{_libdir}/libmvec_nonshared.a
+%endif
 %{_libdir}/libc_nonshared.a
 %{_libdir}/libg.a
 %{_libdir}/libieee.a
@@ -1689,7 +1853,7 @@ fi
 %endif
 %{_libdir}/libpthread_nonshared.a
 %{_libdir}/librpcsvc.a
-%ifarch %{ix86} %{x8664} ppc ppc64 s390 s390x sparc sparcv9 sparc64
+%ifarch %{ix86} %{x8664} x32 ppc ppc64 s390 s390x sparc sparcv9 sparc64
 # ABI-dependent headers
 %{_includedir}/gnu/stubs-*.h
 %endif
@@ -1726,8 +1890,12 @@ fi
 %files devel-utils
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/gencat
-%attr(755,root,root) %{_bindir}/*prof*
-%attr(755,root,root) %{_bindir}/*trace
+%attr(755,root,root) %{_bindir}/mtrace
+%attr(755,root,root) %{_bindir}/pcprofiledump
+%attr(755,root,root) %{_bindir}/sprof
+%attr(755,root,root) %{_bindir}/xtrace
+%{_mandir}/man1/mtrace.1*
+%lang(ja) %{_mandir}/ja/man1/mtrace.1*
 
 %files devel-doc
 %defattr(644,root,root,755)
@@ -1735,30 +1903,100 @@ fi
 %{_infodir}/libc.info*
 
 %{_mandir}/man1/sprof.1*
+# just a link to getcwd.3
+%{_mandir}/man2/getcwd.2*
 %{_mandir}/man3/*
+%{_mandir}/man7/aio.7*
+%{_mandir}/man7/attributes.7*
+%{_mandir}/man7/complex.7*
+%{_mandir}/man7/feature_test_macros.7*
+%{_mandir}/man7/glibc.7*
+%{_mandir}/man7/glob.7*
+%{_mandir}/man7/libc.7*
+%{_mandir}/man7/math_error.7*
+%{_mandir}/man7/nptl.7*
+%{_mandir}/man7/posixoptions.7*
+%{_mandir}/man7/pthreads.7*
+%{_mandir}/man7/rtld-audit.7*
+%{_mandir}/man7/sem_overview.7*
+%{_mandir}/man7/shm_overview.7*
 %lang(cs) %{_mandir}/cs/man3/*
 %lang(de) %{_mandir}/de/man3/*
 %lang(es) %{_mandir}/es/man3/*
+%lang(es) %{_mandir}/es/man7/glob.7*
+%lang(fr) %{_mandir}/fr/man2/getcwd.2*
 %lang(fr) %{_mandir}/fr/man3/*
+%lang(fr) %{_mandir}/fr/man7/complex.7*
+%lang(fr) %{_mandir}/fr/man7/feature_test_macros.7*
+%lang(fr) %{_mandir}/fr/man7/glob.7*
+%lang(fr) %{_mandir}/fr/man7/posixoptions.7*
+%lang(fr) %{_mandir}/fr/man7/pthreads.7*
+%lang(fr) %{_mandir}/fr/man7/sem_overview.7*
+%lang(fr) %{_mandir}/fr/man7/shm_overview.7*
 %lang(hu) %{_mandir}/hu/man3/*
 %lang(it) %{_mandir}/it/man3/*
+%lang(it) %{_mandir}/it/man7/glob.7*
+%lang(ja) %{_mandir}/ja/man1/sprof.1*
+%lang(ja) %{_mandir}/ja/man2/getcwd.2*
 %lang(ja) %{_mandir}/ja/man3/*
+%lang(ja) %{_mandir}/ja/man7/aio.7*
+%lang(ja) %{_mandir}/ja/man7/complex.7*
+%lang(ja) %{_mandir}/ja/man7/feature_test_macros.7*
+%lang(ja) %{_mandir}/ja/man7/glibc.7*
+%lang(ja) %{_mandir}/ja/man7/glob.7*
+%lang(ja) %{_mandir}/ja/man7/libc.7*
+%lang(ja) %{_mandir}/ja/man7/math_error.7*
+%lang(ja) %{_mandir}/ja/man7/posixoptions.7*
+%lang(ja) %{_mandir}/ja/man7/pthreads.7*
+%lang(ja) %{_mandir}/ja/man7/sem_overview.7*
+%lang(ja) %{_mandir}/ja/man7/shm_overview.7*
 %lang(ko) %{_mandir}/ko/man3/*
 %lang(nl) %{_mandir}/nl/man3/*
 %lang(pl) %{_mandir}/pl/man3/*
 %lang(pt) %{_mandir}/pt/man3/*
+%lang(pt) %{_mandir}/pt/man7/glob.7*
 %lang(ru) %{_mandir}/ru/man1/sprof.1*
 %lang(ru) %{_mandir}/ru/man3/*
+%lang(ru) %{_mandir}/ru/man7/glob.7*
 %lang(tr) %{_mandir}/tr/man3/*
 %lang(uk) %{_mandir}/uk/man3/*
 %lang(zh_CN) %{_mandir}/zh_CN/man3/*
+%lang(zh_CN) %{_mandir}/zh_CN/man7/glob.7*
+
+%files static
+%defattr(644,root,root,755)
+%{_libdir}/libanl.a
+%{_libdir}/libBrokenLocale.a
+%{_libdir}/libc.a
+%{_libdir}/libcrypt.a
+%{_libdir}/libdl.a
+%{_libdir}/libm.a
+%{_libdir}/libmcheck.a
+%ifarch %{x8664} x32
+%{_libdir}/libmvec.a
+%endif
+%{_libdir}/libnsl.a
+%{_libdir}/libpthread.a
+%{_libdir}/libresolv.a
+%{_libdir}/librt.a
+%{_libdir}/libutil.a
+
+%files profile
+%defattr(644,root,root,755)
+%{_libdir}/lib*_p.a
+
+%files pic
+%defattr(644,root,root,755)
+%{_libdir}/lib*_pic.a
+%{_libdir}/lib*.map
+%{_libdir}/soinit.o
+%{_libdir}/sofini.o
 
 %files -n nscd
 %defattr(644,root,root,755)
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/nscd
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/nscd.*
 %attr(754,root,root) /etc/rc.d/init.d/nscd
-%config(noreplace) %verify(not md5 mtime size) /etc/init/nscd.conf
 %attr(755,root,root) %{_sbindir}/nscd*
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/logrotate.d/nscd
 %attr(640,root,root) %ghost /var/log/nscd
@@ -1804,29 +2042,5 @@ fi
 %{_libdir}/gconv/gconv-modules
 %verify(not md5 mtime size) %{_libdir}/gconv/gconv-modules.cache
 %attr(755,root,root) %{_libdir}/gconv/*.so
-
-%files static
-%defattr(644,root,root,755)
-%{_libdir}/libanl.a
-%{_libdir}/libBrokenLocale.a
-%{_libdir}/libc.a
-%{_libdir}/libcrypt.a
-%{_libdir}/libdl.a
-%{_libdir}/libm.a
-%{_libdir}/libmcheck.a
-%{_libdir}/libnsl.a
-%{_libdir}/libpthread.a
-%{_libdir}/libresolv.a
-%{_libdir}/librt.a
-%{_libdir}/libutil.a
-
-%files profile
-%defattr(644,root,root,755)
-%{_libdir}/lib*_p.a
-
-%files pic
-%defattr(644,root,root,755)
-%{_libdir}/lib*_pic.a
-%{_libdir}/lib*.map
-%{_libdir}/soinit.o
-%{_libdir}/sofini.o
+%{_mandir}/man8/iconvconfig.8*
+%lang(ja) %{_mandir}/ja/man8/iconvconfig.8*