From c2459abd8242519cbaadc20c58aa1da2f17f8a1c Mon Sep 17 00:00:00 2001
From: Dan Winship <danw@gnome.org>
Date: Wed, 18 Apr 2012 10:42:53 -0400
Subject: [PATCH] Make orbit-idl-compiler work reliably under "make -j"

---
 ORBit2-make-j-safety.patch | 13 +++++++++++++
 ORBit2.spec                |  7 ++++++-
 2 files changed, 19 insertions(+), 1 deletion(-)
 create mode 100644 ORBit2-make-j-safety.patch

diff --git a/ORBit2-make-j-safety.patch b/ORBit2-make-j-safety.patch
new file mode 100644
index 0000000..8e7503a
--- /dev/null
+++ b/ORBit2-make-j-safety.patch
@@ -0,0 +1,13 @@
+--- ORBit2-2.14.19/src/idl-compiler/orbit-idl-c-backend.c.test	2010-02-09 07:05:35.000000000 -0500
++++ ORBit2-2.14.19/src/idl-compiler/orbit-idl-c-backend.c	2012-04-17 16:17:50.797480456 -0400
+@@ -133,8 +133,8 @@
+ 	}
+ 	
+ 	if (pass == OUTPUT_DEPS) {
+-		if (!g_file_test (".deps", G_FILE_TEST_IS_DIR)) {
+-			if (g_mkdir (".deps", 0775) < 0) {
++		if (g_mkdir (".deps", 0775) < 0) {
++			if (errno != EEXIST) {
+ 				g_warning ("failed to create '.deps' directory '%s'",
+ 					   g_strerror (errno));
+ 				return NULL;
diff --git a/ORBit2.spec b/ORBit2.spec
index f2b168a..ba4614a 100644
--- a/ORBit2.spec
+++ b/ORBit2.spec
@@ -4,7 +4,7 @@
 Summary: A high-performance CORBA Object Request Broker
 Name: ORBit2
 Version: 2.14.19
-Release: 4%{?dist}
+Release: 5%{?dist}
 #VCS: git:git://git.gnome.org/ORBit2
 Source: http://download.gnome.org/sources/ORBit2/2.14/%{name}-%{version}.tar.bz2
 Group: System Environment/Daemons
@@ -21,6 +21,7 @@ BuildRequires: gtk-doc
 Patch0: ORBit2-2.14.3-multilib.patch
 # handle ref leaks in the a11y stack more gracefully
 Patch1: ORBit2-2.14.3-ref-leaks.patch
+Patch2: ORBit2-make-j-safety.patch
 
 %description
 ORBit is a high-performance CORBA (Common Object Request Broker
@@ -60,6 +61,7 @@ write such programs, you'll also need to install the ORBIT package.
 %setup -q
 %patch0 -p1 -b .multilib
 %patch1 -p1 -b .ref-leaks
+%patch2 -p1 -b .make-j
 
 %build
 ## the shipped libtool is broken wrt. multilib
@@ -131,6 +133,9 @@ EOF
 %{_datadir}/gtk-doc
 
 %changelog
+* Mon Apr 30 2012 Dan Winship <danw@redhat.com> - 2.14.19-5
+- Make orbit-idl-compiler work reliably under "make -j"
+
 * Thu Apr 26 2012 Jon Ciesla <limburgher@gmail.com> - 2.14.19-4
 - Minor merge review fixes, BZ 226223.