Merge branch 'master' into f21

Conflicts:
	glibc.spec
This commit is contained in:
Siddhesh Poyarekar 2014-07-30 13:39:20 +05:30
commit b9d3cdc0e8
2 changed files with 12 additions and 3 deletions

View File

@ -1,6 +1,6 @@
%define glibcsrcdir glibc-2.19-776-gf4c4021
%define glibcsrcdir glibc-2.19-836-gcc5fb30
%define glibcversion 2.19.90
%define glibcrelease 28%{?dist}
%define glibcrelease 31%{?dist}
# Pre-release tarballs are pulled in from git using a command that is
# effectively:
#
@ -1657,6 +1657,15 @@ rm -f *.filelist*
%endif
%changelog
* Mon Jul 28 2014 Siddhesh Poyarekar <siddhesh@redhat.com> - 2.19.90-31
- Auto-sync with upstream master.
* Wed Jul 23 2014 Siddhesh Poyarekar <siddhesh@redhat.com> - 2.19.90-30
- Undo last master sync to fix up rawhide.
* Tue Jul 15 2014 Siddhesh Poyarekar <siddhesh@redhat.com> - 2.19.90-29
- Auto-sync with upstream master.
* Sat Jul 12 2014 Tom Callaway <spot@fedoraproject.org> - 2.19.90-28
- fix license handling

View File

@ -1 +1 @@
06836d3d0b23aafa91e03bc8389ff5d3 glibc-2.19-776-gf4c4021.tar.gz
676de4542846772a2b03fdd9c2e4ace6 glibc-2.19-836-gcc5fb30.tar.gz