From 1ffb3d6c4c1671dc3455cc3847ff1abea4dd191d Mon Sep 17 00:00:00 2001
From: Carlos O'Donell <carlos@systemhalted.org>
Date: Wed, 16 Mar 2016 02:38:44 -0400
Subject: [PATCH] glibc-2.23.90-6

- Use 'an' as language abbreviation for an_ES.
---
 .gitignore            |  1 -
 glibc-fix-an_ES.patch | 13 +++++++++++++
 glibc.spec            |  9 ++++++++-
 series                |  3 ++-
 4 files changed, 23 insertions(+), 3 deletions(-)
 delete mode 100644 .gitignore
 create mode 100644 glibc-fix-an_ES.patch

diff --git a/.gitignore b/.gitignore
deleted file mode 100644
index a55909f..0000000
--- a/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/glibc-2.23-69-gf5e753c8.tar.gz
diff --git a/glibc-fix-an_ES.patch b/glibc-fix-an_ES.patch
new file mode 100644
index 0000000..745fa3f
--- /dev/null
+++ b/glibc-fix-an_ES.patch
@@ -0,0 +1,13 @@
+Index: glibc-2.23-69-gf5e753c8/localedata/locales/an_ES
+===================================================================
+--- glibc-2.23-69-gf5e753c8.orig/localedata/locales/an_ES
++++ glibc-2.23-69-gf5e753c8/localedata/locales/an_ES
+@@ -134,7 +134,7 @@ postal_fmt    "<U0025><U0066><U0025><U00
+ country_ab2   "<U0045><U0053>"
+ country_ab3   "<U0045><U0053><U0050>"
+ country_num   724
+-lang_ab       "<U0041><U004E>"
++lang_ab       "<U0061><U006E>"
+ % E
+ country_car    "<U0045>"
+ % aragonés
diff --git a/glibc.spec b/glibc.spec
index 845b875..84398bd 100644
--- a/glibc.spec
+++ b/glibc.spec
@@ -1,6 +1,6 @@
 %define glibcsrcdir  glibc-2.23-69-gf5e753c8
 %define glibcversion 2.23.90
-%define glibcrelease 5%{?dist}
+%define glibcrelease 6%{?dist}
 # Pre-release tarballs are pulled in from git using a command that is
 # effectively:
 #
@@ -258,6 +258,9 @@ Patch0058: glibc-bug-regex-gcc5.patch
 # Add C.UTF-8 locale into /usr/lib/locale/
 Patch0059: glibc-c-utf8-locale.patch
 
+# Use "an" as language code.
+Patch0060: glibc-fix-an_ES.patch
+
 ##############################################################################
 #
 # Patches from upstream
@@ -793,6 +796,7 @@ cat /proc/meminfo
 %patch2036 -p1
 %patch2037 -p1
 %patch2099 -p1
+%patch0060 -p1
 
 ##############################################################################
 # %%prep - Additional prep required...
@@ -2092,6 +2096,9 @@ rm -f *.filelist*
 %endif
 
 %changelog
+* Wed Mar 16 2016 Carlos O'Donell <carlos@redhat.com> - 2.23.90-6
+- Use 'an' as language abbreviation for an_ES.
+
 * Mon Mar 07 2016 Carlos O'Donell <carlos@systemhalted.org> - 2.23.90-5
 - Auto-sync with upstream master.
 
diff --git a/series b/series
index 1810c7f..ae5129c 100644
--- a/series
+++ b/series
@@ -38,5 +38,6 @@ glibc-bug-regex-gcc5.patch -p1 --fuzz=0
 glibc-c-utf8-locale.patch -p1 --fuzz=0
 glibc-nsswitch-Add-group-merging-support.patch -p1 --fuzz=0
 glibc-gcc-PR69537.patch -p1 --fuzz=0
+glibc-rh1315108.patch -p1 --fuzz=0
 glibc-rh1252570.patch -p1 --fuzz=0
-glibc-rh1315108.patch -p1
+glibc-fix-an_ES.patch -p1 --fuzz=0