diff --git a/.gitignore b/.gitignore
index b42dd5a..b8db559 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,2 @@
-SOURCES/nspr-4.10.6.tar.bz2
+SOURCES/nspr-4.10.6.tar.gz
SOURCES/nspr-config.xml
diff --git a/.nspr.metadata b/.nspr.metadata
index 754b312..cb541c1 100644
--- a/.nspr.metadata
+++ b/.nspr.metadata
@@ -1,2 +1,2 @@
-dfc780578c26df9531c0c094e754c174bf11bcb1 SOURCES/nspr-4.10.6.tar.bz2
+9f3f278f7f31574b2cdbb99d9703c58e51cd3e1c SOURCES/nspr-4.10.6.tar.gz
f748a225d13fc55d8843c93002a6e8b79cd3779d SOURCES/nspr-config.xml
diff --git a/SOURCES/nspr-config.xml b/SOURCES/nspr-config.xml
deleted file mode 100644
index 9e3f99c..0000000
--- a/SOURCES/nspr-config.xml
+++ /dev/null
@@ -1,127 +0,0 @@
-
-
-
-]>
-
-
-
-
- &date;
- Netscape Portable Runtime
- nspr
- &version;
-
-
-
- nspr-config
- 1
-
-
-
- nspr-config
- Return meta information about nspr libraries
-
-
-
-
- nspr-config
-
-
-
-
-
-
-
-
-
-
-
- Description
- nspr-config is a shell script which can be used to obtain gcc options for building client pacakges of nspr.
-
-
-
- Options
-
-
-
-
- Returns the top level system directory under which the nspr libraries are installed.
-
-
-
-
- Returns the top level system directory under which any nspr binaries would be installed.
-
-
-
- count
- Returns the path to the directory were the nspr headers are installed.
-
-
-
-
- Returns the upstream version of nspr in the form major_version-minor_version-patch_version.
-
-
-
-
- Returns the compiler linking flags.
-
-
-
-
- Returns the compiler include flags.
-
-
-
-
- Returns the path to the directory were the nspr libraries are installed.
-
-
-
-
-
-
- Examples
-
- The following example will query for both include path and linkage flags:
-
- /usr/bin/nspr-config --cflags --libs
-
-
-
-
-
-
-
- Files
-
- /usr/bin/nspr-config
-
-
-
-
- See also
- pkg-config(1)
-
-
-
- Authors
- The NSPR liraries were written and maintained by developers with Netscape, Red Hat, Sun, Oracle, Mozilla, and Google.
-
- Authors: Elio Maldonado <emaldona@redhat.com>.
-
-
-
-
-
- LICENSE
- Licensed under the Mozilla Public License, v. 2.0. If a copy of the MPL was not distributed with this file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-
-
-
-
diff --git a/SPECS/nspr.spec b/SPECS/nspr.spec
index cc32c03..55a3a98 100644
--- a/SPECS/nspr.spec
+++ b/SPECS/nspr.spec
@@ -1,7 +1,7 @@
Summary: Netscape Portable Runtime
Name: nspr
Version: 4.10.6
-Release: 1%{?dist}
+Release: 3%{?dist}
License: MPLv2.0
URL: http://www.mozilla.org/projects/nspr/
Group: System Environment/Libraries
@@ -11,7 +11,7 @@ Conflicts: filesystem < 3
# Sources available at https://ftp.mozilla.org/pub/mozilla.org/nspr/releases/
# When hg tag based snapshots are being used, refer to documentation at
# https://wiki.mozilla.org/NSS:UsingHG and check out https://hg.mozilla.org/projects/nspr
-Source0: %{name}-%{version}.tar.bz2
+Source0: %{name}-%{version}.tar.gz
Source1: nspr-config.xml
Patch1: nspr-config-pc.patch
@@ -56,11 +56,12 @@ cp ./nspr/config/nspr-config.in ./nspr/config/nspr-config-pc.in
LDFLAGS+=-Wl,-z,relro
export LDFLAGS
-./nspr/configure \
+%define _configure ./nspr/configure
+%configure \
--prefix=%{_prefix} \
--libdir=%{_libdir} \
--includedir=%{_includedir}/nspr4 \
-%ifarch x86_64 ppc64 ia64 s390x sparc64 aarch64
+%if %{__isa_bits} == 64
--enable-64bit \
%endif
%ifarch armv7l armv7hl armv7nhl
@@ -142,9 +143,17 @@ done
%{_mandir}/man*/*
%changelog
+* Mon Dec 01 2014 Elio Maldonado - 4.10.6-3
+- Restore s390x related patch as it hasn't been applied upstream yet
+- Resolves: Bug 1103250 - Rebase RHEL 7.1 to NSPR 4.10.6 (for FF 31)
+
+* Tue Aug 05 2014 Elio Maldonado 4.10.6-2
+- Generic 32/64 bit platform detection (fix ppc64le build)
+- Resolves: Bug 1126243 - Ensure nspr is built for 64 bit on ppc64le
+
* Tue Jul 08 2014 Elio Maldonado - 4.10.6-1
- Rebase to nspr-4.10.6
-- Resolves: Bug 1116201
+- Resolves: Bug 1103250 - Rebase RHEL 7.1 to NSPR 4.10.6 (for FF 31)
* Fri Jan 24 2014 Daniel Mach - 4.10.2-4
- Mass rebuild 2014-01-24