diff --git a/.gitignore b/.gitignore
index bf8ae57..d9779ce 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1 @@
-SOURCES/nspr-4.21.tar.gz
-SOURCES/nspr-config.xml
+SOURCES/nspr-4.25.tar.gz
diff --git a/.nspr.metadata b/.nspr.metadata
index 67d563a..a9845d4 100644
--- a/.nspr.metadata
+++ b/.nspr.metadata
@@ -1,2 +1 @@
-0ae8c710a52775e209b96aa6220362837b79b6c3 SOURCES/nspr-4.21.tar.gz
-f748a225d13fc55d8843c93002a6e8b79cd3779d SOURCES/nspr-config.xml
+fe02a9056ce867677401b3d6372cdb62f7c7aad4 SOURCES/nspr-4.25.tar.gz
diff --git a/SOURCES/nspr-config.xml b/SOURCES/nspr-config.xml
new file mode 100644
index 0000000..9e3f99c
--- /dev/null
+++ b/SOURCES/nspr-config.xml
@@ -0,0 +1,127 @@
+<?xml version='1.0' encoding='utf-8'?>
+<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
+ "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
+<!ENTITY date SYSTEM "date.xml">
+<!ENTITY version SYSTEM "version.xml">
+]>
+
+<refentry id="nspr-config">
+
+ <refentryinfo>
+ <date>&date;</date>
+ <title>Netscape Portable Runtime</title>
+ <productname>nspr</productname>
+ <productnumber>&version;</productnumber>
+ </refentryinfo>
+
+ <refmeta>
+ <refentrytitle>nspr-config</refentrytitle>
+ <manvolnum>1</manvolnum>
+ </refmeta>
+
+ <refnamediv>
+ <refname>nspr-config</refname>
+ <refpurpose>Return meta information about nspr libraries</refpurpose>
+ </refnamediv>
+
+ <refsynopsisdiv>
+ <cmdsynopsis>
+ <command>nspr-config</command>
+ <arg><option>--prefix</option></arg>
+ <arg><option>--exec-prefix</option></arg>
+ <arg><option>--includedir</option></arg>
+ <arg><option>--libs</option></arg>
+ <arg><option>--cflags</option></arg>
+ <arg><option>--libdir</option></arg>
+ <arg><option>--version</option></arg>
+ </cmdsynopsis>
+ </refsynopsisdiv>
+
+<refsection id="description">
+ <title>Description</title>
+ <para><command>nspr-config</command> is a shell script which can be used to obtain gcc options for building client pacakges of nspr.</para>
+ </refsection>
+
+ <refsection>
+ <title>Options</title>
+
+ <variablelist>
+ <varlistentry>
+ <term><option>--prefix</option></term>
+ <listitem><simpara>Returns the top level system directory under which the nspr libraries are installed.</simpara></listitem>
+ </varlistentry>
+
+ <varlistentry>
+ <term><option>--exec-prefix</option></term>
+ <listitem><simpara>Returns the top level system directory under which any nspr binaries would be installed.</simpara></listitem>
+ </varlistentry>
+
+ <varlistentry>
+ <term><option>--includedir</option> <replaceable>count</replaceable></term>
+ <listitem><simpara>Returns the path to the directory were the nspr headers are installed.</simpara></listitem>
+ </varlistentry>
+
+ <varlistentry>
+ <term><option>--version</option></term>
+ <listitem><simpara>Returns the upstream version of nspr in the form major_version-minor_version-patch_version.</simpara></listitem>
+ </varlistentry>
+
+ <varlistentry>
+ <term><option>--libs</option></term>
+ <listitem><simpara>Returns the compiler linking flags.</simpara></listitem>
+ </varlistentry>
+
+ <varlistentry>
+ <term><option>--cflags</option></term>
+ <listitem><simpara>Returns the compiler include flags.</simpara></listitem>
+ </varlistentry>
+
+ <varlistentry>
+ <term><option>--libdir</option></term>
+ <listitem><simpara>Returns the path to the directory were the nspr libraries are installed.</simpara></listitem>
+ </varlistentry>
+
+ </variablelist>
+ </refsection>
+
+ <refsection>
+ <title>Examples</title>
+
+ <para>The following example will query for both include path and linkage flags:
+ <programlisting>
+ /usr/bin/nspr-config --cflags --libs
+ </programlisting>
+ </para>
+
+
+ </refsection>
+
+ <refsection>
+ <title>Files</title>
+
+ <para><filename>/usr/bin/nspr-config</filename></para>
+
+ </refsection>
+
+ <refsection>
+ <title>See also</title>
+ <para>pkg-config(1)</para>
+ </refsection>
+
+ <refsection id="authors">
+ <title>Authors</title>
+ <para>The NSPR liraries were written and maintained by developers with Netscape, Red Hat, Sun, Oracle, Mozilla, and Google.</para>
+ <para>
+ Authors: Elio Maldonado <emaldona@redhat.com>.
+ </para>
+ </refsection>
+
+<!-- don't change -->
+ <refsection id="license">
+ <title>LICENSE</title>
+ <para>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/.
+ </para>
+ </refsection>
+
+</refentry>
+
diff --git a/SPECS/nspr.spec b/SPECS/nspr.spec
index e4b99f1..0320107 100644
--- a/SPECS/nspr.spec
+++ b/SPECS/nspr.spec
@@ -1,4 +1,4 @@
-%global nspr_version 4.21.0
+%global nspr_version 4.25.0
# The upstream omits the trailing ".0", while we need it for
# consistency with the pkg-config version:
@@ -11,7 +11,7 @@ rpm.define(string.format("nspr_archive_version %s",
Summary: Netscape Portable Runtime
Name: nspr
Version: %{nspr_version}
-Release: 1%{?dist}
+Release: 2%{?dist}
License: MPLv2.0
URL: http://www.mozilla.org/projects/nspr/
Group: System Environment/Libraries
@@ -155,6 +155,12 @@ done
%{_mandir}/man*/*
%changelog
+* Mon Jul 20 2020 Daiki Ueno <dueno@redhat.com> - 4.25.0-2
+- Rebuild to fix wrong dist tag
+
+* Thu Jun 11 2020 Daiki Ueno <dueno@redhat.com> - 4.25.0-1
+- Rebase to NSPR 4.25
+
* Wed Mar 20 2019 Daiki Ueno <dueno@redhat.com> - 4.21.0-1
- Rebase to NSPR 4.21