This commit was manufactured by cvs2git to create branch 'GLIBC_2_2_5'.

[packages/glibc.git] / glibc.spec

diff --git a/glibc.spec b/glibc.spec
index 128db1107ff11ecdf239ea658e86f29e0209153b..7977e42e3d590873843b7690923318d3231a3761 100644 (file)
--- a/glibc.spec
+++ b/glibc.spec
@@ -1,12 +1,17 @@
-%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(tr):   GNU libc
 Name:          glibc
-Version:       2.2.4
-Release:       12
+Version:       2.2.5
+Release:       1
 Epoch:         6
 License:       LGPL
 Group:         Libraries
@@ -17,8 +22,8 @@ Group(pl):    Biblioteki
 Group(pt_BR):  Bibliotecas
 Group(ru):     âÉÂÌÉÏÔÅËÉ
 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
@@ -35,10 +40,7 @@ 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
 URL:           http://www.gnu.org/software/libc/
 BuildRequires: gd-devel >= 2.0.1
 BuildRequires: gettext-devel >= 0.10.36
@@ -413,9 +415,8 @@ Zabawka.
 %patch9 -p1
 %patch10 -p1
 %patch11 -p1
-%patch12 -p1
-%patch13 -p1
-%patch14 -p1
+
+chmod +x scripts/cpp
 
 %build
 LDFLAGS=" " ; export LDFLAGS