From e653c3c00e8eaa7d428b84cadff7e2520ed8710e Mon Sep 17 00:00:00 2001 From: Tom Callaway Date: Sat, 12 Jul 2014 11:16:06 -0400 Subject: [PATCH 1/5] fix license handling --- glibc.spec | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/glibc.spec b/glibc.spec index b61731a..f226fc0 100644 --- a/glibc.spec +++ b/glibc.spec @@ -1,6 +1,6 @@ %define glibcsrcdir glibc-2.19-776-gf4c4021 %define glibcversion 2.19.90 -%define glibcrelease 27%{?dist} +%define glibcrelease 28%{?dist} # Pre-release tarballs are pulled in from git using a command that is # effectively: # @@ -1591,7 +1591,8 @@ rm -f *.filelist* %attr(0644,root,root) %verify(not md5 size mtime) %ghost %config(missingok,noreplace) /etc/ld.so.cache %attr(0644,root,root) %verify(not md5 size mtime) %ghost %config(missingok,noreplace) /etc/gai.conf %doc README NEWS INSTALL BUGS PROJECTS CONFORMANCE elf/rtld-debugger-interface.txt -%doc COPYING COPYING.LIB LICENSES +%{!?_licensedir:%global license %%doc} +%license COPYING COPYING.LIB LICENSES %doc hesiod/README.hesiod %if %{xenpackage} @@ -1656,6 +1657,9 @@ rm -f *.filelist* %endif %changelog +* Sat Jul 12 2014 Tom Callaway - 2.19.90-28 +- fix license handling + * Mon Jul 07 2014 Siddhesh Poyarekar - 2.19.90-27 - Auto-sync with upstream master. From c54d242628400ea5e18f26adbab26f9cb85bfb6e Mon Sep 17 00:00:00 2001 From: Siddhesh Poyarekar Date: Tue, 15 Jul 2014 22:13:48 +0530 Subject: [PATCH 2/5] Auto-sync with upstream master. --- glibc.spec | 7 +++++-- sources | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/glibc.spec b/glibc.spec index f226fc0..f8f9def 100644 --- a/glibc.spec +++ b/glibc.spec @@ -1,6 +1,6 @@ -%define glibcsrcdir glibc-2.19-776-gf4c4021 +%define glibcsrcdir glibc-2.19-815-gf2fef65 %define glibcversion 2.19.90 -%define glibcrelease 28%{?dist} +%define glibcrelease 29%{?dist} # Pre-release tarballs are pulled in from git using a command that is # effectively: # @@ -1657,6 +1657,9 @@ rm -f *.filelist* %endif %changelog +* Tue Jul 15 2014 Siddhesh Poyarekar - 2.19.90-29 +- Auto-sync with upstream master. + * Sat Jul 12 2014 Tom Callaway - 2.19.90-28 - fix license handling diff --git a/sources b/sources index c7a88ec..8b61590 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -06836d3d0b23aafa91e03bc8389ff5d3 glibc-2.19-776-gf4c4021.tar.gz +8a3ba99d9b3a9e221fdfa72b007b005d glibc-2.19-815-gf2fef65.tar.gz From 2ca89eabf6c5781e601e1067edb80e9361ba9c7e Mon Sep 17 00:00:00 2001 From: Siddhesh Poyarekar Date: Wed, 23 Jul 2014 14:02:10 +0530 Subject: [PATCH 3/5] Undo last master sync to fix up rawhide Fix up rawhide till we can figure out what the problem is with this build. --- glibc.spec | 7 +++++-- sources | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/glibc.spec b/glibc.spec index f8f9def..4cfdedf 100644 --- a/glibc.spec +++ b/glibc.spec @@ -1,6 +1,6 @@ -%define glibcsrcdir glibc-2.19-815-gf2fef65 +%define glibcsrcdir glibc-2.19-776-gf4c4021 %define glibcversion 2.19.90 -%define glibcrelease 29%{?dist} +%define glibcrelease 30%{?dist} # Pre-release tarballs are pulled in from git using a command that is # effectively: # @@ -1657,6 +1657,9 @@ rm -f *.filelist* %endif %changelog +* Thu Jul 23 2014 Siddhesh Poyarekar - 2.19.90-30 +- Undo last master sync to fix up rawhide. + * Tue Jul 15 2014 Siddhesh Poyarekar - 2.19.90-29 - Auto-sync with upstream master. diff --git a/sources b/sources index 8b61590..c7a88ec 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -8a3ba99d9b3a9e221fdfa72b007b005d glibc-2.19-815-gf2fef65.tar.gz +06836d3d0b23aafa91e03bc8389ff5d3 glibc-2.19-776-gf4c4021.tar.gz From 3cb7ba0de8b322ebaec22bce83db5f32481f05f2 Mon Sep 17 00:00:00 2001 From: Siddhesh Poyarekar Date: Wed, 23 Jul 2014 14:04:08 +0530 Subject: [PATCH 4/5] Today is Wednesday, not Thursday --- glibc.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/glibc.spec b/glibc.spec index 4cfdedf..76a92eb 100644 --- a/glibc.spec +++ b/glibc.spec @@ -1657,7 +1657,7 @@ rm -f *.filelist* %endif %changelog -* Thu Jul 23 2014 Siddhesh Poyarekar - 2.19.90-30 +* Wed Jul 23 2014 Siddhesh Poyarekar - 2.19.90-30 - Undo last master sync to fix up rawhide. * Tue Jul 15 2014 Siddhesh Poyarekar - 2.19.90-29 From d579c1af5bae7dd255b3f3f725fabe1dc7d2e061 Mon Sep 17 00:00:00 2001 From: Siddhesh Poyarekar Date: Tue, 29 Jul 2014 00:25:03 +0530 Subject: [PATCH 5/5] Auto-sync with upstream master --- glibc.spec | 7 +++++-- sources | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/glibc.spec b/glibc.spec index 76a92eb..2a79dda 100644 --- a/glibc.spec +++ b/glibc.spec @@ -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 30%{?dist} +%define glibcrelease 31%{?dist} # Pre-release tarballs are pulled in from git using a command that is # effectively: # @@ -1657,6 +1657,9 @@ rm -f *.filelist* %endif %changelog +* Mon Jul 28 2014 Siddhesh Poyarekar - 2.19.90-31 +- Auto-sync with upstream master. + * Wed Jul 23 2014 Siddhesh Poyarekar - 2.19.90-30 - Undo last master sync to fix up rawhide. diff --git a/sources b/sources index c7a88ec..e3545df 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -06836d3d0b23aafa91e03bc8389ff5d3 glibc-2.19-776-gf4c4021.tar.gz +676de4542846772a2b03fdd9c2e4ace6 glibc-2.19-836-gcc5fb30.tar.gz