Merge branch 'master' of ssh://pkgs.fedoraproject.org/glibc

Conflicts:
	glibc.spec

.gitignore

@@ -19,3 +19,6 @@ glibc-2.14-394-g8f3b1ff
 /glibc-2.15.90-4d17e683-fedora.tar.gz
 /glibc-2.15.90-4d17e683.tar.gz
 /glibc-ports-2.15.90-0387d093.tar.gz
+/glibc-ports-2.15.90-36d173fb.tar.gz
+/glibc-2.15.90-edf2933a.tar.gz
+/glibc-2.15.90-edf2933a-fedora.tar.gz

glibc.spec

@@ -1,6 +1,6 @@
-%define glibcsrcdir glibc-2.15.90-4d17e683
+%define glibcsrcdir glibc-2.15.90-edf2933a
 %define glibcversion 2.15.90
-%define glibcportsdir glibc-ports-2.15.90-0387d093
+%define glibcportsdir glibc-ports-2.15.90-36d173fb
 ### glibc.spec.in follows:
 %define run_glibc_tests 1
 %define auxarches athlon alphaev6
@@ -28,7 +28,7 @@
 Summary: The GNU libc libraries
 Name: glibc
 Version: %{glibcversion}
-Release: 7%{?dist}
+Release: 8%{?dist}
 # GPLv2+ is used in a bunch of programs, LGPLv2+ is used for libraries.
 # Things that are linked directly into dynamically linked programs
 # and shared libraries (e.g. crt files, lib*_nonshared.a) have an additional
@@ -1303,12 +1303,16 @@ rm -f *.filelist*
 %endif
 
 %changelog
-* Fri Jun  1 2012 Patsy Franklin <patsy@redhat.com> - 2.15.90-7
+* Fri Jun  1 2012 Patsy Franklin <patsy@redhat.com> - 2.15.90-8
   - Fix iconv() segfault when the invalid multibyte character 0xffff is input when 
     converting from IBM930 (823905)
 
+* Fri Jun 1 2012 Jeff Law <law@redhat.com> - 2.15.90-7
+  - Resync with upstream sources.  (#827040)
+
 * Thu May 31 2012 Patsy Franklin <patsy@redhat.com> - 2.15.90-6
-  - Fix fnmatch() when '*' wildcard is applied on a file name containing multibyte chars. (#819430)
+  - Fix fnmatch() when '*' wildcard is applied on a file name containing
+  multibyte chars. (#819430)
 
 * Wed May 30 2012  Jeff Law <law@redhat.com> - 2.15.90-5
   - Resync with upstream sources.

sources

@@ -1,3 +1,2 @@
-14a90b1f2ad381de235eae6550413f9b  glibc-2.15.90-4d17e683-fedora.tar.gz
-9ed9cd006644f0484e467523882ddafc  glibc-2.15.90-4d17e683.tar.gz
-22f9acb2a86fc4bce023458c5a16c9e0  glibc-ports-2.15.90-0387d093.tar.gz
+4ce07f4bf5baca2392ba490a9cead9ee  glibc-2.15.90-edf2933a.tar.gz
+783aa8331edb3014c05fad6858123cdb  glibc-2.15.90-edf2933a-fedora.tar.gz