From ba7912605b178508ba88229fb87eacfbff8a6da1 Mon Sep 17 00:00:00 2001
From: Florian Weimer <fweimer@redhat.com>
Date: Feb 19 2016 20:46:21 +0000
Subject: Resolves: #1114591


Remove stray newline from Serbian locales.

---

diff --git a/glibc-rh1114591.patch b/glibc-rh1114591.patch
new file mode 100644
index 0000000..73e6bc4
--- /dev/null
+++ b/glibc-rh1114591.patch
@@ -0,0 +1,47 @@
+Upstream patch:
+
+commit ff889b196575c2fbf6aa7130abb1ec862714ea4e
+Author: Florian Weimer <fweimer@redhat.com>
+Date:   Fri Feb 19 14:21:34 2016 +0100
+
+    Remove trailing newline from date_fmt in Serbian locales [BZ #19581]
+
+diff --git a/localedata/locales/sr_ME b/localedata/locales/sr_ME
+index 4f243dc..dd68df8 100644
+--- a/localedata/locales/sr_ME
++++ b/localedata/locales/sr_ME
+@@ -119,7 +119,7 @@ am_pm   "";""
+ t_fmt_ampm "<U0025><U0054>"
+ date_fmt  "<U0025><U0061><U002c><U0020><U0025><U0065><U002E><U0020>/
+ <U0025><U0062><U0020><U0025><U0059><U002E><U0020><U0020><U0025><U0048>/
+-<U003A><U0025><U004D><U003A><U0025><U0053><U0020><U0025><U005A><U000A>"
++<U003A><U0025><U004D><U003A><U0025><U0053><U0020><U0025><U005A>"
+ week    7;19971130;4
+ first_weekday 2
+ first_workday 2
+diff --git a/localedata/locales/sr_RS b/localedata/locales/sr_RS
+index 2ae085b..ffea86f 100644
+--- a/localedata/locales/sr_RS
++++ b/localedata/locales/sr_RS
+@@ -300,7 +300,7 @@ am_pm   "";""
+ t_fmt_ampm "<U0025><U0054>"
+ date_fmt  "<U0025><U0061><U002C><U0020><U0025><U0065><U002E><U0020>/
+ <U0025><U0062><U0020><U0025><U0059><U002E><U0020><U0020><U0025><U0048>/
+-<U003A><U0025><U004D><U003A><U0025><U0053><U0020><U0025><U005A><U000A>"
++<U003A><U0025><U004D><U003A><U0025><U0053><U0020><U0025><U005A>"
+ week    7;19971130;4
+ first_weekday 2
+ first_workday 2
+diff --git a/localedata/locales/sr_RS@latin b/localedata/locales/sr_RS@latin
+index da6628b..fd10ea6 100644
+--- a/localedata/locales/sr_RS@latin
++++ b/localedata/locales/sr_RS@latin
+@@ -120,7 +120,7 @@ am_pm   "";""
+ t_fmt_ampm "<U0025><U0054>"
+ date_fmt  "<U0025><U0061><U002c><U0020><U0025><U0065><U002E><U0020>/
+ <U0025><U0062><U0020><U0025><U0059><U002E><U0020><U0020><U0025><U0048>/
+-<U003A><U0025><U004D><U003A><U0025><U0053><U0020><U0025><U005A><U000A>"
++<U003A><U0025><U004D><U003A><U0025><U0053><U0020><U0025><U005A>"
+ week    7;19971130;4
+ first_weekday 2
+ first_workday 2
diff --git a/glibc.spec b/glibc.spec
index 6b3b8bf..aae1a86 100644
--- a/glibc.spec
+++ b/glibc.spec
@@ -1,6 +1,6 @@
 %define glibcsrcdir  glibc-2.22-719-g1233be7
 %define glibcversion 2.22.90
-%define glibcrelease 36%{?dist}
+%define glibcrelease 37%{?dist}
 # Pre-release tarballs are pulled in from git using a command that is
 # effectively:
 #
@@ -301,6 +301,9 @@ Patch2099: glibc-rh1252570.patch
 # CVE-2015-7547
 Patch2100: glibc-CVE-2015-7547.patch
 
+# Upstream BZ 19581
+Patch2101: glibc-rh1114591.patch
+
 ##############################################################################
 #
 # Benchmark comparison patches.
@@ -697,6 +700,7 @@ cat /proc/meminfo
 %patch2037 -p1
 %patch2099 -p1
 %patch2100 -p1
+%patch2101 -p1
 
 ##############################################################################
 # %%prep - Additional prep required...
@@ -1963,6 +1967,9 @@ rm -f *.filelist*
 %endif
 
 %changelog
+* Fri Feb 19 2016 Florian Weimer <fweimer@redhat.com> - 2.22.90-37
+- Remove stray newline from Serbian locales (#1114591).
+
 * Tue Feb 16 2016 CArlos O'Donell <carlos@redhat.com> - 2.22.90-36
 - Fix CVE-2015-7547: getaddrinfo() stack-based buffer overflow (#1308943).