[glusterfs/el6] revised libglusterfs/src/Makefile.* to (re)enable parallel make

[Kaleb S. KEITHLEY]

commit 5685efb9979b7eb5382a6a80dbbaf188d7481931
Author: Kaleb KEITHLEY <kkeithle at f16node1.kkeithle.usersys.redhat.com>
Date:   Wed Nov 23 15:24:09 2011 -0500

    revised libglusterfs/src/Makefile.* to (re)enable parallel make

 glusterfs.spec              |   10 +++++++---
 libglusterfs.Makefile.patch |   23 +++++++++++++++++++++++
 2 files changed, 30 insertions(+), 3 deletions(-)
---
diff --git a/glusterfs.spec b/glusterfs.spec
index 9083ac7..4128945 100644
--- a/glusterfs.spec
+++ b/glusterfs.spec
@@ -25,7 +25,7 @@
 Summary:          Cluster File System
 Name:             glusterfs
 Version:          3.2.5
-Release:          2%{?dist}
+Release:          3%{?dist}
 License:          GPLv3
 Group:            System Environment/Base
 Vendor:           Red Hat
@@ -37,6 +37,7 @@ Source3:          umount.glusterfs
 Source4:          glusterfs-fuse.logrotate
 Source5:          glusterd.logrotate
 Source6:          glusterfsd.logrotate
+Patch0:           libglusterfs.Makefile.patch
 BuildRoot:        %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
 %if ( 0%{?fedora} < 17 || 0%{?rhel} < 7 )
@@ -203,6 +204,7 @@ This package provides the development libraries.
 
 %prep
 %setup -q -n %{name}-%{version}
+%patch0 -p0
 
 %build
 ./autogen.sh
@@ -212,8 +214,7 @@ This package provides the development libraries.
 sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
 sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
 
-#%{__make} %{?_smp_mflags} # parallel make breaks koji epel builds
-%{__make}
+%{__make} %{?_smp_mflags}
 
 %install
 %{__rm} -rf %{buildroot} 
@@ -390,6 +391,9 @@ if [ $1 -ge 1 ]; then
 fi
 
 %changelog
+* Wed Nov 23 2011 Kaleb S. KEITHLEY <kkeithle at redhat.com> - 3.2.5-3
+- revised libglusterfs/src/Makefile.* to (re)enable parallel make
+
 * Mon Nov 21 2011 Kaleb S. KEITHLEY <kkeithle at redhat.com> - 3.2.5-2
 - rhel/epel, init.d for <=6, native systemd for 7
 
diff --git a/libglusterfs.Makefile.patch b/libglusterfs.Makefile.patch
new file mode 100644
index 0000000..56a84b0
--- /dev/null
+++ b/libglusterfs.Makefile.patch
@@ -0,0 +1,23 @@
+--- libglusterfs/src/Makefile.am.orig	2011-11-23 14:04:41.810001717 -0500
++++ libglusterfs/src/Makefile.am	2011-11-23 14:30:49.940000394 -0500
+@@ -16,6 +16,7 @@
+ 	$(LEX) -t $(srcdir)/graph.l > $@
+ 
+ y.tab.c y.tab.h: graph.y
+-	$(YACC) -d $(srcdir)/graph.y
++	$(YACC) -d -b foo $(srcdir)/graph.y
++	mv foo.tab.h y.tab.h && mv foo.tab.c y.tab.c
+ 
+ CLEANFILES = graph.lex.c y.tab.c y.tab.h
+--- libglusterfs/src/Makefile.in.orig	2011-11-23 14:04:35.995001451 -0500
++++ libglusterfs/src/Makefile.in	2011-11-23 14:31:01.730999353 -0500
+@@ -866,7 +866,8 @@
+ 	$(LEX) -t $(srcdir)/graph.l > $@
+ 
+ y.tab.c y.tab.h: graph.y
+-	$(YACC) -d $(srcdir)/graph.y
++	$(YACC) -d -b foo $(srcdir)/graph.y
++	mv foo.tab.h y.tab.h && mv foo.tab.c y.tab.c
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
+ # Otherwise a system limit (for SysV at least) may be exceeded.
+ .NOEXPORT: