[packages/glibc] - disable sr_RS.ISO-8859-5 locale due to incompatible LC_COLLATE definition; enable morelocales and

[qboosh]

commit 8db99e585f590bb4860584146c12fb73a4e238fe
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Mon Feb 5 21:54:44 2018 +0100

    - disable sr_RS.ISO-8859-5 locale due to incompatible LC_COLLATE definition; enable morelocales and locale_fixes patches

 glibc-morelocales.patch | 6 +++---
 glibc.spec              | 6 ++----
 2 files changed, 5 insertions(+), 7 deletions(-)
---
diff --git a/glibc.spec b/glibc.spec
index 225d542..f8355f0 100644
--- 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
diff --git a/glibc-morelocales.patch b/glibc-morelocales.patch
index ab72ce4..69d44b6 100644
--- 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 at ijekavian.ISO-8859-5/ISO-8859-5 \
++sr_BA.ISO-8859-5 at ijekavian/ISO-8859-5 \
 +sr_BA at ijekavian/UTF-8 \
-+sr_BA at ijekavianlatin.ISO-8859-2/ISO-8859-2 \
++sr_BA.ISO-8859-2 at ijekavianlatin/ISO-8859-2 \
 +sr_BA at ijekavianlatin/UTF-8 \
 +sr_ME.ISO-8859-5/ISO-8859-5 \
  sr_ME/UTF-8 \
 +sr_ME at latin.ISO-8859-16/ISO-8859-16 \
 +sr_ME at latin/UTF-8 \
++$(shell true currently broken: sr_RS.ISO-8859-5/ISO-8859-5) \
  sr_RS/UTF-8 \
 +sr_RS.ISO-8859-2 at latin/ISO-8859-2 \
-+sr_RS.ISO-8859-5/ISO-8859-5 \
  sr_RS at latin/UTF-8 \
  ss_ZA/UTF-8 \
  st_ZA.UTF-8/UTF-8 \
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/glibc.git/commitdiff/8db99e585f590bb4860584146c12fb73a4e238fe