- merge GLIBC_2_2_5 branch to HEAD,

- merge translations from KSI.

Changed files:
    glibc.spec -> 1.220

diff --git a/glibc.spec b/glibc.spec
index eefbc8e23a6ad5a189c97b8b4a2d0ccd33108744..1d8439d2ad40025e5efa891d36d4dfad7c47c7a7 100644 (file)
--- a/glibc.spec
+++ b/glibc.spec
@@ -1,12 +1,19 @@
-%define                min_kernel      2.2.0
+#
+# You can define min_kernel macro by "rpm --define 'min_kernel version'"
+# default is 2.2.0 (no changes up to 2.3.25)
+
+%{!?min_kernel:%define         min_kernel      2.2.0}
+
 Summary:       GNU libc
 Summary(de):   GNU libc
 Summary(fr):   GNU libc
 Summary(pl):   GNU libc
+Summary(ru):   GNU libc ×ÅÒÓÉÉ 2.2
 Summary(tr):   GNU libc
+Summary(uk):   GNU libc ×ÅÒÓ¦§ 2.2
 Name:          glibc
-Version:       2.2.4
-Release:       13
+Version:       2.2.5
+Release:       1
 Epoch:         6
 License:       LGPL
 Group:         Libraries
@@ -26,8 +33,8 @@ Group(ru):    
 Group(sl):     Knji¾nice
 Group(sv):     Bibliotek
 Group(uk):     â¦Â̦ÏÔÅËÉ
-Source0:       ftp://sources.redhat.com/pub/glibc/releases/%{name}-%{version}.tar.gz
-Source1:       ftp://sources.redhat.com/pub/glibc/releases/%{name}-linuxthreads-%{version}.tar.gz
+Source0:       ftp://sources.redhat.com/pub/glibc/releases/%{name}-%{version}.tar.bz2
+Source1:       ftp://sources.redhat.com/pub/glibc/releases/%{name}-linuxthreads-%{version}.tar.bz2
 Source2:       nscd.init
 Source3:       nscd.sysconfig
 Source4:       nscd.logrotate
@@ -44,10 +51,8 @@ Patch7:              %{name}-sparc-linux-chown.patch
 Patch8:                %{name}-ldconfig-bklinks.patch
 Patch9:                %{name}-paths.patch
 Patch10:       %{name}-vaargs.patch
-Patch11:       %{name}-malloc.patch
-Patch12:       %{name}-glob.patch
-Patch13:       %{name}-getaddrinfo-workaround.patch
-Patch14:       %{name}-gcc3.patch
+Patch11:       %{name}-getaddrinfo-workaround.patch
+Patch12:       %{name}-use-int-not-arpa.patch
 URL:           http://www.gnu.org/software/libc/
 BuildRequires: gd-devel >= 2.0.1
 BuildRequires: gettext-devel >= 0.10.36
@@ -112,6 +117,17 @@ 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.
 
+%description -l ru
+óÏÄÅÒÖÉÔ ÓÔÁÎÄÁÒÔÎÙÅ ÂÉÂÌÉÏÔÅËÉ, ÉÓÐÏÌØÚÕÅÍÙÅ ÍÎÏÇÏÞÉÓÌÅÎÎÙÍÉ
+ÐÒÏÇÒÁÍÍÁÍÉ × ÓÉÓÔÅÍÅ. äÌÑ ÔÏÇÏ, ÞÔÏÂÙ ÓÏÈÒÁÎÉÔØ ÄÉÓËÏ×ÏÅ ÐÒÏÓÔÒÁÎÓÔ×Ï
+É ÐÁÍÑÔØ, Á ÔÁËÖÅ ÄÌÑ ÐÒÏÓÔÏÔÙ ÏÂÎÏ×ÌÅÎÉÑ, ÓÉÓÔÅÍÎÙÊ ËÏÄ, ÏÂÝÉÊ ÄÌÑ
+×ÓÅÈ ÐÒÏÇÒÁÍÍ, ÈÒÁÎÉÔÓÑ × ÏÄÎÏÍ ÍÅÓÔÅ É ËÏÌÌÅËÔÉ×ÎÏ ÉÓÐÏÌØÚÕÅÔÓÑ ×ÓÅÍÉ
+ÐÒÏÇÒÁÍÍÁÍÉ. üÔÏÔ ÐÁËÅÔ ÓÏÄÅÒÖÉÔ ÎÁÉÂÏÌÅÅ ×ÁÖÎÙÅ ÉÚ ÒÁÚÄÅÌÑÅÍÙÈ
+ÂÉÂÌÉÏÔÅË - ÓÔÁÎÄÁÒÔÎÕÀ ÂÉÂÌÉÏÔÅËÕ C É ÓÔÁÎÄÁÒÔÎÕÀ ÂÉÂÌÉÏÔÅËÕ
+ÍÁÔÅÍÁÔÉËÉ. âÅÚ ÜÔÉÈ ÂÉÂÌÉÏÔÅË Linux ÆÕÎËÃÉÏÎÉÒÏ×ÁÔØ ÎÅ ÂÕÄÅÔ. ôÁËÖÅ
+ÐÁËÅÔ ÓÏÄÅÒÖÉÔ ÐÏÄÄÅÒÖËÕ ÎÁÃÉÏÎÁÌØÎÙÈ ÑÚÙËÏ× (locale) É ÂÁÚÙ ÄÁÎÎÙÈ
+×ÒÅÍÅÎÎÙÈ ÚÏÎ (timezone databases).
+
 %description -l tr
 Bu paket, birçok programýn kullandýðý standart kitaplýklarý içerir.
 Disk alaný ve bellek kullanýmýný azaltmak ve ayný zamanda güncelleme
@@ -121,12 +137,25 @@ kitapl
 içerir. Bu kitaplýklar olmadan Linux sistemi çalýþmayacaktýr. Yerel
 dil desteði ve zaman dilimi veri tabaný da bu pakette yer alýr.
 
+%description -l uk
+í¦ÓÔÉÔØ ÓÔÁÎÄÁÒÔΦ ¦Â̦ÏÔÅËÉ, ËÏÔÒ¦ ×ÉËÏÒÉÓÔÏ×ÕÀÔØÓÑ ÞÉÓÌÅÎÎÉÍÉ
+ÐÒÏÇÒÁÍÁÍÉ × ÓÉÓÔÅͦ. äÌÑ ÔÏÇÏ, ÝÏ ÚÂÅÒÅÇÔÉ ÄÉÓËÏ×ÉÊ ÐÒÏÓÔ¦Ò ÔÁ
+ÐÁÍ'ÑÔØ, Á ÔÁËÏÖ ÄÌÑ ÐÒÏÓÔÏÔÉ ÐÏÎÏ×ÌÅÎÎÑ ÓÉÓÔÅÍÉ, ÓÉÓÔÅÍÎÉÊ ËÏÄ,
+ÓЦÌØÎÉÊ ÄÌÑ ×Ó¦È ÐÒÏÇÒÁÍ, ÚÂÅÒ¦ÇÁ¤ÔØÓÑ × ÏÄÎÏÍÕ Í¦Óæ ¦ ËÏÌÅËÔÉ×ÎÏ
+×ÉËÏÒÉÓÔÏ×Õ¤ÔØÓÑ ×Ó¦ÍÁ ÐÒÏÇÒÁÍÁÍÉ. ãÅÊ ÐÁËÅÔ Í¦ÓÔÉÔØ ÎÁʦÌØÛ ×ÁÖÌÉצ
+Ú ÄÉÎÁͦÞÎÉÈ Â¦Â̦ÏÔÅË - ÓÔÁÎÄÁÒÔÎÕ Â¦Â̦ÏÔÅËÕ ó ÔÁ ÓÔÁÎÄÁÒÔÎÕ
+¦Â̦ÏÔÅËÕ ÍÁÔÅÍÁÔÉËÉ. âÅÚ ÃÉÈ Â¦Â̦ÏÔÅË Linux ÆÕÎËæÏÎÕ×ÁÔÉ ÎÅ ÂÕÄÅ.
+ôÁËÏÖ ÐÁËÅÔ Í¦ÓÔÉÔØ Ð¦ÄÔÒÉÍËÕ ÎÁæÏÎÁÌØÎÉÈ ÍÏ× (locale) ÔÁ ÂÁÚÉ ÄÁÎÎÉÈ
+ÞÁÓÏ×ÉÈ ÚÏÎ (timezone databases).
+
 %package devel
 Summary:       Additional libraries required to compile
 Summary(de):   Weitere Libraries zum Kompilieren
 Summary(fr):   Librairies supplémentaires nécessaires à la compilation.
 Summary(pl):   Dodatkowe biblioteki wymagane podczas kompilacji
+Summary(ru):   äÏÐÏÌÎÉÔÅÌØÎÙÅ ÂÉÂÌÉÏÔÅËÉ, ÎÅÏÂÈÏÄÉÍÙÅ ÄÌÑ ËÏÍÐÉÌÑÃÉÉ
 Summary(tr):   Geliþtirme için gerekli diðer kitaplýklar
+Summary(uk):   äÏÄÁÔËÏצ ¦Â̦ÏÔÅËÉ, ÐÏÔÒ¦ÂΦ ÄÌÑ ËÏÍЦÌÑæ§
 Group:         Development/Libraries
 Group(cs):     Vývojové prostøedky/Knihovny
 Group(da):     Udvikling/Biblioteker
@@ -167,14 +196,28 @@ korzystaj
 nag³ówkowe oraz pliki objektowe, niezbêdne do kompilacji programów
 wykonywalnych i innych bibliotek.
 
+%description devel -l ru
+äÌÑ ÒÁÚÒÁÂÏÔËÉ ÐÒÏÇÒÁÍÍ, ÉÓÐÏÌØÚÕÀÝÉÈ ÓÔÁÎÄÁÒÔÎÙÅ ÂÉÂÌÉÏÔÅËÉ C (Á
+ÐÒÁËÔÉÞÅÓËÉ ×ÓÅ ÐÒÏÇÒÁÍÍÙ ÉÈ ÉÓÐÏÌØÚÕÀÔ), ÓÉÓÔÅÍÅ îåïâèïäéíù ÈÅÄÅÒÙ É
+ÏÂßÅËÔÎÙÅ ÆÁÊÌÙ, ÓÏÄÅÒÖÁÝÉÅÓÑ × ÜÔÏÍ ÐÁËÅÔÅ, ÞÔÏÂÙ ÓÏÚÄÁ×ÁÔØ
+ÉÓÐÏÌÎÑÅÍÙÅ ÆÁÊÌÙ.
+
 %description devel -l tr
 C kitaplýðýný kullanan (ki hemen hemen hepsi kullanýyor) programlar
 geliþtirmek için gereken standart baþlýk dosyalarý ve statik
 kitaplýklar.
 
+%description devel -l uk
+äÌÑ ÒÏÚÒÏÂËÉ ÐÒÏÇÒÁÍ, ÝÏ ×ÉËÏÒÉÓÔÏ×ÕÀÔØ ÓÔÁÎÄÁÒÔΦ ¦Â̦ÏÔÅËÉ C
+(ÐÒÁËÔÉÞÎÏ ×Ó¦ ÐÒÏÇÒÁÍÉ §È ×ÉËÏÒÉÓÔÏ×ÕÀÔØ), ÓÉÓÔÅͦ îåïâè¶äî¶ ÈÅÄÅÒÉ
+ÔÁ ÏÂ'¤ËÔΦ ÆÁÊÌÉ, ÝÏ Í¦ÓÔÑÔØÓÑ × ÃØÏÍÕ ÐÁËÅÔ¦, ÃÏ ÓÔ×ÏÒÀ×ÁÔÉ
+×ÉËÏÎÕ×ÁΦ ÆÁÊÌÉ.
+
 %package -n nscd
 Summary:       Name Service Caching Daemon
 Summary(pl):   Demon zapamiêtuj±cy odpowiedzi serwisów nazw
+Summary(ru):   ëÜÛÉÒÕÀÝÉÊ ÄÅÍÏÎ ÓÅÒ×ÉÓÏ× ÉÍÅÎ
+Summary(uk):   ëÅÛÕÀÞÉÊ ÄÅÍÏÎ ÓÅ×¦Ó¦× ¦ÍÅÎ
 Group:         Networking/Daemons
 Group(cs):     Sí»ové/Démoni
 Group(da):     Netværks/Dæmoner
@@ -207,6 +250,15 @@ drastycznie poprawi
 u¿ywanie nscd z j±drami serii 2.0.x z powodu b³êdów po stronie j±dra w
 obs³udze w±tków.
 
+%description -n nscd -l ru
+nscd ËÜÛÉÒÕÅÔ ÒÅÚÕÌØÔÁÔÙ ÚÁÐÒÏÓÏ× Ë ÓÅÒ×ÉÓÁÍ ÉÍÅÎ; ÜÔÏ ÍÏÖÅÔ ÒÅÚËÏ
+Õ×ÅÌÉÞÉÔØ ÐÒÏÉÚ×ÏÄÉÔÅÌØÎÏÓÔØ ÒÁÂÏÔÙ Ó NIS+ É, ÔÁËÖÅ, ÍÏÖÅÔ ÐÏÍÏÞØ Ó
+DNS.
+
+%description -n nscd -l uk
+nscd ËÅÛÕ¤ ÒÅÚÕÌØÔÁÔÉ ÚÁÐÒÏÓ¦× ÄÏ ÓÅÒ×¦Ó¦× ¦ÍÅÎ; ÃÅ ÍÏÖÅ ÓÉÌØÎÏ
+Ú¦ÌØÛÉÔÉ Û×ÉÄ˦ÓÔØ ÒÏÂÏÔÉ Ú NIS+ ¦, ÔÁËÏÖ, ÍÏÖÅ ÄÏÐÏÍÏÇÔÉ Ú DNS.
+
 %package -n localedb-src
 Summary:       locale database source code
 Summary(pl):   Kod ¼ród³owy bazy locale
@@ -280,6 +332,8 @@ umo
 %package static
 Summary:       Static libraries
 Summary(pl):   Biblioteki statyczne
+Summary(ru):   óÔÁÔÉÞÅÓËÉÅ ÂÉÂÌÉÏÔÅËÉ glibc
+Summary(uk):   óÔÁÔÉÞΦ ¦Â̦ÏÔÅËÉ glibc
 Group:         Development/Libraries
 Group(cs):     Vývojové prostøedky/Knihovny
 Group(da):     Udvikling/Biblioteker
@@ -305,12 +359,22 @@ GNU libc static libraries.
 %description static -l pl
 Biblioteki statyczne GNU libc.
 
+%description static -l ru
+üÔÏ ÏÔÄÅÌØÎÙÊ ÐÁËÅÔ ÓÏ ÓÔÁÔÉÞÅÓËÉÍÉ ÂÉÂÌÉÏÔÅËÁÍÉ, ËÏÔÏÒÙÅ ÂÏÌØÛÅ ÎÅ
+×ÈÏÄÑÔ × glibc-devel.
+
+%description static -l uk
+ãÅ ÏËÒÅÍÉÊ ÐÁËÅÔ Ú¦ ÓÔÁÔÉÞÎÉÍÉ Â¦Â̦ÏÔÅËÁÍÉ, ÝÏ Â¦ÌØÛÅ ÎÅ ×ÈÏÄÑÔØ ×
+ÓËÌÁÄ glibc-devel.
+
 %package profile
 Summary:       glibc with profiling support
 Summary(de):   glibc mit Profil-Unterstützung
 Summary(fr):   glibc avec support pour profiling
 Summary(pl):   glibc ze wsparciem dla profilowania
+Summary(ru):   GNU libc Ó ÐÏÄÄÅÒÖËÏÊ ÐÒÏÆÁÊÌÅÒÁ
 Summary(tr):   Ölçüm desteði olan glibc
+Summary(uk):   GNU libc Ú Ð¦ÄÔÒÉÍËÏÀ ÐÒÏÆÁÊÌÅÒÁ
 Group:         Development/Libraries/Libc
 Group(cs):     Vývojové prostøedky/Knihovny/Libc
 Group(da):     Udvikling/Biblioteker/Libc
@@ -345,10 +409,24 @@ Programy profilowane za pomoc
 zamiast standardowych bibliotek C, aby gprof móg³ odpowiednio je
 wyprofilowaæ.
 
+%description profile -l uk
+ëÏÌÉ ÐÒÏÇÒÁÍÉ ÄÏÓ̦ÄÖÕÀÔØÓÑ ÐÒÏÆÁÊÌÅÒÏÍ gprof, ×ÏÎÉ ÐÏ×ÉÎΦ
+×ÉËÏÒÉÓÔÏ×Õ×ÁÔÉ ÚÁͦÓÔØ ÓÔÁÎÄÁÒÔÎÉÈ Â¦Â̦ÏÔÅË Â¦Â̦ÏÔÅËÉ, ÝÏ Í¦ÓÔÑÔØÓÑ
+× ÃØÏÍÕ ÐÁËÅÔ¦. ðÒÉ ×ÉËÏÒÉÓÔÁÎΦ ÓÔÁÎÄÁÒÔÎÉÈ Â¦Â̦ÏÔÅË gprof ÚÁͦÓÔØ
+ÒÅÁÌØÎÉÈ ÒÅÚÕÌØÔÁÔ¦× ÂÕÄÅ ÐÏËÁÚÕ×ÁÔÉ Ã¦ÎÉ ÎÁ ÐÁÐÁÊÀ × çÏÎÏÌÕÌÕ ×
+ÐÏÚÁÍÉÎÕÌÏÍÕ ÒÏæ...
+
 %description profile -l tr
 gprof kullanýlarak ölçülen programlar standart C kitaplýðý yerine bu
 kitaplýðý kullanmak zorundadýrlar.
 
+%description profile -l ru
+ëÏÇÄÁ ÐÒÏÇÒÁÍÍÙ ÉÓÓÌÅÄÕÀÔÓÑ ÐÒÏÆÁÊÌÅÒÏÍ gprof, ÏÎÉ ÄÏÌÖÎÙ
+ÉÓÐÏÌØÚÏ×ÁÔØ, ×ÍÅÓÔÏ ÓÔÁÎÄÁÒÔÎÙÈ ÂÉÂÌÉÏÔÅË, ÂÉÂÌÉÏÔÅËÉ, ×ËÌÀÞÅÎÎÙÅ ×
+ÜÔÏÔ ÐÁËÅÔ. ðÒÉ ÉÓÐÏÌØÚÏ×ÁÎÉÉ ÓÔÁÎÄÁÒÔÎÙÈ ÂÉÂÌÉÏÔÅË gprof ×ÍÅÓÔÏ
+ÒÅÁÌØÎÙÈ ÒÅÚÕÌØÔÁÔÏ× ÂÕÄÅÔ ÐÏËÁÚÙ×ÁÔØ ÃÅÎÙ ÎÁ ÐÁÐÁÊÀ × çÏÎÏÌÕÌÕ ×
+ÐÏÚÁÐÒÏÛÌÏÍ ÇÏÄÕ...
+
 %package pic
 Summary:       glibc PIC archive
 Summary(pl):   archiwum PIC glibc
@@ -388,7 +466,7 @@ Summary(pl):        Stary modu
 Group:         Base
 Group(cs):     Základ
 Group(da):     Basal
-Group(de):     Basis
+Group(de):     Grundsätzlich
 Group(es):     Base
 Group(fr):     Base
 Group(is):     Grunnforrit
@@ -416,7 +494,7 @@ Summary(pl):        Modu
 Group:         Base
 Group(cs):     Základ
 Group(da):     Basal
-Group(de):     Basis
+Group(de):     Grundsätzlich
 Group(es):     Base
 Group(fr):     Base
 Group(is):     Grunnforrit
@@ -444,7 +522,7 @@ Summary(pl):        Modu
 Group:         Base
 Group(cs):     Základ
 Group(da):     Basal
-Group(de):     Basis
+Group(de):     Grundsätzlich
 Group(es):     Base
 Group(fr):     Base
 Group(is):     Grunnforrit
@@ -472,7 +550,7 @@ Summary(pl):        Modu
 Group:         Base
 Group(cs):     Základ
 Group(da):     Basal
-Group(de):     Basis
+Group(de):     Grundsätzlich
 Group(es):     Base
 Group(fr):     Base
 Group(is):     Grunnforrit
@@ -500,7 +578,7 @@ Summary(pl):        Modu
 Group:         Base
 Group(cs):     Základ
 Group(da):     Basal
-Group(de):     Basis
+Group(de):     Grundsätzlich
 Group(es):     Base
 Group(fr):     Base
 Group(is):     Grunnforrit
@@ -528,7 +606,7 @@ Summary(pl):        Modu
 Group:         Base
 Group(cs):     Základ
 Group(da):     Basal
-Group(de):     Basis
+Group(de):     Grundsätzlich
 Group(es):     Base
 Group(fr):     Base
 Group(is):     Grunnforrit
@@ -595,8 +673,8 @@ Zabawka.
 %patch10 -p1
 %patch11 -p1
 %patch12 -p1
-%patch13 -p1
-%patch14 -p1
+
+chmod +x scripts/cpp
 
 %build
 LDFLAGS=" " ; export LDFLAGS