From 33560f7e4339b57baa4936b09526d4b21ce588b0 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Arkadiusz=20Mi=C5=9Bkiewicz?= <arekm@maven.pl>
Date: Fri, 1 Feb 2019 07:18:53 +0100
Subject: [PATCH] - up to 2.29

---
 branch.sh               |  4 ++--
 glibc-no-bash-nls.patch |  8 ++++----
 glibc.spec              | 12 +++++++-----
 3 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/branch.sh b/branch.sh
index 6ea64bc..5952755 100755
--- a/branch.sh
+++ b/branch.sh
@@ -2,8 +2,8 @@
 set -e
 url=git://sourceware.org/git/glibc.git
 package=glibc
-tag=glibc-2.28
-branch=release/2.28/master
+tag=glibc-2.29
+branch=release/2.29/master
 out=$package-git.patch
 repo=$package.git
 
diff --git a/glibc-no-bash-nls.patch b/glibc-no-bash-nls.patch
index c294ea1..4dc3d21 100644
--- a/glibc-no-bash-nls.patch
+++ b/glibc-no-bash-nls.patch
@@ -3,7 +3,7 @@
 @@ -1,4 +1,4 @@
 -#! @BASH@
 +#!/bin/sh
- # Copyright (C) 1996-2018 Free Software Foundation, Inc.
+ # Copyright (C) 1996-2019 Free Software Foundation, Inc.
  # This file is part of the GNU C Library.
  
 @@ -35,16 +35,16 @@ while test $# -gt 0; do
@@ -14,7 +14,7 @@
 +    printf "Copyright (C) %s Free Software Foundation, Inc.
  This is free software; see the source for copying conditions.  There is NO
  warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- " "2018"
+ " "2019"
 -    printf $"Written by %s and %s.
 +    printf "Written by %s and %s.
  " "Roland McGrath" "Ulrich Drepper"
@@ -111,7 +111,7 @@
 @@ -1,4 +1,4 @@
 -#! @BASH@
 +#!/bin/sh
- # Copyright (C) 2011-2018 Free Software Foundation, Inc.
+ # Copyright (C) 2011-2019 Free Software Foundation, Inc.
  # This file is part of the GNU C Library.
  
 @@ -72,18 +72,18 @@ while test $# -gt 0; do
@@ -122,7 +122,7 @@
 +    printf "Copyright (C) %s Free Software Foundation, Inc.
  This is free software; see the source for copying conditions.  There is NO
  warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- " "2018"
+ " "2019"
 -    printf $"Written by %s.\n" "Ulrich Drepper"
 +    printf "Written by %s.\n" "Ulrich Drepper"
      exit 0
diff --git a/glibc.spec b/glibc.spec
index 65fd2a9..9f8c2d6 100644
--- a/glibc.spec
+++ b/glibc.spec
@@ -31,7 +31,7 @@
 %undefine	with_cet
 %endif
 
-%define		core_version	2.28
+%define		core_version	2.29
 %define		llh_version	7:2.6.32.1-1
 
 Summary:	GNU libc
@@ -45,12 +45,12 @@ Summary(tr.UTF-8):	GNU libc
 Summary(uk.UTF-8):	GNU libc версії
 Name:		glibc
 Version:	%{core_version}
-Release:	10
+Release:	1
 Epoch:		6
 License:	LGPL v2.1+
 Group:		Libraries
 Source0:	http://ftp.gnu.org/gnu/glibc/%{name}-%{version}.tar.xz
-# Source0-md5:	c81d2388896379997bc359d4f2084239
+# Source0-md5:	e6c279d5b2f0736f740216f152acf974
 Source2:	nscd.init
 Source3:	nscd.sysconfig
 Source4:	nscd.logrotate
@@ -62,7 +62,7 @@ Source7:	%{name}-LD-path.c
 Source9:	nscd.tmpfiles
 # use branch.sh to update glibc-git.patch
 Patch0:		glibc-git.patch
-# Patch0-md5:	9b6b4d90ca7d6edba76adf101fad0694
+# Patch0-md5:	243bcc879aca3b2ae64f05d94e9c8d1a
 # against GNU TP (libc domain)
 #Patch1:		%{name}-pl.po-update.patch
 Patch2:		%{name}-pld.patch
@@ -103,7 +103,7 @@ BuildRequires:	gawk
 %if %{with cet}
 BuildRequires:	gcc >= 6:8.0
 %else
-BuildRequires:	gcc >= 6:4.7
+BuildRequires	gcc >= 6:5.0
 %endif
 %{?with_memusage:BuildRequires:	gd-devel >= 2.0.1}
 BuildRequires:	gettext-tools >= 0.10.36
@@ -111,6 +111,8 @@ BuildRequires:	gettext-tools >= 0.10.36
 BuildRequires:	linux-libc-headers >= %{llh_version}
 %{?with_nss_crypt:BuildRequires:	nss-devel >= 1:3.15.1-2}
 BuildRequires:	perl-base
+BuildRequires:	python3 >= 1:3.4
+BuildRequires:	python3-modules >= 1:3.4
 BuildRequires:	rpm-build >= 4.3-0.20030610.28
 BuildRequires:	rpmbuild(macros) >= 1.567
 BuildRequires:	sed >= 4.0.5
-- 
2.44.0