[nspr] Update the nspr-config-pc.patch to prevent multilib regressions

[Elio Maldonado]

commit b06bfa7e1eac999a28bdc656f2ca0e40e63404ee
Author: Elio Maldonado <emaldona at redhat.com>
Date:   Fri Jun 22 08:00:25 2012 -0700

    Update the nspr-config-pc.patch to prevent multilib regressions
    
    - regenerate the patch restoring the npr-config.in patching section

 nspr-config-pc.patch |   43 +++++++++++++++++++++++++++++++++++++++----
 nspr.spec            |    5 ++++-
 2 files changed, 43 insertions(+), 5 deletions(-)
---
diff --git a/nspr-config-pc.patch b/nspr-config-pc.patch
index a3cdedc..7f49853 100644
--- a/nspr-config-pc.patch
+++ b/nspr-config-pc.patch
@@ -1,7 +1,42 @@
-diff -up ./mozilla/nsprpub/config/nspr.pc.in.extralibs ./mozilla/nsprpub/config/nspr.pc.in
---- ./mozilla/nsprpub/config/nspr.pc.in.extralibs	2012-06-16 11:02:11.846447511 -0700
-+++ ./mozilla/nsprpub/config/nspr.pc.in	2012-06-16 11:05:30.578619641 -0700
-@@ -6,5 +6,5 @@ includedir=@includedir@
+Index: ./mozilla/nsprpub/config/nspr-config.in
+===================================================================
+RCS file: /cvsroot/mozilla/nsprpub/config/nspr-config.in,v
+retrieving revision 1.8
+diff -u -p -r1.8 nspr-config.in
+--- ./mozilla/nsprpub/config/nspr-config.in	6 Mar 2012 13:13:39 -0000	1.8
++++ ./mozilla/nsprpub/config/nspr-config.in	22 Jun 2012 02:36:56 -0000
+@@ -102,7 +102,7 @@ if test -z "$includedir"; then
+     includedir=@includedir@
+ fi
+ if test -z "$libdir"; then
+-    libdir=@libdir@
++    libdir=`pkg-config --variable=libdir nspr`
+ fi
+ 
+ if test "$echo_prefix" = "yes"; then
+@@ -136,12 +136,12 @@ if test "$echo_libs" = "yes"; then
+       if test -n "$lib_nspr"; then
+ 	libdirs="$libdirs -lnspr${major_version}"
+       fi
+-      os_ldflags="@LDFLAGS@"
++      os_ldflags=`pkg-config --variable=ldflags nspr`
+       for i in $os_ldflags ; do
+ 	if echo $i | grep \^-L >/dev/null; then
+ 	  libdirs="$libdirs $i"
+         fi
+       done
+-      echo $libdirs @OS_LIBS@
++      echo $libdirs `pkg-config --variable=os_libs nspr`
+ fi      
+ 
+Index: ./mozilla/nsprpub/config/nspr.pc.in
+===================================================================
+RCS file: /cvsroot/mozilla/nsprpub/config/nspr.pc.in,v
+retrieving revision 1.1
+diff -u -p -r1.1 nspr.pc.in
+--- ./mozilla/nsprpub/config/nspr.pc.in	18 May 2012 22:26:17 -0000	1.1
++++ ./mozilla/nsprpub/config/nspr.pc.in	22 Jun 2012 02:36:56 -0000
+@@ -6,5 +8,5 @@ includedir=@includedir@
  Name: NSPR
  Description: The Netscape Portable Runtime
  Version: @MOD_MAJOR_VERSION at .@MOD_MINOR_VERSION at .@MOD_PATCH_VERSION@
diff --git a/nspr.spec b/nspr.spec
index ed68c3e..c171ded 100644
--- a/nspr.spec
+++ b/nspr.spec
@@ -1,7 +1,7 @@
 Summary:        Netscape Portable Runtime
 Name:           nspr
 Version:        4.9.1
-Release:        3%{?dist}
+Release:        4%{?dist}
 License:        MPLv1.1 or GPLv2+ or LGPLv2+
 URL:            http://www.mozilla.org/projects/nspr/
 Group:          System Environment/Libraries
@@ -120,6 +120,9 @@ NSPR_VERSION=`./config/nspr-config --version`
 %{_bindir}/nspr-config
 
 %changelog
+* Fri Jun 22 2012 Elio Maldonado <emaldona at redhat.com> - 4.9.1-4
+- Update the nspr-config-pc.patch to prevent multilib regressions
+
 * Thu Jun 21 2012 Elio Maldonado <emaldona at redhat.com> - 4.9.1-3
 - Bump the release tag