SPECS: glibc.spec - merged from AC-branch

[ankry]

Author: ankry                        Date: Thu Nov 10 21:44:32 2005 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- merged from AC-branch

---- Files affected:
SPECS:
   glibc.spec (1.618 -> 1.619) 

---- Diffs:

================================================================
Index: SPECS/glibc.spec
diff -u SPECS/glibc.spec:1.618 SPECS/glibc.spec:1.619
--- SPECS/glibc.spec:1.618	Thu Nov 10 12:30:00 2005
+++ SPECS/glibc.spec	Thu Nov 10 22:44:27 2005
@@ -77,7 +77,7 @@
 Summary(uk):	GNU libc ×ĹŇÓŚ§ 2.3
 Name:		glibc
 Version:	2.3.6
-Release:	1.1
+Release:	2.1
 Epoch:		6
 License:	LGPL
 Group:		Libraries
@@ -127,6 +127,7 @@
 Patch27:	%{name}-sys-kd.patch
 Patch28:	%{name}-cross-gcc_eh.patch
 Patch29:	%{name}-pax_dl-execstack.patch
+Patch30:	%{name}-large_collate_tables.patch
 URL:		http://www.gnu.org/software/libc/
 BuildRequires:	audit-libs-devel
 BuildRequires:	autoconf
@@ -916,6 +917,7 @@
 %patch27 -p1
 %{?with_cross:%patch28 -p1}
 %{?with_pax:%patch29 -p1}
+%patch30 -p1
 
 chmod +x scripts/cpp
 
@@ -1179,7 +1181,6 @@
 # as (atk, gail)
 # az_IR (gtk+)
 # dv, kok, ps, sw (iso-codes)
-# fy (kde)
 # my (gaim)
 # tk, ug, yo (used by GNOME)
 #
@@ -1192,7 +1193,7 @@
 #   tr,zh_CN,zh_TW
 #
 for i in aa af am ang ar az bg bn br bs byn cy de_AT en en at boldquot en at quot \
-    en_AU en_CA en_US eo es_AR es_MX es_NI et eu fa fo ga gez gu gv he hi \
+    en_AU en_CA en_US eo es_AR es_MX es_NI et eu fa fo fy ga gez gu gv he hi \
     hsb hy ia id is it_CH iu ka kk kl kn ku kw ky leet lg li lo lt lv 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 at Latn sr at ije ss syr ta te tg th ti tig tl tlh tt uk ur uz \
@@ -1660,6 +1661,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.619  2005/11/10 21:44:27  ankry
+- merged from AC-branch
+
 Revision 1.618  2005/11/10 11:30:00  qboosh
 - BR: audit-libs-devel (for nscd)
 
================================================================

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