SPECS (DEVEL): glibc.spec - up to 2.4 final

[arekm]

Author: arekm                        Date: Tue Mar  7 19:19:51 2006 GMT
Module: SPECS                         Tag: DEVEL
---- Log message:
- up to 2.4 final

---- Files affected:
SPECS:
   glibc.spec (1.590.2.32 -> 1.590.2.33) 

---- Diffs:

================================================================
Index: SPECS/glibc.spec
diff -u SPECS/glibc.spec:1.590.2.32 SPECS/glibc.spec:1.590.2.33
--- SPECS/glibc.spec:1.590.2.32	Tue Feb 28 00:25:24 2006
+++ SPECS/glibc.spec	Tue Mar  7 20:19:41 2006
@@ -16,7 +16,6 @@
 
 %define		llh_version	7:2.6.12.0-10
 
-%define		_snap	20060211T1753UTC
 Summary:	GNU libc
 Summary(de):	GNU libc
 Summary(es):	GNU libc
@@ -27,22 +26,22 @@
 Summary(tr):	GNU libc
 Summary(uk):	GNU libc ×ĹŇÓŚ§ 2.3
 Name:		glibc
-Version:	2.3.90
-Release:	0.%{_snap}.2
+Version:	2.4
+Release:	0.1
 Epoch:		6
 License:	LGPL
 Group:		Libraries
-#Source0:	ftp://sources.redhat.com/pub/glibc/releases/%{name}-%{version}.tar.bz2
-Source0:	libc-%{version}_%{_snap}.tar.bz2
-# Source0-md5:	6afa01a33ff3b4256dca422f1f6f3d91
-#Source1:	ftp://sources.redhat.com/pub/glibc/releases/%{name}-linuxthreads-%{version}.tar.bz2
+Source0:	ftp://sources.redhat.com/pub/glibc/releases/%{name}-%{version}.tar.bz2
+# Source0-md5:	7e9a88dcd41fbc53801dbe5bdacaf245
+Source1:	ftp://sources.redhat.com/pub/glibc/releases/%{name}-libidn-%{version}.tar.bz2
+# Source1-md5:	e2d892b40d654c523ab26a26b7dd86a1
 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:	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:	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
@@ -59,7 +58,6 @@
 
 Patch11:	%{name}-no_opt_override.patch
 Patch12:	%{name}-includes.patch
-Patch13:	%{name}-soinit-EH_FRAME.patch
 Patch14:	%{name}-sparc-errno_fix.patch
 
 Patch17:	%{name}-new-charsets.patch
@@ -79,6 +77,7 @@
 BuildRequires:	automake
 BuildRequires:	binutils >= 2:2.15.90.0.3
 BuildRequires:	gcc >= 5:3.4
+BuildRequires:	gawk
 BuildRequires:	gettext-devel >= 0.10.36
 %{?with_selinux:BuildRequires:	libselinux-devel >= 1.18}
 BuildRequires:	linux-libc-headers >= %{llh_version}
@@ -780,7 +779,8 @@
 http://sources.redhat.com/ml/libc-alpha/2000-12/msg00068.html
 
 %prep
-%setup -q -n libc
+%setup -q -a1
+ln -s glibc-libidn-%{version} libidn
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
@@ -794,7 +794,6 @@
 
 %patch11 -p1
 %patch12 -p1
-%patch13 -p1
 %patch14 -p0
 
 %patch17 -p1
@@ -819,13 +818,14 @@
 %{__autoconf}
 
 rm -rf builddir && install -d builddir && cd builddir
+AWK="gawk" \
 ../%configure \
 	--enable-kernel="2.6.0" \
 	--%{?with_omitfp:en}%{!?with_omitfp:dis}able-omitfp \
 	--with-headers=%{_includedir} \
 	--with%{!?with_selinux:out}-selinux \
 	--with-tls \
-        --enable-add-ons=nptl \
+        --enable-add-ons=nptl,libidn \
 	--enable-stackguard-randomization \
 	--enable-hidden-plt \
 	--enable-profile
@@ -881,6 +881,7 @@
 cd ..
 
 # a toy
+rm -f $RPM_BUILD_ROOT%{_bindir}/memusage*
 rm -f $RPM_BUILD_ROOT/%{_lib}/libmemusage.so
 
 mv -f $RPM_BUILD_ROOT/%{_lib}/libpcprofile.so	$RPM_BUILD_ROOT%{_libdir}
@@ -1377,6 +1378,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.590.2.33  2006/03/07 19:19:41  arekm
+- up to 2.4 final
+
 Revision 1.590.2.32  2006/02/27 23:25:24  glen
 - use service, adapterized
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/glibc.spec?r1=1.590.2.32&r2=1.590.2.33&f=u