X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;ds=sidebyside;f=glibc.spec;h=a5cc231e2c04ce9c480886cc998ec10522251d7a;hb=d51224e20be9da3112bdc45cba1505b054c99453;hp=404545007bc68190649791a974c757826d9be9d3;hpb=5b00029e66599da87c7fed56f2ce0bb4b820ed28;p=packages%2Fglibc.git

diff --git a/glibc.spec b/glibc.spec
index 4045450..a5cc231 100644
--- a/glibc.spec
+++ b/glibc.spec
@@ -75,27 +75,24 @@ Summary(ru):	GNU libc 
 Summary(tr):	GNU libc
 Summary(uk):	GNU libc ×ÅÒÓ¦§ 2.3
 Name:		glibc
-Version:	2.3.5
-Release:	2.2
+Version:	2.3.6
+Release:	6.1
 Epoch:		6
 License:	LGPL
 Group:		Libraries
 Source0:	ftp://sources.redhat.com/pub/glibc/releases/%{name}-%{version}.tar.bz2
-# Source0-md5:	93d9c51850e0513aa4846ac0ddcef639
+# Source0-md5:	bfdce99f82d6dbcb64b7f11c05d6bc96
 Source1:	ftp://sources.redhat.com/pub/glibc/releases/%{name}-linuxthreads-%{version}.tar.bz2
-# Source1-md5:	77011b0898393c56b799bc011a0f37bf
+# Source1-md5:	d4eeda37472666a15cc1f407e9c987a9
 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:	03bee93e9786b3e7dad2570ccb0cbc5c
-#Source6:	http://www.mif.pg.gda.pl/homepages/ankry/man-PLD/%{name}-non-english-man-pages.tar.bz2
-Source6:	%{name}-non-english-man-pages.tar.bz2
-# Source6-md5:	6159f0a9b6426b5f6fc1b0d8d21b9b76
-Source7:	%{name}-localedb-gen
-Source8:	%{name}-LD-path.c
-Source9:	postshell.c
+Source5:	http://qboosh.cs.net.pl/man/%{name}-man-pages.tar.bz2
+# Source5-md5:	f464eadf3cf06761f65639e44a179e6b
+Source6:	%{name}-localedb-gen
+Source7:	%{name}-LD-path.c
+Source8:	postshell.c
 Patch0:		%{name}-info.patch
 Patch1:		%{name}-pl.po-update.patch
 Patch2:		%{name}-pld.patch
@@ -123,18 +120,19 @@ Patch23:	%{name}-locale_fixes.patch
 Patch24:	%{name}-ZA_collate.patch
 Patch25:	%{name}-tls_fix.patch
 Patch26:	%{name}-iconvconfig-nxstack.patch
-Patch27:	%{name}-execvp.patch
-Patch28:	%{name}-sys-kd.patch
-Patch29:	%{name}-cross-gcc_eh.patch
-Patch30:	%{name}-pax_dl-execstack.patch
-Patch31:	%{name}-gcc4.patch
-Patch32:	%{name}-no_uint128_t.patch
+Patch27:	%{name}-sys-kd.patch
+Patch28:	%{name}-cross-gcc_eh.patch
+Patch29:	%{name}-pax_dl-execstack.patch
+Patch30:	%{name}-large_collate_tables.patch
+Patch31:	%{name}-ctype-compat.patch
+Patch32:	%{name}-sparc-mman.h.patch
 URL:		http://www.gnu.org/software/libc/
+%{?with_selinux:BuildRequires:	audit-libs-devel}
 BuildRequires:	autoconf
 BuildRequires:	automake
 BuildRequires:	binutils >= 2:2.15.90.0.3
+%{!?with_cross:BuildRequires:	dietlibc-static}
 BuildRequires:	gcc >= 5:3.2
-BuildRequires:	gcc < 5:4.0
 %ifarch ppc ppc64 sparc sparcv9 sparc64
 %if %{with nptl} || %{with __thread}
 BuildRequires:	gcc >= 5:3.4
@@ -149,16 +147,15 @@ BuildRequires:	linux-libc-headers >= %{llh_version}
 BuildRequires:	perl-base
 BuildRequires:	rpm-build >= 4.3-0.20030610.28
 BuildRequires:	rpm-perlprov
-BuildRequires:	rpmbuild(macros) >= 1.213
+BuildRequires:	rpmbuild(macros) >= 1.268
 BuildRequires:	sed >= 4.0.5
 BuildRequires:	texinfo
-BuildRequires:	dietlibc-static
 AutoReq:	false
-PreReq:		basesystem
-Requires:	glibc-misc = %{epoch}:%{version}-%{release}
+Requires:	%{name}-misc = %{epoch}:%{version}-%{release}
+Requires:	basesystem
+Provides:	/sbin/ldconfig
 %{?with_tls:Provides:	glibc(tls)}
 Provides:	ldconfig
-Provides:	/sbin/ldconfig
 Obsoletes:	glibc-common
 Obsoletes:	glibc-debug
 Obsoletes:	ldconfig
@@ -194,7 +191,7 @@ upgrades, common system code is kept in one place and shared between
 programs. This package contains the most important sets of shared
 libraries, the standard C library and the standard math library.
 Without these, a Linux system will not function. It also contains
-national language (locale) support and timezone databases.
+national language (locale) support.
 
 Can be used on: Linux kernel >= %{min_kernel}.
 
@@ -206,8 +203,7 @@ sistema se guarda en un sitio y es compartido entre los programas.
 Este paquete contiene las bibliotecas compartidas más importantes, es
 decir la biblioteca C estándar y la biblioteca estándar de matemática.
 Sin éstas, un sistema Linux no podrá funcionar. También está incluido
-soporte de idiomas nacionales (locale) y bases de datos de zona de
-tiempo.
+soporte de idiomas nacionales (locale).
 
 Puede usarse con: núcleo Linux >= %{min_kernel}.
 
@@ -220,7 +216,7 @@ gemeinsam genutzt. Dieses Paket enth
 shared Libraries, die Standard-C-Library und die
 Standard-Math-Library, ohne die das Linux-System nicht funktioniert.
 Ferner enthält es den Support für die verschiedenen Sprachgregionen
-(locale) und die Zeitzonen-Datenbank.
+(locale).
 
 Can be used on: Linux kernel >= %{min_kernel}.
 
@@ -232,8 +228,7 @@ un endroit et partag
 bibliothèques partagées les plus importantes, la bibliothèque standard
 du C et la bibliothèque mathématique standard. Sans celles-ci, un
 système Linux ne peut fonctionner. Il contient aussi la gestion des
-langues nationales (locales) et les bases de données des zones
-horaires.
+langues nationales (locales).
 
 Can be used on: Linux kernel >= %{min_kernel}.
 
@@ -259,7 +254,7 @@ programami. Pakiet ten zawiera bardzo wa
 standardowych, wspó³dzielonych (dynamicznych) bibliotek C i
 matematycznych. Bez glibc system Linux nie jest w stanie funkcjonowaæ.
 Znajduj± siê tutaj równie¿ definicje ró¿nych informacji dla wielu
-jêzyków (locale) oraz definicje stref czasowych.
+jêzyków (locale).
 
 Przeznaczony dla j±dra Linux >= %{min_kernel}.
 
@@ -271,8 +266,7 @@ Przeznaczony dla j
 ÐÒÏÇÒÁÍÍÁÍÉ. üÔÏÔ ÐÁËÅÔ ÓÏÄÅÒÖÉÔ ÎÁÉÂÏÌÅÅ ×ÁÖÎÙÅ ÉÚ ÒÁÚÄÅÌÑÅÍÙÈ
 ÂÉÂÌÉÏÔÅË - ÓÔÁÎÄÁÒÔÎÕÀ ÂÉÂÌÉÏÔÅËÕ C É ÓÔÁÎÄÁÒÔÎÕÀ ÂÉÂÌÉÏÔÅËÕ
 ÍÁÔÅÍÁÔÉËÉ. âÅÚ ÜÔÉÈ ÂÉÂÌÉÏÔÅË Linux ÆÕÎËÃÉÏÎÉÒÏ×ÁÔØ ÎÅ ÂÕÄÅÔ. ôÁËÖÅ
-ÐÁËÅÔ ÓÏÄÅÒÖÉÔ ÐÏÄÄÅÒÖËÕ ÎÁÃÉÏÎÁÌØÎÙÈ ÑÚÙËÏ× (locale) É ÂÁÚÙ ÄÁÎÎÙÈ
-×ÒÅÍÅÎÎÙÈ ÚÏÎ (timezone databases).
+ÐÁËÅÔ ÓÏÄÅÒÖÉÔ ÐÏÄÄÅÒÖËÕ ÎÁÃÉÏÎÁÌØÎÙÈ ÑÚÙËÏ× (locale).
 
 Can be used on: Linux kernel >= %{min_kernel}.
 
@@ -295,17 +289,18 @@ Can be used on: Linux kernel >= %{min_kernel}.
 ×ÉËÏÒÉÓÔÏ×Õ¤ÔØÓÑ ×Ó¦ÍÁ ÐÒÏÇÒÁÍÁÍÉ. ãÅÊ ÐÁËÅÔ Í¦ÓÔÉÔØ ÎÁʦÌØÛ ×ÁÖÌÉצ
 Ú ÄÉÎÁͦÞÎÉÈ Â¦Â̦ÏÔÅË - ÓÔÁÎÄÁÒÔÎÕ Â¦Â̦ÏÔÅËÕ ó ÔÁ ÓÔÁÎÄÁÒÔÎÕ
 ¦Â̦ÏÔÅËÕ ÍÁÔÅÍÁÔÉËÉ. âÅÚ ÃÉÈ Â¦Â̦ÏÔÅË Linux ÆÕÎËæÏÎÕ×ÁÔÉ ÎÅ ÂÕÄÅ.
-ôÁËÏÖ ÐÁËÅÔ Í¦ÓÔÉÔØ Ð¦ÄÔÒÉÍËÕ ÎÁæÏÎÁÌØÎÉÈ ÍÏ× (locale) ÔÁ ÂÁÚÉ ÄÁÎÎÉÈ
-ÞÁÓÏ×ÉÈ ÚÏÎ (timezone databases).
+ôÁËÏÖ ÐÁËÅÔ Í¦ÓÔÉÔØ Ð¦ÄÔÒÉÍËÕ ÎÁæÏÎÁÌØÎÉÈ ÍÏ× (locale).
 
 Can be used on: Linux kernel >= %{min_kernel}.
 
 %package misc
 Summary:	Utilities and data used by glibc
 Summary(pl):	Narzêdzia i dane u¿ywane przez glibc
-Group:		Development/Libraries
+Group:		Applications/System
 AutoReq:	false
-PreReq:		%{name} = %{epoch}:%{version}-%{release}
+Requires(pre):	%{name} = %{epoch}:%{version}-%{release}
+Requires:	%{name} = %{epoch}:%{version}-%{release}
+Requires:	tzdata >= 2006g-2
 
 %description misc
 Utilities and data used by glibc.
@@ -325,9 +320,8 @@ Summary(tr):	Geli
 Summary(uk):	äÏÄÁÔËÏצ ¦Â̦ÏÔÅËÉ, ÐÏÔÒ¦ÂΦ ÄÌÑ ËÏÍЦÌÑæ§
 Group:		Development/Libraries
 Requires:	%{name} = %{epoch}:%{version}-%{release}
-Requires:	%{name}-headers = %{epoch}:%{version}-%{release}
 Requires:	%{name}-devel-utils = %{epoch}:%{version}-%{release}
-Requires:	%{name}-devel-doc = %{epoch}:%{version}-%{release}
+Requires:	%{name}-headers = %{epoch}:%{version}-%{release}
 Provides:	%{name}-devel(%{_target_cpu}) = %{epoch}:%{version}-%{release}
 Obsoletes:	libiconv-devel
 
@@ -386,7 +380,7 @@ kitapl
 %package headers
 Summary:	Header files for development using standard C libraries
 Summary(pl):	Pliki nag³ówkowe do tworzenia programów przy u¿yciu standardowych bibliotek C
-Group:		Development/Libraries
+Group:		Development/Building
 Provides:	%{name}-headers(%{_target_cpu}) = %{epoch}:%{version}-%{release}
 %ifarch %{x8664}
 # If both -m32 and -m64 is to be supported on AMD64, x86_64 package
@@ -399,6 +393,15 @@ Obsoletes:	%{name}-headers(athlon)
 Obsoletes:	%{name}-headers(pentium3)
 Obsoletes:	%{name}-headers(pentium4)
 %endif
+%ifarch ppc64
+Obsoletes:	%{name}-headers(ppc)
+%endif
+%ifarch s390x
+Obsoletes:	%{name}-headers(s390)
+%endif
+%ifarch sparc64
+Obsoletes:	%{name}-headers(sparc)
+%endif
 %{!?with_kernelheaders:Requires:	linux-libc-headers >= %{llh_version}}
 
 %description headers
@@ -438,6 +441,15 @@ Obsoletes:	%{name}-devel-utils(athlon)
 Obsoletes:	%{name}-devel-utils(pentium3)
 Obsoletes:	%{name}-devel-utils(pentium4)
 %endif
+%ifarch ppc64
+Obsoletes:	%{name}-devel-utils(ppc)
+%endif
+%ifarch s390x
+Obsoletes:	%{name}-devel-utils(s390)
+%endif
+%ifarch sparc64
+Obsoletes:	%{name}-devel-utils(sparc)
+%endif
 
 %description devel-utils
 The glibc-devel-utils package contains utilities necessary for
@@ -453,8 +465,8 @@ will use the standard C libraries.
 Pakiet glibc-devel-utils zawiera narzêdzia niezbêdne do rozwijania
 programów u¿ywaj±cych standardowych bibliotek C (u¿ywanych przez
 prawie wszystkie programy). Je¶li tworzymy programy korzystaj±ce ze
-standardowych bibliotek C, system wymaga dostêpno¶ci tych
-narzêdzi do tworzenia programów wykonywalnych.
+standardowych bibliotek C, system wymaga dostêpno¶ci tych narzêdzi do
+tworzenia programów wykonywalnych.
 
 Ten pakiet nale¿y zainstalowaæ je¶li zamierzamy tworzyæ programy
 korzystaj±ce ze standardowych bibliotek C.
@@ -475,6 +487,15 @@ Obsoletes:	%{name}-devel-doc(athlon)
 Obsoletes:	%{name}-devel-doc(pentium3)
 Obsoletes:	%{name}-devel-doc(pentium4)
 %endif
+%ifarch ppc64
+Obsoletes:	%{name}-devel-doc(ppc)
+%endif
+%ifarch s390x
+Obsoletes:	%{name}-devel-doc(s390)
+%endif
+%ifarch sparc64
+Obsoletes:	%{name}-devel-doc(sparc)
+%endif
 
 %description devel-doc
 The glibc-devel-doc package contains info and manual pages necessary
@@ -500,17 +521,17 @@ Summary(pl):	Demon zapami
 Summary(ru):	ëÜÛÉÒÕÀÝÉÊ ÄÅÍÏÎ ÓÅÒ×ÉÓÏ× ÉÍÅÎ
 Summary(uk):	ëÅÛÕÀÞÉÊ ÄÅÍÏÎ ÓÅ×¦Ó¦× ¦ÍÅÎ
 Group:		Networking/Daemons
-PreReq:		rc-scripts >= 0.2.0
+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(post,preun):	/sbin/chkconfig
-Requires(post):	fileutils
-Requires(postun):	/usr/sbin/groupdel
-Requires(postun):	/usr/sbin/userdel
 Requires:	%{name} = %{epoch}:%{version}-%{release}
 %{?with_selinux:Requires:	libselinux >= 1.18}
+Requires:	rc-scripts >= 0.2.0
 Provides:	group(nscd)
 Provides:	user(nscd)
 
@@ -544,7 +565,7 @@ nscd 
 Summary:	locale database source code
 Summary(es):	Código fuente de la base de datos de los locales
 Summary(pl):	Kod ¼ród³owy bazy locale
-Group:		Daemons
+Group:		Libraries
 Requires:	%{name} = %{epoch}:%{version}-%{release}
 Requires:	gzip
 Requires:	sed
@@ -568,8 +589,8 @@ Summary:	locale database for all locales supported by glibc
 Summary(es):	Base de datos de todos los locales soportados por glibc
 Summary(pl):	Baza danych locale dla wszystkich lokalizacji obs³ugiwanych przez glibc
 Group:		Libraries
-Requires:	iconv = %{epoch}:%{version}-%{release}
 Requires:	%{name} = %{epoch}:%{version}-%{release}
+Requires:	iconv = %{epoch}:%{version}-%{release}
 
 %description localedb-all
 This package contains locale database for all locales supported by
@@ -597,8 +618,8 @@ pakiet localedb-src mo
 %package -n iconv
 Summary:	Convert encoding of given files from one encoding to another
 Summary(es):	Convierte entre varias codificaciones de los ficheros dados
-Summary(pl):	Program do konwersji plików tekstowych z jednego kodowania do innego
-Group:		Applications/Text
+Summary(pl):	Modu³y do konwersji plików tekstowych z jednego kodowania do innego
+Group:		Libraries
 Requires:	%{name} = %{epoch}:%{version}-%{release}
 
 %description -n iconv
@@ -615,12 +636,12 @@ Generic Character Set Conversion Interface (interfaz gen
 conversión de juegos de caracteres).
 
 %description -n iconv -l pl
-Program do konwersji plików tekstowych z jednego kodowania do innego.
-Musisz mieæ zainstalowany ten pakiet je¿eli wykonujesz konwersjê
-dokumentów z jednego kodowania do innego lub je¿eli masz zainstalowane
-jakie¶ programy, które korzystaj± 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.
+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 libraries
@@ -630,6 +651,7 @@ Summary(ru):	
 Summary(uk):	óÔÁÔÉÞΦ ¦Â̦ÏÔÅËÉ glibc
 Group:		Development/Libraries
 Requires:	%{name}-devel = %{epoch}:%{version}-%{release}
+Provides:	%{name}-static(%{_target_cpu}) = %{epoch}:%{version}-%{release}
 Obsoletes:	libiconv-static
 
 %description static
@@ -836,32 +858,13 @@ Un juguete.
 %description memusage -l pl
 Zabawka.
 
-%package zoneinfo_right
-Summary:	Non-POSIX (real) time zones
-Summary(es):	Zonas de tiempo reales (no de POSIX)
-Summary(pl):	Nie-POSIX-owe (prawdziwe) strefy czasowe
-Group:		Libraries
-Requires:	%{name} = %{epoch}:%{version}-%{release}
-
-%description zoneinfo_right
-You don't want this. Details at:
-http://sources.redhat.com/ml/libc-alpha/2000-12/msg00068.html
-
-%description zoneinfo_right -l es
-No lo necesita. Encontrará los detalles en:
-http://sources.redhat.com/ml/libc-alpha/2000-12/msg00068.html
-
-%description zoneinfo_right -l pl
-Nie potrzebujesz tego. Szczegó³y pod:
-http://sources.redhat.com/ml/libc-alpha/2000-12/msg00068.html
-
 %package -n %{name}64
 Summary:	GNU libc - 64-bit libraries
 Summary(es):	GNU libc - bibliotecas de 64 bits
 Summary(pl):	GNU libc - biblioteki 64-bitowe
 Group:		Libraries
-PreReq:		basesystem
 Requires:	%{name}-misc = %{epoch}:%{version}-%{release}
+Requires:	basesystem
 Provides:	glibc = %{epoch}:%{version}-%{release}
 %{?with_tls:Provides:	glibc(tls)}
 Provides:	ldconfig
@@ -871,9 +874,9 @@ Obsoletes:	ldconfig
 Conflicts:	kernel < %{min_kernel}
 Conflicts:	ld.so < 1.9.9-10
 Conflicts:	man-pages < 1.43
+Conflicts:	poldek < 0.18.8-4
 Conflicts:	rc-scripts < 0.3.1-13
 Conflicts:	rpm < 4.1
-Conflicts:	poldek < 0.18.8-4
 
 %description -n %{name}64
 64-bit GNU libc libraries for 64bit architecture.
@@ -893,7 +896,7 @@ Biblioteki 64-bitowe GNU libc dla architektury 64bit.
 %patch4 -p1
 %patch5 -p1
 %patch6 -p1
-%patch7 -p1
+#%patch7 -p1 UPDATE/DROP (which kernels cause problems?)
 %patch8 -p1
 %patch9 -p1
 %patch10 -p1
@@ -915,11 +918,11 @@ Biblioteki 64-bitowe GNU libc dla architektury 64bit.
 %patch25 -p1
 %patch26 -p1
 %patch27 -p1
-%patch28 -p1
-%{?with_cross:%patch29 -p1}
-%{?with_pax:%patch30 -p1}
-#%patch31 -p1
-#%patch32 -p1
+%{?with_cross:%patch28 -p1}
+%{?with_pax:%patch29 -p1}
+%patch30 -p1
+%patch31 -p1
+%patch32 -p1
 
 chmod +x scripts/cpp
 
@@ -994,9 +997,11 @@ cd ..
 done
 %endif
 
+%if %{without cross}
 # compiling static using diet vs glibc saves 400k
-diet -Os %{__cc} %{SOURCE9} %{rpmcflags} -static -o postshell
-diet -Os %{__cc} %{SOURCE8} %{rpmcflags} -static -o glibc-postinst
+diet -Os %{__cc} %{SOURCE8} %{rpmcflags} -static -o postshell
+diet -Os %{__cc} %{SOURCE7} %{rpmcflags} -static -o glibc-postinst
+%endif
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -1024,8 +1029,10 @@ install elf/soinit.os				$RPM_BUILD_ROOT%{_libdir}/soinit.o
 install elf/sofini.os				$RPM_BUILD_ROOT%{_libdir}/sofini.o
 cd ..
 
+%if %{without cross}
 install postshell					$RPM_BUILD_ROOT/sbin
 install glibc-postinst				$RPM_BUILD_ROOT/sbin
+%endif
 
 %if %{with dual}
 env LANGUAGE=C LC_ALL=C \
@@ -1068,15 +1075,10 @@ mv -f $RPM_BUILD_ROOT/%{_lib}/libpcprofile.so	$RPM_BUILD_ROOT%{_libdir}
 install linuxthreads/man/*.3thr		$RPM_BUILD_ROOT%{_mandir}/man3
 %endif
 
-rm -rf $RPM_BUILD_ROOT%{_datadir}/zoneinfo/{localtime,posixtime,posixrules,posix/*}
-
-#cd $RPM_BUILD_ROOT%{_datadir}/zoneinfo
-#for i in [A-Z]*; do
-#	ln -s ../$i posix
-#done
-#cd -
+rm -f $RPM_BUILD_ROOT%{_sysconfdir}/localtime
+# moved to tzdata package
+rm -rf $RPM_BUILD_ROOT%{_datadir}/zoneinfo
 
-# Where should s390 go?
 %ifarch %{ix86} ppc s390 sparc sparcv9
 mv $RPM_BUILD_ROOT%{_includedir}/gnu/stubs.h $RPM_BUILD_ROOT%{_includedir}/gnu/stubs-32.h
 %endif
@@ -1102,13 +1104,8 @@ cat <<EOF >$RPM_BUILD_ROOT%{_includedir}/gnu/stubs.h
 EOF
 %endif
 
-ln -sf %{_sysconfdir}/localtime	$RPM_BUILD_ROOT%{_datadir}/zoneinfo/localtime
-ln -sf localtime		$RPM_BUILD_ROOT%{_datadir}/zoneinfo/posixtime
-ln -sf localtime		$RPM_BUILD_ROOT%{_datadir}/zoneinfo/posixrules
 ln -sf libbsd-compat.a		$RPM_BUILD_ROOT%{_libdir}/libbsd.a
 
-rm -f $RPM_BUILD_ROOT%{_sysconfdir}/localtime
-
 # make symlinks across top-level directories absolute
 for l in anl BrokenLocale crypt dl m nsl resolv rt thread_db util ; do
 	rm -f $RPM_BUILD_ROOT%{_libdir}/lib${l}.so
@@ -1122,9 +1119,9 @@ install nscd/nscd.conf	$RPM_BUILD_ROOT%{_sysconfdir}
 install nss/nsswitch.conf	$RPM_BUILD_ROOT%{_sysconfdir}
 
 bzip2 -dc %{SOURCE5} | tar xf - -C $RPM_BUILD_ROOT%{_mandir}
-bzip2 -dc %{SOURCE6} | tar xf - -C $RPM_BUILD_ROOT%{_mandir}
 > $RPM_BUILD_ROOT%{_sysconfdir}/ld.so.cache
-> $RPM_BUILD_ROOT%{_sysconfdir}/ld.so.conf
+install -d $RPM_BUILD_ROOT%{_sysconfdir}/ld.so.conf.d
+echo 'include ld.so.conf.d/*.conf'> $RPM_BUILD_ROOT%{_sysconfdir}/ld.so.conf
 rm -f $RPM_BUILD_ROOT%{_mandir}/hu/man7/man.7
 
 :> $RPM_BUILD_ROOT/var/log/nscd
@@ -1182,32 +1179,33 @@ done
 # XXX: to be added when become supported by glibc
 # as (atk, gail)
 # az_IR (gtk+)
+# dv, haw, kok, ps (iso-codes)
 # my (gaim)
-# rm (gtkspell)
-# tk, yo (used by GNOME)
+# tk, ug, yo (used by GNOME)
 #
 # NOTES:
-# bn is used for bn_BD or bn_IN?
+# bn is used for bn_BD or bn_IN? Assume bn_IN as nothing for bn_BD appeared
+#   till now
+#
 # omitted here - already existing (with libc.mo):
-#   be,ca,cs,da,de,el,en_GB,es,fi,fr,gl,hr,hu,it,ja,ko,nb,nl,pl,pt_BR,sk,sv,tr,zh_CN,zh_TW
-for i in af am ang ar az bg bn br bs cy de_AT en en@boldquot en@quot en_AU \
-    en_CA en_US eo es_AR es_MX et eu fa fo ga gu he hi hsb ia id is it_CH ka \
-    kn ku leet lg li lo lt lv mi mk ml mn mr ms mt nds ne nn nso or pa pt ro \
-    ru rw se sl sq sr sr@Latn sr@ije ss ta tg th tl tlh uk uz ve vi wa xh yi \
-    zu ; do
+#   be,ca,cs,da,de,el,en_GB,es,fi,fr,gl,hr,hu,it,ja,ko,nb,nl,pl,pt_BR,sk,sv,
+#   tr,zh_CN,zh_TW
+#
+for i in aa af am ang ar az bg bn bn_IN br bs byn cy de_AT dz en en@boldquot \
+    en@quot en_AU en_CA en_US eo es_AR es_MX es_NI et eu fa fo fr_BE fy ga \
+    gez gu gv he hi hsb hy ia id is it_CH iu ka kk kl km kn ku kw ky leet lg li \
+    lo lt lv mg mi mk ml mn mr ms mt nds ne nl_BE nn nso oc om or pa pt rm ro \
+    ru rw sa se sid sl so sq sr sr@Latn sr@ije ss syr sw ta te tg th ti tig \
+    tl tlh tt uk ur uz ve vi wa wal xh yi zh_HK zu ; do
 	if [ ! -d $RPM_BUILD_ROOT%{_datadir}/locale/$i/LC_MESSAGES ]; then
 		install -d $RPM_BUILD_ROOT%{_datadir}/locale/$i/LC_MESSAGES
 		lang=`echo $i | sed -e 's/_.*//'`
 		echo "%lang($lang) %{_datadir}/locale/$i" >> glibc.lang
 	fi
 done
-cd $RPM_BUILD_ROOT%{_datadir}/locale
-ln -s zh_CN zh_SG
-ln -s zh_CN zh_HK
-cd -
 
 # localedb-gen infrastructure
-install %{SOURCE7} $RPM_BUILD_ROOT%{_bindir}/localedb-gen
+install %{SOURCE6} $RPM_BUILD_ROOT%{_bindir}/localedb-gen
 install localedata/SUPPORTED $RPM_BUILD_ROOT%{_datadir}/i18n
 
 # shutup check-files
@@ -1223,6 +1221,7 @@ rm -rf $RPM_BUILD_ROOT
 # don't run iconvconfig in %%postun -n iconv because iconvconfig doesn't exist
 # when %%postun is run
 
+%if %{without cross}
 %ifarch %{x8664} ppc64 s390x sparc64
 %post	-n %{name}64 -p /sbin/postshell
 %else
@@ -1247,6 +1246,15 @@ rm -rf $RPM_BUILD_ROOT
 %endif
 -/bin/mv %{_sysconfdir}/ld.so.conf.rpmsave %{_sysconfdir}/ld.so.conf
 
+%ifarch %{x8664} ppc64 s390x sparc64
+%triggerpostun -n %{name}64 -p /sbin/postshell -- %{name}64 < 6:2.3.5-7.6
+%else
+%triggerpostun -p /sbin/postshell -- %{name} < 6:2.3.5-7.6
+%endif
+-/bin/cp -f /etc/ld.so.conf /etc/ld.so.conf.rpmsave
+-/bin/sed -i -e '1iinclude ld.so.conf.d/*.conf' /etc/ld.so.conf
+%endif
+
 %post	memusage -p /sbin/ldconfig
 %postun memusage -p /sbin/ldconfig
 
@@ -1268,17 +1276,11 @@ touch /var/log/nscd
 chmod 000 /var/log/nscd
 chown root:root /var/log/nscd
 chmod 640 /var/log/nscd
-if [ -f /var/lock/subsys/nscd ]; then
-	/etc/rc.d/init.d/nscd restart 1>&2
-else
-	echo "Run \"/etc/rc.d/init.d/nscd start\" to start nscd daemon." 1>&2
-fi
+%service nscd restart "nscd daemon"
 
 %preun -n nscd
 if [ "$1" = "0" ]; then
-	if [ -f /var/lock/subsys/nscd ]; then
-		/etc/rc.d/init.d/nscd stop 1>&2
-	fi
+	%service nscd stop
 	/sbin/chkconfig --del nscd
 fi
 
@@ -1297,8 +1299,10 @@ fi
 %endif
 %defattr(644,root,root,755)
 %doc README NEWS FAQ BUGS
+%if %{without cross}
 %attr(755,root,root) /sbin/postshell
 %attr(755,root,root) /sbin/glibc-postinst
+%endif
 %attr(755,root,root) /sbin/ldconfig
 # ld* and libc.so.6 SONAME symlinks must be in package because of
 # chicken-egg problem (postshell is dynamically linked with libc);
@@ -1319,6 +1323,7 @@ fi
 %endif
 %{?with_localedb:%dir %{_libdir}/locale}
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/ld.so.conf
+%dir %{_sysconfdir}/ld.so.conf.d
 %ghost %{_sysconfdir}/ld.so.cache
 
 #%files -n nss_dns
@@ -1357,8 +1362,6 @@ fi
 
 %dir %{_datadir}/locale
 %{_datadir}/locale/locale.alias
-%{_datadir}/zoneinfo
-%exclude %{_datadir}/zoneinfo/right
 
 %{_mandir}/man1/catchsegv.1*
 %{_mandir}/man1/getconf.1*
@@ -1380,6 +1383,7 @@ fi
 %lang(cs) %{_mandir}/cs/man7/*
 %lang(de) %{_mandir}/de/man5/tzfile.5*
 %lang(de) %{_mandir}/de/man7/*
+%lang(es) %{_mandir}/es/man1/ldd.1*
 %lang(es) %{_mandir}/es/man5/locale.5*
 %lang(es) %{_mandir}/es/man5/nsswitch.conf.5*
 %lang(es) %{_mandir}/es/man5/tzfile.5*
@@ -1418,6 +1422,7 @@ fi
 %lang(ja) %{_mandir}/ja/man8/tzselect.8*
 %lang(ja) %{_mandir}/ja/man8/zdump.8*
 %lang(ja) %{_mandir}/ja/man8/zic.8*
+%lang(ko) %{_mandir}/ko/man1/ldd.1*
 %lang(ko) %{_mandir}/ko/man5/nsswitch.conf.5*
 %lang(ko) %{_mandir}/ko/man5/tzfile.5*
 %lang(ko) %{_mandir}/ko/man7/*
@@ -1435,12 +1440,22 @@ fi
 %lang(pt) %{_mandir}/pt/man8/tzselect.8*
 %lang(pt) %{_mandir}/pt/man8/zdump.8*
 %lang(pt) %{_mandir}/pt/man8/zic.8*
+%lang(ru) %{_mandir}/ru/man1/getent.1*
+%lang(ru) %{_mandir}/ru/man1/iconv.1*
+%lang(ru) %{_mandir}/ru/man1/ldd.1*
+%lang(ru) %{_mandir}/ru/man1/locale.1*
+%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/tzfile.5*
 %lang(ru) %{_mandir}/ru/man7/*
+%lang(ru) %{_mandir}/ru/man8/ld*.8*
+%lang(ru) %{_mandir}/ru/man8/rpcinfo.8*
 %lang(ru) %{_mandir}/ru/man8/tzselect.8*
 %lang(ru) %{_mandir}/ru/man8/zdump.8*
 %lang(ru) %{_mandir}/ru/man8/zic.8*
+%lang(tr) %{_mandir}/tr/man1/iconv.1*
+%lang(tr) %{_mandir}/tr/man1/ldd.1*
 %lang(zh_CN) %{_mandir}/zh_CN/man1/iconv.1*
 %lang(zh_CN) %{_mandir}/zh_CN/man1/ldd.1*
 %lang(zh_CN) %{_mandir}/zh_CN/man5/locale.5*
@@ -1450,10 +1465,6 @@ fi
 %lang(zh_CN) %{_mandir}/zh_CN/man8/zdump.8*
 %lang(zh_CN) %{_mandir}/zh_CN/man8/zic.8*
 
-%files zoneinfo_right
-%defattr(644,root,root,755)
-%{_datadir}/zoneinfo/right
-
 %files -n nss_compat
 %defattr(644,root,root,755)
 %attr(755,root,root) /%{_lib}/libnss_compat*.so*
@@ -1505,7 +1516,9 @@ fi
 %{_libdir}/nptl/libpthread_nonshared.a
 %endif
 
+%ifarch %{ix86} %{x8664} ppc ppc64 s390 s390x sparc sparcv9 sparc64
 %{_includedir}/gnu/stubs-*.h
+%endif
 
 %files headers
 %defattr(644,root,root,755)
@@ -1548,7 +1561,6 @@ fi
 %files devel-doc
 %defattr(644,root,root,755)
 %doc documentation/* NOTES PROJECTS
-
 %{_infodir}/libc.info*
 
 %{_mandir}/man1/sprof.1*
@@ -1564,7 +1576,9 @@ fi
 %lang(nl) %{_mandir}/nl/man3/*
 %lang(pl) %{_mandir}/pl/man3/*
 %lang(pt) %{_mandir}/pt/man3/*
+%lang(ru) %{_mandir}/ru/man1/sprof.1*
 %lang(ru) %{_mandir}/ru/man3/*
+%lang(tr) %{_mandir}/tr/man3/*
 %lang(uk) %{_mandir}/uk/man3/*
 %lang(zh_CN) %{_mandir}/zh_CN/man3/*
 
@@ -1584,12 +1598,17 @@ fi
 %{_mandir}/man5/nscd.conf.5*
 %{_mandir}/man8/nscd.8*
 %{_mandir}/man8/nscd_nischeck.8*
+%lang(es) %{_mandir}/es/man5/nscd.conf.5*
+%lang(es) %{_mandir}/es/man8/nscd.8*
 %lang(fr) %{_mandir}/fr/man5/nscd.conf.5*
 %lang(fr) %{_mandir}/fr/man8/nscd.8*
 %lang(ja) %{_mandir}/ja/man5/nscd.conf.5*
 %lang(ja) %{_mandir}/ja/man8/nscd.8*
 %lang(pt) %{_mandir}/pt/man5/nscd.conf.5*
 %lang(pt) %{_mandir}/pt/man8/nscd.8*
+%lang(ru) %{_mandir}/ru/man5/nscd.conf.5*
+%lang(ru) %{_mandir}/ru/man8/nscd.8*
+%lang(zh_CN) %{_mandir}/zh_CN/man5/nscd.conf.5*
 
 %files -n localedb-src
 %defattr(644,root,root,755)
@@ -1597,6 +1616,7 @@ fi
 %attr(755,root,root) %{_bindir}/localedb-gen
 %{_datadir}/i18n
 %{_mandir}/man1/localedef.1*
+%lang(ru) %{_mandir}/ru/man1/localedef.1*
 
 %if %{with localedb}
 %files localedb-all