- switched back to 2.2.4, 2.2.5 goes to devel...

[packages/glibc.git] / glibc.spec

diff --git a/glibc.spec b/glibc.spec
index a23f065da1283d623e381f67f294cec438a5eab3..128db1107ff11ecdf239ea658e86f29e0209153b 100644 (file)
--- a/glibc.spec
+++ b/glibc.spec
@@ -6,7 +6,8 @@ Summary(pl):    GNU libc
 Summary(tr):   GNU libc
 Name:          glibc
 Version:       2.2.4
-Release:       8
+Release:       12
+Epoch:         6
 License:       LGPL
 Group:         Libraries
 Group(de):     Libraries
@@ -35,12 +36,15 @@ 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
 URL:           http://www.gnu.org/software/libc/
 BuildRequires: gd-devel >= 2.0.1
 BuildRequires: gettext-devel >= 0.10.36
 BuildRequires: libpng-devel
 BuildRequires: perl
-BuildRequires: rpm-build >= 4.0-11
+BuildRequires: rpm-build >= 4.0.2-46
 BuildRequires: texinfo
 Provides:      ld.so.2
 Provides:      ldconfig
@@ -55,6 +59,8 @@ Conflicts:    kernel < %{min_kernel}
 Conflicts:     man-pages < 1.43
 Conflicts:     ld.so < 1.9.9-9
 
+%define                debugcflags     -O1 -g
+
 %description
 Contains the standard libraries that are used by multiple programs on
 the system. In order to save disk space and memory, as well as to ease
@@ -150,13 +156,13 @@ kitapl
 
 %package -n nscd
 Summary:       Name Service Caching Daemon
-Summary(pl):   Name Service Caching Daemon
 Group:         Networking/Daemons
 Group(de):     Netzwerkwesen/Server
 Group(pl):     Sieciowe/Serwery
 Prereq:                /sbin/chkconfig
 Prereq:                rc-scripts >= 0.2.0
 Requires:      %{name} = %{version}
+Requires(post):        fileutils
 
 %description -n nscd
 nscd caches name service lookups; it can dramatically improve
@@ -171,7 +177,7 @@ u
 ods³udze w±tków.
 
 %package -n localedb-src
-Summary:       Souce code locale database
+Summary:       locale database source code
 Summary(pl):   Kod ¼ród³owy bazy locale
 Group:         Daemons
 Group(de):     Server
@@ -181,15 +187,16 @@ Requires: %{name} = %{version}
 %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. glibc
-package contains standard set of locale binary database and You need
-this package if want build some non standard locale database.
+package contains standard set of locale binary database so you need
+this package only when you want to build some non-standard locale
+database.
 
 %description -n localedb-src -l pl
-Pakiet ten kod ¼ród³owy baz locale który jest potrzebny do zbudowania
-binarnej wersji baz locale potrzebnej do poprawnego wspierania ró¿nych
-jêzyków przez glibc. Pakiet glibc zawira binarn± wersjê standardowych
-baz locale i ten pakiet jest potrzebny tylko w sytuacji kiedy potrzeba
-wygenerowaæ jak±¶ niestandardow± bazê.
+Pakiet ten zawiera dane niezbêdne do zbudowania binarnych plików
+lokalizacyjnych, by móc wykorzystaæ mo¿liwo¶ci oferowane przez GNU
+libc. glibc zawiera standardowy zestaw binarnych baz lokalizacyjnych,
+w zwi±zku z czym ten pakiet jest potrzebny tylko w sytuacji budowania
+jakiej¶ niestandardowej bazy.
 
 %package -n iconv
 Summary:       Convert encoding of given files from one encoding to another
@@ -201,8 +208,8 @@ Requires:   %{name} = %{version}
 
 %description -n iconv
 Convert encoding of given files from one encoding to another. You need
-this package if You want to convert some documet from one encoding to
-another or if You have installed some programs which use Generic
+this package if you want to convert some documet from one encoding to
+another or if you have installed some programs which use Generic
 Character Set Conversion Interface.
 
 %description -n iconv -l pl
@@ -406,6 +413,9 @@ Zabawka.
 %patch9 -p1
 %patch10 -p1
 %patch11 -p1
+%patch12 -p1
+%patch13 -p1
+%patch14 -p1
 
 %build
 LDFLAGS=" " ; export LDFLAGS