[nspr] Update to nspr 4.9.1

[Elio Maldonado]

commit a80e5ff496a0fe4283af60848b703af7df48a4e6
Author: Elio Maldonado Batiz <emaldona at redhat.com>
Date:   Sat Jun 16 12:01:16 2012 -0700

    Update to nspr 4.9.1
    
    - Upstream now ships an nspr.pc.in which close to our needs
    - Our copy of nspr.pc.in and nspr-config-vars.in are no longer needed
    - Patch nspr.pc.in to produce extra linker flags
    - Replace the ugly hacks in the %install phase with simple patching of nspr.pc.in

 nspr-config-pc.patch |   51 --------------------------------------------------
 nspr.pc.in           |   10 ---------
 nspr.pc.patch        |   10 +++++++++
 nspr.spec            |   23 +--------------------
 4 files changed, 12 insertions(+), 82 deletions(-)
---
diff --git a/nspr.pc.patch b/nspr.pc.patch
new file mode 100644
index 0000000..a3cdedc
--- /dev/null
+++ b/nspr.pc.patch
@@ -0,0 +1,10 @@
+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@
+ Name: NSPR
+ Description: The Netscape Portable Runtime
+ Version: @MOD_MAJOR_VERSION at .@MOD_MINOR_VERSION at .@MOD_PATCH_VERSION@
+-Libs: -L at libdir@ -lplds at MOD_MAJOR_VERSION@ -lplc at MOD_MAJOR_VERSION@ -lnspr at MOD_MAJOR_VERSION@
++Libs: -L at libdir@ -lplds at MOD_MAJOR_VERSION@ -lplc at MOD_MAJOR_VERSION@ -lnspr at MOD_MAJOR_VERSION@ @OS_LIBS@
+ Cflags: -I at includedir@
diff --git a/nspr.spec b/nspr.spec
index 3e1667a..467f8a5 100644
--- a/nspr.spec
+++ b/nspr.spec
@@ -12,10 +12,8 @@ Conflicts:      filesystem < 3
 # When CVS tag based snapshots are being used, refer to CVS documentation on
 # mozilla.org and check out subdirectory mozilla/nsprpub.
 Source0:        %{name}-%{version}.tar.bz2
-Source1:        nspr.pc.in
-Source2:        nspr-config-vars.in
 
-Patch1:         nspr-config-pc.patch
+Patch1:         nspr.pc.patch
 
 %description
 NSPR provides platform independence for non-GUI operating system 
@@ -45,9 +43,7 @@ Header files for doing development with the Netscape Portable Runtime.
 # that go into nspr.pc for pkg-config.
 
 cp ./mozilla/nsprpub/config/nspr-config.in ./mozilla/nsprpub/config/nspr-config-pc.in
-%patch1 -p0
-
-cp %{SOURCE2} ./mozilla/nsprpub/config/
+%patch1 -p0 -b .extralibs
 
 %build
 
@@ -94,21 +90,6 @@ NSPR_CFLAGS=`./config/nspr-config --cflags`
 NSPR_VERSION=`./config/nspr-config --version`
 %{__mkdir_p} $RPM_BUILD_ROOT/%{_libdir}/pkgconfig
 
-cat ./config/nspr-config-vars > \
-                     $RPM_BUILD_ROOT/%{_libdir}/pkgconfig/nspr.pc
-
-cat %{SOURCE1} | sed -e "s,%%libdir%%,%{_libdir},g" \
-                     -e "s,%%prefix%%,%{_prefix},g" \
-                     -e "s,%%exec_prefix%%,%{_prefix},g" \
-                     -e "s,%%includedir%%,%{_includedir}/nspr4,g" \
-                     -e "s,%%NSPR_VERSION%%,$NSPR_VERSION,g" \
-                     -e "s,%%FULL_NSPR_LIBS%%,$NSPR_LIBS,g" \
-                     -e "s,%%FULL_NSPR_CFLAGS%%,$NSPR_CFLAGS,g" >> \
-                     $RPM_BUILD_ROOT/%{_libdir}/pkgconfig/nspr.pc
-
-%{__mkdir_p} $RPM_BUILD_ROOT/%{_bindir}
-%{__cp} ./config/nspr-config-pc $RPM_BUILD_ROOT/%{_bindir}/nspr-config
-
 # Get rid of the things we don't want installed (per upstream)
 %{__rm} -rf \
    $RPM_BUILD_ROOT/%{_bindir}/compile-et.pl \