diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..a55909f --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +/glibc-2.23-69-gf5e753c8.tar.gz diff --git a/glibc.spec b/glibc.spec index 072974d..845b875 100644 --- a/glibc.spec +++ b/glibc.spec @@ -1,6 +1,6 @@ -%define glibcsrcdir glibc-2.23-40-gde51ff8 +%define glibcsrcdir glibc-2.23-69-gf5e753c8 %define glibcversion 2.23.90 -%define glibcrelease 4%{?dist} +%define glibcrelease 5%{?dist} # Pre-release tarballs are pulled in from git using a command that is # effectively: # @@ -2092,6 +2092,9 @@ rm -f *.filelist* %endif %changelog +* Mon Mar 07 2016 Carlos O'Donell - 2.23.90-5 +- Auto-sync with upstream master. + * Sun Mar 6 2016 Florian Weimer - 2.23.90-4 - Remove extend_alloca (#1315108) diff --git a/sources b/sources index c43d307..a80a833 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -d1dab355e80e61297ed07d6b402cbbe1 glibc-2.23-40-gde51ff8.tar.gz +b01f358459ba0816cfa7adb2a3ae2426 glibc-2.23-69-gf5e753c8.tar.gz diff --git a/sync-upstream.sh b/sync-upstream.sh index 765e682..aeeac4b 100755 --- a/sync-upstream.sh +++ b/sync-upstream.sh @@ -23,6 +23,8 @@ set -e # We want to sync from master by default. Change this if you want to sync from # another branch. branch=master +# Avoid slashes in branch name. +branch_name=master # We can't do anything without an upstream repo if [ $# -ne 1 ]; then @@ -91,8 +93,13 @@ rm -f "$tmpfile" 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!" +if [ $branch == "master" ]; then + git commit -a -m "Auto-sync with upstream $branch." + fedpkg push + fedpkg build + echo "+ Done!" +else + echo "+ This is a non-development branch." + echo "+ Please review the results of the sync." + echo "+ Once reviewed you need to commit, push, and build." +fi