- update nls/locale patches

Changed files:
    glibc-missing-nls.patch -> 1.11
    glibc-new-charsets.patch -> 1.12
    glibc.spec -> 1.964

diff --git a/glibc-missing-nls.patch b/glibc-missing-nls.patch
index 0e05c5cbc4ac97ac271c5b6388c2e803c990eb20..e461a6372ecc650516e39c6a44041c68a75ced37 100644 (file)
--- a/glibc-missing-nls.patch
+++ b/glibc-missing-nls.patch
@@ -1,5 +1,13 @@
 --- glibc-2.3.1/sunrpc/rpc_main.c.orig Fri Nov  2 03:15:17 2001
 +++ glibc-2.3.1/sunrpc/rpc_main.c      Mon Nov 11 14:07:24 2002
+@@ -38,6 +38,7 @@
+ #include <stdio.h>
+ #include <string.h>
+ #include <unistd.h>
++#include <locale.h>
+ #include <libintl.h>
+ #include <ctype.h>
+ #include <sys/types.h>
 @@ -185,6 +185,9 @@
  {
    struct commandline cmd;

diff --git a/glibc-new-charsets.patch b/glibc-new-charsets.patch
index 13ee37e331a1cff3e1aa8228145d7733cdee8f02..bf8fdaf170eed06862d8c12170b313da28220ef7 100644 (file)
--- a/glibc-new-charsets.patch
+++ b/glibc-new-charsets.patch
@@ -10,16 +10,6 @@
           IBM1132 IBM1133 IBM1160 IBM1161 IBM1162 IBM1163 IBM1164       \
           IBM918 IBM1004 IBM1026 CP1125 CP1250 CP1251 CP1252 CP1253     \
           CP1254 CP1255 CP1256 CP1257 ISO-2022-JP MACINTOSH IEC_P27-1   \
-@@ -163,6 +166,9 @@
-             ibm922.c ibm922.h ibm1124.c ibm1124.h ibm1129.c ibm1129.h     \
-             ibm1132.c ibm1132.h ibm1133.c ibm1133.h ibm1162.c ibm1162.h   \
-             ibm1026.c ibm1047.c iec_p27-1.c inis.c inis-8.c viscii.c      \
-+            iscii-dev.c khmer-ns.c \
-+            mulelao-1.c tatar-cyr.c iso8859-7-euro.c \
-+            koi8-k.c koi8-c.c koi8-ru.c \
-             inis-cyrillic.c iso-2022-jp.c iso-2022-kr.c iso646.c          \
-             iso8859-1.c iso8859-2.c iso8859-3.c iso8859-4.c iso8859-5.c   \
-             iso8859-6.c iso8859-7.c iso8859-8.c iso8859-9.c iso8859-10.c  \
 @@ -228,7 +228,7 @@
                    ebcdic-dk-no-a ebcdic-es-s ebcdic-fi-se ebcdic-fi-se-a  \
                    ebcdic-fr ebcdic-it ebcdic-pt ebcdic-us \
@@ -34,7 +24,7 @@
                        ibm1026 cp1125 cp1250 cp1251 cp1252 cp1253 cp1254  \
                        cp1256 cp1257 ibm866 iso8859-5 iso8859-7 iso8859-8 \
 +                      iscii-dev khmer-ns mulelao-1 tatar-cyr \
-+                      koi8-k iso8859-7-euro \
++                      koi8-k koi8-ru iso8859-7-euro \
                        iso8859-10 macintosh iec_p27-1 asmo_449            \
                        csn_369103 cwi dec-mcs ecma-cyrillic gost_19768-74 \
                        greek-ccitt greek7 greek7-old inis inis-8          \

diff --git a/glibc.spec b/glibc.spec
index 89756cdae290fa74d8c3f70731aacf34ffddb048..e8c3f8e48bb4a8691eaecb06e9cc7c6152de29f9 100644 (file)
--- a/glibc.spec
+++ b/glibc.spec
@@ -923,8 +923,7 @@ mv %{name}-ports-%{ports_version} ports
 %patch6 -p1
 # OBSOLETE?
 #%patch7 -p1
-# NEEDS MISSING INCLUDES
-#%patch8 -p1
+%patch8 -p1
 %patch9 -p1
 %patch10 -p1
 # CHECK, POSSIBLY UPDATE
@@ -932,8 +931,7 @@ mv %{name}-ports-%{ports_version} ports
 # CHECK, LIKELY OBSOLETE
 #%patch12 -p1
 %patch14 -p0
-# UPDATE ME
-#%patch15 -p1
+%patch15 -p1
 %patch16 -p1
 %patch17 -p1
 %patch18 -p1
@@ -1706,7 +1704,7 @@ fi
 
 %files devel-doc
 %defattr(644,root,root,755)
-%doc documentation/* NOTES PROJECTS
+%doc documentation/* PROJECTS
 %{_infodir}/libc.info*
 
 %{_mandir}/man1/sprof.1*