From e2eb4d12d57f2091149e7c46bced5201f2c2bab0 Mon Sep 17 00:00:00 2001
From: Tom Callaway <spot@fedoraproject.org>
Date: Fri, 21 May 2010 20:29:22 +0000
Subject: [PATCH] rework parallel patch and reapply

---
 brltty-parallel.patch | 10 +++++-----
 brltty.spec           |  7 ++++++-
 2 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/brltty-parallel.patch b/brltty-parallel.patch
index 115c650..f0b21ea 100644
--- a/brltty-parallel.patch
+++ b/brltty-parallel.patch
@@ -5,14 +5,14 @@
 	"make brlapi" when parallel make is used.  Recursive make is
 	harmful.
 
---- brltty-4.0/Programs/Makefile.in.parallel	2009-10-07 20:48:57.000000000 +0200
-+++ brltty-4.0/Programs/Makefile.in	2009-10-07 20:50:03.000000000 +0200
-@@ -428,7 +428,7 @@
+--- brltty-4.2/Programs/Makefile.in.BAD	2010-05-21 16:27:45.231183660 -0400
++++ brltty-4.2/Programs/Makefile.in	2010-05-21 16:27:51.437122063 -0400
+@@ -484,7 +484,7 @@ apitest.$O:
  
  ###############################################################################
  
--braille-drivers: txt2hlp$X
-+braille-drivers: txt2hlp$X api
+-braille-drivers:
++braille-drivers: api
  	for driver in $(BRAILLE_EXTERNAL_DRIVER_NAMES); \
  	do (cd $(BLD_TOP)$(BRL_DIR)/$$driver && $(MAKE) braille-driver braille-all) || exit 1; \
  	done
diff --git a/brltty.spec b/brltty.spec
index bf54ccf..493a501 100644
--- a/brltty.spec
+++ b/brltty.spec
@@ -15,7 +15,7 @@
 
 Name: brltty
 Version: %{pkg_version}
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPLv2+
 Group: System Environment/Daemons
 URL: http://mielke.cc/brltty/
@@ -23,6 +23,7 @@ Source: http://mielke.cc/brltty/releases/%{name}-%{version}.tar.gz
 Patch0: brltty-cppflags.patch
 Patch1: brltty-autoconf-quote.patch
 Patch2: brltty-4.2-S_ISCHR.patch
+Patch3: brltty-parallel.patch
 BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 Summary: Braille display driver for Linux/Unix
 BuildRequires: byacc glibc-kernheaders
@@ -140,6 +141,7 @@ This package provides the Java binding for BrlAPI.
 %patch0 -p1 -b .cppflags
 %patch1 -p1 -b .quote
 %patch2 -p1 -b .S_ISCHR
+%patch3 -p1 -b .parallel
 
 %build
 # Patch6 changes aclocal.m4:
@@ -275,6 +277,9 @@ exit 0
 
 
 %changelog
+* Fri May 21 2010 Tom "spot" Callaway <tcallawa@redhat.com> - 4.2-2
+- rework parallel patch slightly and reapply
+
 * Fri May 21 2010 Tom "spot" Callaway <tcallawa@redhat.com> - 4.2-1
 - update to 4.2
 - drop static lib (bz 556041)