[heimdal/el5] Patch for parallel build failure in kadm5. Thanks Jakub Čajka.

[Ken Dreyer]

commit 0df90a6147df7730cda82ed18d1c5f2f85de7197
Author: Ken Dreyer <ktdreyer at ktdreyer.com>
Date:   Tue Jul 1 15:50:22 2014 -0600

    Patch for parallel build failure in kadm5. Thanks Jakub Čajka.
    
    - Remove comments about X11 binaries (we will never ship those).

 heimdal-1.6.0-a5adc06-kadm5_err.patch |   30 ++++++++++++++++++++++++++++++
 heimdal.spec                          |   14 ++++++++++----
 2 files changed, 40 insertions(+), 4 deletions(-)
---
diff --git a/heimdal-1.6.0-a5adc06-kadm5_err.patch b/heimdal-1.6.0-a5adc06-kadm5_err.patch
new file mode 100644
index 0000000..aea9be6
--- /dev/null
+++ b/heimdal-1.6.0-a5adc06-kadm5_err.patch
@@ -0,0 +1,30 @@
+From d285d8ea09d63e5c4634ad3f52df5a7b05bd48ba Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Jakub=20=C4=8Cajka?= <jcajka at redhat.com>
+Date: Tue, 1 Jul 2014 13:13:43 -0600
+Subject: [PATCH] kadm5: fix race in Makefile with kadm5_err.h
+
+When running make with -j4, occasionally kadm5 fails due to a missing
+header file kadm5_err.h. Fix the race condition.
+
+Reported at https://bugzilla.redhat.com/1115164
+
+Reviewed-by: Ken Dreyer <ktdreyer at ktdreyer.com>
+---
+ lib/kadm5/Makefile.am | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/lib/kadm5/Makefile.am b/lib/kadm5/Makefile.am
+index f8be3b1..1b399b1 100644
+--- a/lib/kadm5/Makefile.am
++++ b/lib/kadm5/Makefile.am
+@@ -155,6 +155,7 @@ iprop-commands.c iprop-commands.h: iprop-commands.in
+ 	$(SLC) $(srcdir)/iprop-commands.in
+ 
+ $(libkadm5srv_la_OBJECTS): kadm5_err.h
++$(libkadm5clnt_la_OBJECTS): kadm5_err.h
+ $(iprop_log_OBJECTS): iprop-commands.h
+ 
+ client_glue.lo server_glue.lo: $(srcdir)/common_glue.c
+-- 
+1.9.0
+
diff --git a/heimdal.spec b/heimdal.spec
index 01c813a..834a340 100644
--- a/heimdal.spec
+++ b/heimdal.spec
@@ -18,7 +18,7 @@
 
 Name: heimdal
 Version: 1.6.0
-Release: 0.7.%{commitdate}git%{shortcommit}%{?dist}
+Release: 0.8.%{commitdate}git%{shortcommit}%{?dist}
 Summary: A Kerberos 5 implementation without export restrictions
 License: BSD and MIT
 URL: http://www.h5l.org/
@@ -67,9 +67,10 @@ Patch5: heimdal-1.6.0-229d8c7-libtool-macro.patch
 # Fix kadmin's setpgid() call under systemd
 # Submitted upstream for master at https://github.com/heimdal/heimdal/pull/100
 Patch6: heimdal-1.6.0-ddde77b-kadmin-setpgid.patch
-# We don't build X11 binaries, switch to new xorg-x11-devel
-# if we add it.
-#BuildRequires:  xorg-x11-devel
+# Fix race condition with building kadm5
+# Submitted upstream for master at https://github.com/heimdal/heimdal/pull/108
+Patch7: heimdal-1.6.0-a5adc06-kadm5_err.patch
+
 BuildRequires:  bison
 BuildRequires:  flex
 BuildRequires:  libedit-devel
@@ -218,6 +219,7 @@ PATH.
 %patch4 -p1 -b .declarations
 %patch5 -p1 -b .libtool
 %patch6 -p1 -b .setpgid
+%patch7 -p1 -b .kadm5
 
 %if 0%{?need_autogen}
   ./autogen.sh
@@ -672,6 +674,10 @@ fi
 %{_sysconfdir}/profile.d/%{name}.csh
 
 %changelog
+* Tue Jul 01 2014 Ken Dreyer <ktdreyer at ktdreyer.com> - 1.6.0-0.8.20140621gita5adc06
+- Patch for parallel build failure in kadm5. Thanks Jakub Čajka.
+- Remove comments about X11 binaries (we will never ship those).
+
 * Sun Jun 22 2014 Ken Dreyer <ktdreyer at ktdreyer.com> - 1.6.0-0.7.20140621gita5adc06
 - Update git snapshot to latest tip of heimdal-1-6-branch