- rel 1

diff --git a/glibc-locale_fixes.patch b/glibc-locale_fixes.patch
index ae9adb0a9698b3436b52be33822c8d1ec1b0b875..495e97224fdb49e0807cd18ae3f2dfcc796f4b57 100644 (file)
--- a/glibc-locale_fixes.patch
+++ b/glibc-locale_fixes.patch
@@ -1070,19 +1070,9 @@ diff -uNr libc.orig/localedata/locales/en_ZW libc/localedata/locales/en_ZW
 diff -uNr libc.orig/localedata/locales/es_AR libc/localedata/locales/es_AR
 --- libc.orig/localedata/locales/es_AR 2003-12-07 14:00:21.000000000 +0100
 +++ libc/localedata/locales/es_AR      2004-11-10 02:36:38.000000000 +0100
-@@ -56,8 +56,7 @@
- END LC_CTYPE
- 
- LC_MESSAGES
--yesexpr "<U005E><U005B><U0073><U0053><U0079><U0059><U005D><U002E><U002A>"
--noexpr  "<U005E><U005B><U006E><U004E><U005D><U002E><U002A>"
-+copy "es_ES"
- END LC_MESSAGES
- 
- LC_MONETARY
-@@ -154,7 +153,14 @@
+@@ -153,7 +153,14 @@
  <U0020><U0025><U0068><U0020><U0025><U0065><U0020><U0025><U0072><U0025>/
- <U004E><U0025><U0025><U007A><U0020><U0025><U0054><U0025>/
+ <U004E><U0025><U007A><U0020><U0025><U0054><U0025>/
  <U004E><U0025><U0063><U0025><U004E>"
 +country_name  "<U0041><U0072><U0067><U0065><U006E><U0074><U0069><U006E><U0061>"
  country_ab2   "<U0041><U0052>"
@@ -1198,19 +1188,6 @@ diff -uNr libc.orig/localedata/locales/es_EC libc/localedata/locales/es_EC
 diff -uNr libc.orig/localedata/locales/es_ES libc/localedata/locales/es_ES
 --- libc.orig/localedata/locales/es_ES 2003-12-05 01:25:57.000000000 +0100
 +++ libc/localedata/locales/es_ES      2004-11-10 02:36:38.000000000 +0100
-@@ -2117,8 +2117,10 @@
- END LC_CTYPE
- 
- LC_MESSAGES
--yesexpr "<U005E><U005B><U0073><U0053><U0079><U0059><U005D><U002E><U002A>"
--noexpr  "<U005E><U005B><U006E><U004E><U005D><U002E><U002A>"
-+yesexpr "<U005E><U005B><U0053><U0073><U0059><U0079><U005D>"
-+noexpr  "<U005E><U005B><U004E><U006E><U005D>"
-+yesstr  "<U0073><U00ED>"
-+nostr   "<U006E><U006F>"
- END LC_MESSAGES
- 
- LC_MONETARY
 @@ -2214,7 +2216,14 @@
  <U0020><U0025><U0068><U0020><U0025><U0065><U0020><U0025><U0072><U0025>/
  <U004E><U0025><U0025><U007A><U0020><U0025><U0054><U0025>/
@@ -2474,14 +2451,14 @@ diff -uNr libc.orig/localedata/locales/nso_ZA libc/localedata/locales/nso_ZA
  END LC_MESSAGES
  
  LC_PAPER
-@@ -218,8 +220,7 @@
+@@ -228,8 +228,7 @@
  % "ZA"
  country_car   "<U005A><U0041>"
  
 -% FIXME define the following correctly
 -% country_isbn ""
 +country_isbn  0
-  
+ 
  % Language name in Northern Sotho - "Sesotho sa Leboa"
  lang_name "<U0053><U0065><U0073><U006F><U0074><U0068><U006F><U0020>/
 diff -uNr libc.orig/localedata/locales/oc_FR libc/localedata/locales/oc_FR
@@ -2932,24 +2909,6 @@ diff -uNr libc.orig/localedata/locales/sq_AL libc/localedata/locales/sq_AL
  
  % Language name in Sotho - "Sesotho"
  lang_name "<U0053><U0065><U0073><U006F><U0074><U0068><U006F>"
-diff -uNr libc.orig/localedata/locales/sv_FI libc/localedata/locales/sv_FI
---- libc.orig/localedata/locales/sv_FI 2003-12-05 01:26:00.000000000 +0100
-+++ libc/localedata/locales/sv_FI      2004-11-10 02:36:38.000000000 +0100
-@@ -133,7 +133,14 @@
- <U0020><U0025><U0068><U0020><U0025><U0065><U0020><U0025><U0072><U0025>/
- <U004E><U0025><U0025><U007A><U0020><U0025><U0054><U0025>/
- <U004E><U0025><U0063><U0025><U004E>"
-+country_name "<U0046><U0069><U006E><U006C><U0061><U006E><U0064>"
- country_ab2 "<U0046><U0049>"
- country_ab3 "<U0046><U0049><U004E>"
- country_num 246
-+country_car "<U0046><U0049><U004E>"
-+country_isbn "951,952"
-+lang_name   "<U0053><U0076><U0065><U006E><U0073><U006B><U0061>"
-+lang_ab     "<U0073><U0076>"
-+lang_term   "<U0073><U0077><U0065>"
-+lang_lib    "<U0073><U0077><U0065>"
- END LC_ADDRESS
 diff -uNr libc.orig/localedata/locales/sv_SE libc/localedata/locales/sv_SE
 --- libc.orig/localedata/locales/sv_SE 2003-12-05 01:26:00.000000000 +0100
 +++ libc/localedata/locales/sv_SE      2004-11-10 02:36:38.000000000 +0100

diff --git a/glibc.spec b/glibc.spec
index bf85a050eaea417f3016257935bf58d618f1040b..bf828cad0558860240c1e41ffae4f49056e10ee7 100644 (file)
--- a/glibc.spec
+++ b/glibc.spec
@@ -35,7 +35,7 @@ Summary(tr.UTF-8):    GNU libc
 Summary(uk.UTF-8):     GNU libc версії
 Name:          glibc
 Version:       %{core_version}
-Release:       0.1
+Release:       1
 Epoch:         6
 License:       LGPL v2.1+
 Group:         Libraries
@@ -952,8 +952,7 @@ exit 1
 %patch15 -p1
 %patch16 -p1
 %patch17 -p1
-# FIXME
-#%patch18 -p1
+%patch18 -p1
 %patch19 -p1
 %patch20 -p1
 %{?with_cross:%patch21 -p1}