From 553bc461eb45835bbf6d2177323f09f73155aa4f Mon Sep 17 00:00:00 2001
From: Florian Weimer <fweimer@redhat.com>
Date: Fri, 19 Feb 2016 21:21:37 +0100
Subject: [PATCH] Resolves: #1114591

Remove stray newline from Serbian locales.
---
 glibc-rh1114591.patch | 47 +++++++++++++++++++++++++++++++++++++++++++
 glibc.spec            |  5 +++++
 2 files changed, 52 insertions(+)
 create mode 100644 glibc-rh1114591.patch

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 0e5dfb1..cd849b4 100644
--- a/glibc.spec
+++ b/glibc.spec
@@ -273,6 +273,9 @@ Patch2107: glibc-CVE-2015-7547.patch
 # Upstream BZ 19682
 Patch2108: glibc-rh1310168.patch
 
+# Upstream BZ 19581
+Patch2109: glibc-rh1114591.patch
+
 ##############################################################################
 # End of glibc patches.
 ##############################################################################
@@ -605,6 +608,7 @@ package or when debugging this package.
 %patch2035 -p1
 %patch2107 -p1
 %patch2108 -p1
+%patch2109 -p1
 %patch0050 -p1
 %patch0052 -p1
 %patch0053 -p1
@@ -1792,6 +1796,7 @@ rm -f *.filelist*
 %changelog
 * Fri Feb 19 2016 Florian Weimer <fweimer@redhat.com> - 2.21-12
 - Fix socket system call selection on s390x (#1310168).
+- Remove stray newline from Serbian locales (#1114591).
 
 * Tue Feb 16 2016 Florian Weimer <fweimer@redhat.com> - 2.21-11
 - CVE-2015-7547: Stack-based buffer overflow in getaddrinfo (#1308943).