From b2bf60e8255e0ae7bc74ebace04d9ea3f3ed2abe Mon Sep 17 00:00:00 2001 From: Florian Weimer Date: Tue, 2 Feb 2016 12:19:16 +0100 Subject: [PATCH] Auto-sync with upstream master. --- .gitignore | 1 + glibc.spec | 7 +++++-- sources | 2 +- sync-upstream.sh | 1 + 4 files changed, 8 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 35ec57d..d8f8d16 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ /glibc-2.22-709-g8a71d2e.tar.gz +/glibc-2.22-713-g5163b4b.tar.gz diff --git a/glibc.spec b/glibc.spec index 0eb0b57..d97f47a 100644 --- a/glibc.spec +++ b/glibc.spec @@ -1,6 +1,6 @@ -%define glibcsrcdir glibc-2.22-709-g8a71d2e +%define glibcsrcdir glibc-2.22-713-g5163b4b %define glibcversion 2.22.90 -%define glibcrelease 31%{?dist} +%define glibcrelease 32%{?dist} # Pre-release tarballs are pulled in from git using a command that is # effectively: # @@ -1943,6 +1943,9 @@ rm -f *.filelist* %endif %changelog +* Tue Feb 02 2016 Florian Weimer - 2.22.90-32 +- Auto-sync with upstream master. + * Thu Jan 28 2016 Florian Weimer - 2.22.90-31 - Add workaround for GCC PR69537. diff --git a/sources b/sources index 9eeba36..a96a8d3 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -0ff0913a81aeb866506d697d15554c80 glibc-2.22-709-g8a71d2e.tar.gz +5441ade6acb19c032dfecda08fc04863 glibc-2.22-713-g5163b4b.tar.gz diff --git a/sync-upstream.sh b/sync-upstream.sh index 3a792f7..765e682 100755 --- a/sync-upstream.sh +++ b/sync-upstream.sh @@ -92,6 +92,7 @@ rm -rf "$srcdir" echo "+ Source prep is clean, so we're good to go." fedpkg new-sources "$srcdir.tar.gz" git commit -a -m "Auto-sync with upstream $branch." +exit 0 fedpkg push fedpkg build echo "+ Done!"