- disable sr_RS.ISO-8859-5 locale due to incompatible LC_COLLATE definition; enable...

diff --git a/glibc-morelocales.patch b/glibc-morelocales.patch
index ab72ce441fa333563f9073179440cf8b474fda1b..69d44b67fe1baa0946104463a45cab45e7ee7bbf 100644 (file)
--- a/glibc-morelocales.patch
+++ b/glibc-morelocales.patch
@@ -3393,17 +3393,17 @@ diff -urN glibc-2.6.org/localedata/locales/sw_UG glibc-2.6/localedata/locales/sw
  sq_AL.UTF-8/UTF-8 \
  sq_AL/ISO-8859-1 \
  sq_MK/UTF-8 \
-+sr_BA@ijekavian.ISO-8859-5/ISO-8859-5 \
++sr_BA.ISO-8859-5@ijekavian/ISO-8859-5 \
 +sr_BA@ijekavian/UTF-8 \
-+sr_BA@ijekavianlatin.ISO-8859-2/ISO-8859-2 \
++sr_BA.ISO-8859-2@ijekavianlatin/ISO-8859-2 \
 +sr_BA@ijekavianlatin/UTF-8 \
 +sr_ME.ISO-8859-5/ISO-8859-5 \
  sr_ME/UTF-8 \
 +sr_ME@latin.ISO-8859-16/ISO-8859-16 \
 +sr_ME@latin/UTF-8 \
++$(shell true currently broken: sr_RS.ISO-8859-5/ISO-8859-5) \
  sr_RS/UTF-8 \
 +sr_RS.ISO-8859-2@latin/ISO-8859-2 \
-+sr_RS.ISO-8859-5/ISO-8859-5 \
  sr_RS@latin/UTF-8 \
  ss_ZA/UTF-8 \
  st_ZA.UTF-8/UTF-8 \

diff --git a/glibc.spec b/glibc.spec
index 225d5428fd2fa95b5b72147d3ad5083d9b6b94cd..f8355f0f64f74e3d058af417ef6bea3e1ba11189 100644 (file)
--- a/glibc.spec
+++ b/glibc.spec
@@ -968,10 +968,8 @@ exit 1
 %patch14 -p0
 %patch15 -p1
 %patch16 -p1
-# ENABLE WHEN "[error] circular dependencies between locale definitions" is fixed
-#%patch17 -p1
-# FIXME
-#%patch18 -p1
+%patch17 -p1
+%patch18 -p1
 %patch19 -p1
 
 %patch23 -p0