[mod_nss] Fix building with parallel make

[Rob Crittenden]

commit 20a543890a328236e19fa180b3c5c7932ae373c8
Author: Rob Crittenden <rcritten at redhat.com>
Date:   Fri Feb 27 13:41:36 2015 -0500

    Fix building with parallel make
    
    Reported against aarch64 but could have affected any
    arch depending on the build order it chose.
    
    BZ 1196222

 mod_nss-parallel-build.patch | 14 ++++++++++++++
 mod_nss.spec                 |  7 ++++++-
 2 files changed, 20 insertions(+), 1 deletion(-)
---
diff --git a/mod_nss-parallel-build.patch b/mod_nss-parallel-build.patch
new file mode 100644
index 0000000..e6abd76
--- /dev/null
+++ b/mod_nss-parallel-build.patch
@@ -0,0 +1,14 @@
+diff --git a/Makefile.am b/Makefile.am
+index 6bbbc45..4978ff3 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -7,8 +7,7 @@ bin_PROGRAMS = nss_pcache test_cipher
+ 
+ nss_pcache_SOURCES = nss_pcache.c
+ 
+-test_cipher_SOURCES = test_cipher.c
+-test_cipher_LDADD = .libs/nss_engine_cipher.o
++test_cipher_SOURCES = test_cipher.c nss_engine_cipher.c
+ test_cipher_CFLAGS = $(AM_CFLAGS) $(CFLAGS) $(EXTRA_CPPFLAGS)
+ 
+ man8_MANS =				\
diff --git a/mod_nss.spec b/mod_nss.spec
index a1ac128..b994ede 100644
--- a/mod_nss.spec
+++ b/mod_nss.spec
@@ -6,7 +6,7 @@
 
 Name: mod_nss
 Version: 1.0.11
-Release: 1%{?dist}
+Release: 2%{?dist}
 Summary: SSL/TLS module for the Apache HTTP server
 Group: System Environment/Daemons
 License: ASL 2.0
@@ -31,6 +31,7 @@ Requires: %{_libdir}/libnssckbi.so
 Patch1: mod_nss-conf.patch
 # Generate a password-less NSS database
 Patch2: mod_nss-gencert.patch
+Patch3: mod_nss-parallel-build.patch
 
 %description
 The mod_nss module provides strong cryptography for the Apache Web
@@ -42,6 +43,7 @@ security library.
 %setup -q
 %patch1 -p1 -b .conf
 %patch2 -p1 -b .gencert
+%patch3 -p1
 
 # Touch expression parser sources to prevent regenerating it
 touch nss_expr_*.[chyl]
@@ -153,6 +155,9 @@ fi
 %{_sbindir}/gencert
 
 %changelog
+* Fri Feb 27 2015 Rob Crittenden <rcritten at redhat.com> - 1.0.11-2
+- Fix parallel build issue (#1196222)
+
 * Tue Dec  2 2014 Rob Crittenden <rcritten at redhat.com> - 1.0.11-1
 - Rebase to upstream mod_nss-1.0.11