From 8ef83de90787234acba020a1f78023c86be20501 Mon Sep 17 00:00:00 2001
From: Florian Weimer <fweimer@redhat.com>
Date: May 06 2016 18:01:07 +0000
Subject: Resolves: #1333940


Avoid build failure in TZ tests

---

diff --git a/glibc-rh1333940.patch b/glibc-rh1333940.patch
new file mode 100644
index 0000000..4d9ea84
--- /dev/null
+++ b/glibc-rh1333940.patch
@@ -0,0 +1,33 @@
+commit 3cc652e951c71785032019fec82e3b8543d85305
+Author: Mike Frysinger <vapier@gentoo.org>
+Date:   Fri Sep 18 13:49:08 2015 -0400
+
+    timezone: fix parallel check failures
+    
+    The XT testdata install rules expect the testdata dir to already exist in
+    the build tree, but it doesn't actually create it.  Instead, it relies on
+    the build-testdata define happening to be executed before it (which runs
+    zic which creates the dir).  When we run in parallel though, it's easy to
+    hit a failure:
+    $ cd timezone
+    $ rm -rf $objdir/timezone/testdata
+    $ make check -j
+    ...
+    cp testdata/XT1 .../timezone/testdata/XT1
+    cp: cannot create regular file '.../timezone/testdata/XT1': No such file or directory
+    Makefile:116: recipe for target '.../timezone/testdata/XT1' failed
+    make: *** [.../timezone/testdata/XT1] Error 1
+    make: *** Waiting for unfinished jobs....
+
+Index: b/timezone/Makefile
+===================================================================
+--- a/timezone/Makefile
++++ b/timezone/Makefile
+@@ -123,6 +123,7 @@ $(testdata)/Asia/Tokyo: asia $(zic-deps)
+ 	$(build-testdata)
+ 
+ $(testdata)/XT%: testdata/XT%
++	$(make-target-directory)
+ 	cp $< $@
+ 
+ $(objpfx)tzselect: tzselect.ksh $(common-objpfx)config.make
diff --git a/glibc.spec b/glibc.spec
index 73ca024..520e18d 100644
--- a/glibc.spec
+++ b/glibc.spec
@@ -1,6 +1,6 @@
 %define glibcsrcdir  glibc-2.22
 %define glibcversion 2.22
-%define glibcrelease 12%{?dist}
+%define glibcrelease 13%{?dist}
 # Pre-release tarballs are pulled in from git using a command that is
 # effectively:
 #
@@ -237,6 +237,7 @@ Patch1014: glibc-rh1313404-3.patch
 Patch1015: glibc-rh1321861.patch
 Patch1016: glibc-rh1316972.patch
 Patch1017: glibc-rh1316972-2.patch
+Patch1018: glibc-rh1333940.patch
 
 ##############################################################################
 #
@@ -673,6 +674,7 @@ microbenchmark tests on the system.
 %patch1015 -p1
 %patch1016 -p1
 %patch1017 -p1
+%patch1018 -p1
 %patch0059 -p1
 
 ##############################################################################
@@ -1893,6 +1895,9 @@ rm -f *.filelist*
 %endif
 
 %changelog
+* Fri May  6 2016 Florian Weimer <fweimer@redhat.com> - 2.22-13
+- Avoid build failure in TZ tests (#1333940)
+
 * Fri May  6 2016 Florian Weimer <fweimer@redhat.com> - 2.22-12
 - Fix heap-based buffer overflow in get_txt_records (#1332912)
 - CVE-2016-3075: Stack overflow in _nss_dns_getnetbyname_r (#1321954)