From 34d510b5deb4228d04588f7b8e5787126dd604c0 Mon Sep 17 00:00:00 2001 From: Florian Weimer Date: Thu, 14 Apr 2016 10:00:03 +0200 Subject: [PATCH] Auto-sync with upstream master This removes the type union wait from the installed headers. Update the SUPPORTED file with upstream changes --- .gitignore | 1 + SUPPORTED | 4 ++-- glibc.spec | 8 ++++++-- sources | 2 +- 4 files changed, 10 insertions(+), 5 deletions(-) create mode 100644 .gitignore diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..6e809b6 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +/glibc-2.23-190-g8a727af.tar.gz diff --git a/SUPPORTED b/SUPPORTED index 8319565..2145654 100644 --- a/SUPPORTED +++ b/SUPPORTED @@ -108,6 +108,8 @@ de_CH/ISO-8859-1 \ de_DE.UTF-8/UTF-8 \ de_DE/ISO-8859-1 \ de_DE@euro/ISO-8859-15 \ +de_IT.UTF-8/UTF-8 \ +de_IT/ISO-8859-1 \ de_LU.UTF-8/UTF-8 \ de_LU/ISO-8859-1 \ de_LU@euro/ISO-8859-15 \ @@ -266,8 +268,6 @@ it_IT.UTF-8/UTF-8 \ it_IT/ISO-8859-1 \ it_IT@euro/ISO-8859-15 \ iu_CA/UTF-8 \ -iw_IL.UTF-8/UTF-8 \ -iw_IL/ISO-8859-8 \ ja_JP.EUC-JP/EUC-JP \ ja_JP.UTF-8/UTF-8 \ ka_GE.UTF-8/UTF-8 \ diff --git a/glibc.spec b/glibc.spec index 847c8e8..b6f667c 100644 --- a/glibc.spec +++ b/glibc.spec @@ -1,6 +1,6 @@ -%define glibcsrcdir glibc-2.23-162-g25dba0a +%define glibcsrcdir glibc-2.23-190-g8a727af %define glibcversion 2.23.90 -%define glibcrelease 8%{?dist} +%define glibcrelease 9%{?dist} # Pre-release tarballs are pulled in from git using a command that is # effectively: # @@ -2092,6 +2092,10 @@ rm -f *.filelist* %endif %changelog +* Thu Apr 14 2016 Florian Weimer - 2.23.90-9 +- Auto-sync with upstream master. Removes type union wait. +- Update SUPPORTED locales file. + * Fri Apr 08 2016 Florian Weimer - 2.23.90-8 - Auto-sync with upstream master. diff --git a/sources b/sources index 4006c6d..facb322 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -2721af2996ddd7d82fdcfdd91fb21e6c glibc-2.23-162-g25dba0a.tar.gz +9b77ae9f8de0c59ed40f9c4fae0106b2 glibc-2.23-190-g8a727af.tar.gz