[nspr/f16] Update to NSPR_4_9_RTM

[Elio Maldonado]

commit 76bf4a2db960a2879b7db78bef12ad3a4bb74f30
Author: Elio Maldonado Batiz <emaldona at redhat.com>
Date:   Sat Mar 10 09:36:12 2012 -0800

    Update to NSPR_4_9_RTM
    
    - Selective merge from f17, don't install everything in /usr
    - https://fedoraproject.org/wiki/Features/UsrMove is f17 and above only

 .gitignore           |    2 +-
 nspr-config-pc.patch |   55 ++++++++++++++++++++++++++-----------------------
 nspr.spec            |    8 +++++-
 sources              |    2 +-
 4 files changed, 37 insertions(+), 30 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 5dcc11a..0154d3c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-nspr-4.8.9.tar.bz2
+nspr-4.9.tar.bz2
diff --git a/nspr-config-pc.patch b/nspr-config-pc.patch
index cf31395..332b03a 100644
--- a/nspr-config-pc.patch
+++ b/nspr-config-pc.patch
@@ -1,6 +1,7 @@
---- mozilla/nsprpub/config/nspr-config-pc.in.x123	2005-05-11 02:53:41.000000000 +0200
-+++ mozilla/nsprpub/config/nspr-config-pc.in	2006-05-24 20:52:12.000000000 +0200
-@@ -98,7 +98,7 @@
+diff -up ./mozilla/nsprpub/config/nspr-config-pc.in.x123 ./mozilla/nsprpub/config/nspr-config-pc.in
+--- ./mozilla/nsprpub/config/nspr-config-pc.in.x123	2012-02-29 16:00:54.108691393 -0800
++++ ./mozilla/nsprpub/config/nspr-config-pc.in	2012-02-29 16:00:54.111691416 -0800
+@@ -98,7 +98,7 @@ if test -z "$includedir"; then
      includedir=@includedir@
  fi
  if test -z "$libdir"; then
@@ -9,7 +10,7 @@
  fi
  
  if test "$echo_prefix" = "yes"; then
-@@ -132,12 +132,12 @@
+@@ -132,12 +132,12 @@ if test "$echo_libs" = "yes"; then
        if test -n "$lib_nspr"; then
  	libdirs="$libdirs -lnspr${major_version}"
        fi
@@ -24,25 +25,27 @@
 +      echo $libdirs `pkg-config --variable=os_libs nspr`
  fi      
  
---- mozilla/nsprpub/configure.in.x123	2006-05-24 20:52:12.000000000 +0200
-+++ mozilla/nsprpub/configure.in	2006-05-24 20:53:53.000000000 +0200
-@@ -2667,6 +2667,8 @@
- config/nsprincl.mk
- config/nsprincl.sh
- config/nspr-config
-+config/nspr-config-pc
-+config/nspr-config-vars
- lib/Makefile 
- lib/ds/Makefile 
- lib/libc/Makefile 
---- mozilla/nsprpub/configure.x123	2006-05-24 20:52:12.000000000 +0200
-+++ mozilla/nsprpub/configure	2006-05-24 20:54:05.000000000 +0200
-@@ -5899,6 +5899,8 @@
- config/nsprincl.mk
- config/nsprincl.sh
- config/nspr-config
-+config/nspr-config-pc
-+config/nspr-config-vars
- lib/Makefile 
- lib/ds/Makefile 
- lib/libc/Makefile 
+diff -up ./mozilla/nsprpub/configure.in.x123 ./mozilla/nsprpub/configure.in
+--- ./mozilla/nsprpub/configure.in.x123	2012-02-14 11:06:00.000000000 -0800
++++ ./mozilla/nsprpub/configure.in	2012-02-29 16:00:54.113691431 -0800
+@@ -3357,6 +3357,8 @@ MAKEFILES="
+     config/nsprincl.mk
+     config/nsprincl.sh
+     config/nspr-config
++    config/nspr-config-pc
++    config/nspr-config-vars
+     lib/Makefile
+     lib/ds/Makefile
+     lib/libc/Makefile
+diff -up ./mozilla/nsprpub/configure.x123 ./mozilla/nsprpub/configure
+--- ./mozilla/nsprpub/configure.x123	2012-02-29 16:03:11.006689991 -0800
++++ ./mozilla/nsprpub/configure	2012-02-29 16:05:15.646599889 -0800
+@@ -6694,6 +6694,8 @@ MAKEFILES="
+     config/nsprincl.mk
+     config/nsprincl.sh
+     config/nspr-config
++    config/nspr-config-pc
++    config/nspr-config-vars
+     lib/Makefile
+     lib/ds/Makefile
+     lib/libc/Makefile
diff --git a/nspr.spec b/nspr.spec
index 5974b20..6f8302b 100644
--- a/nspr.spec
+++ b/nspr.spec
@@ -1,7 +1,7 @@
 Summary:        Netscape Portable Runtime
 Name:           nspr
-Version:        4.8.9
-Release:        2%{?dist}
+Version:        4.9
+Release:        1%{?dist}
 License:        MPLv1.1 or GPLv2+ or LGPLv2+
 URL:            http://www.mozilla.org/projects/nspr/
 Group:          System Environment/Libraries
@@ -144,6 +144,10 @@ done
 %{_bindir}/nspr-config
 
 %changelog
+* Sat Mar 10 2012 Elio Maldonado <emaldona at redhat.com> - 4.9-1
+- Update to NSPR_4_9_RTM
+- Selective merge from f17, don't install everything in /usr
+
 * Thu Sep  8 2011 Ville Skyttä <ville.skytta at iki.fi> - 4.8.9-2
 - Avoid %%post/un shell invocations and dependencies.
 
diff --git a/sources b/sources
index d36bcd3..1417be9 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-de00b4b9ff088b7b2b7121f7332a8176  nspr-4.8.9.tar.bz2
+b4a71a23305f57b10558752e989b4769  nspr-4.9.tar.bz2