[glibc/f22] Resolves BZ #1190454.

[Carlos O'Donell]

commit 210e27365c7fb0e298eeca706c7c3f2219085ae7
Author: Carlos O'Donell <carlos at systemhalted.org>
Date:   Tue Feb 17 22:31:02 2015 -0500

    Resolves BZ #1190454.
    
    - Change patch file to avoid rpm bug 1193603 and rebuild with new NVR
      (#1190454).

 glibc-swbz17949.patch |   36 ++++++++++++------------------------
 glibc.spec            |    6 +++++-
 2 files changed, 17 insertions(+), 25 deletions(-)
---
diff --git a/glibc-swbz17949.patch b/glibc-swbz17949.patch
index f4817c2..5c8f5f8 100644
--- a/glibc-swbz17949.patch
+++ b/glibc-swbz17949.patch
@@ -1,27 +1,15 @@
-BZ #17949.
-
-commit 132a1328eccd20621b77f7810eebbeec0a1af187
-Author: Evangelos Foutras <evangelos at foutrelis.com>
-Date:   Tue Feb 10 03:22:58 2015 +0000
-
-    Fix __memcpy_chk on non-SSE2 CPUs
-    
-    In commit 8b4416d, the 1: jump label in __mempcpy_chk was accidentally
-    moved.  This resulted in failures of mempcpy on CPU without SSE2.
-
-diff --git a/NEWS b/NEWS
-index 41bc551..d85e26f 100644
---- a/NEWS
-+++ b/NEWS
-@@ -9,7 +9,7 @@ Version 2.22
- 
- * The following bugs are resolved with this release:
- 
--  4719, 17912, 17932, 17944.
-+  4719, 17912, 17932, 17944, 17949.
- 
- Version 2.21
- 
+#
+# BZ #17949.
+#
+# commit 132a1328eccd20621b77f7810eebbeec0a1af187
+# Author: Evangelos Foutras <evangelos at foutrelis.com>
+# Date:   Tue Feb 10 03:22:58 2015 +0000
+#
+#    Fix __memcpy_chk on non-SSE2 CPUs
+#
+#    In commit 8b4416d, the 1: jump label in __mempcpy_chk was accidentally
+#    moved.  This resulted in failures of mempcpy on CPU without SSE2.
+#
 diff --git a/sysdeps/i386/i686/multiarch/mempcpy_chk.S b/sysdeps/i386/i686/multiarch/mempcpy_chk.S
 index 207b648..b6fa202 100644
 --- a/sysdeps/i386/i686/multiarch/mempcpy_chk.S
diff --git a/glibc.spec b/glibc.spec
index e8411d2..7a06fc0 100644
--- a/glibc.spec
+++ b/glibc.spec
@@ -1,6 +1,6 @@
 %define glibcsrcdir  glibc-2.21
 %define glibcversion 2.21
-%define glibcrelease 2%{?dist}
+%define glibcrelease 3%{?dist}
 # Pre-release tarballs are pulled in from git using a command that is
 # effectively:
 #
@@ -1754,6 +1754,10 @@ rm -f *.filelist*
 %endif
 
 %changelog
+* Tue Feb 17 2015 Carlos O'Donell <carlos at redhat.com> - 2.21-3
+- Change patch file to avoid rpm bug 1193603 and rebuild with new NVR
+  (#1190454).
+
 * Tue Feb 17 2015 Carlos O'Donell <carlos at redhat.com> - 2.21-2
 - Rebuild with new NVR.