From 36a04b796f91771ca79e7d3428808f9e351e6e76 Mon Sep 17 00:00:00 2001
From: Martin Stransky <stransky@redhat.com>
Date: Thu, 24 Aug 2017 09:00:52 +0200
Subject: [PATCH] Enable to build with nspr-4.16.

---
 firefox.spec | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/firefox.spec b/firefox.spec
index 990e808..08c5746 100644
--- a/firefox.spec
+++ b/firefox.spec
@@ -97,7 +97,7 @@
 Summary:        Mozilla Firefox Web browser
 Name:           firefox
 Version:        55.0.2
-Release:        2%{?pre_tag}%{?dist}
+Release:        3%{?pre_tag}%{?dist}
 URL:            https://www.mozilla.org/firefox/
 License:        MPLv1.1 or GPLv2+ or LGPLv2+
 Group:          Applications/Internet
@@ -250,9 +250,6 @@ BuildRequires:  cargo
 Obsoletes:      mozilla <= 37:1.7.13
 Provides:       webclient
 
-#remove when nspr 4.16 is at stable
-Conflicts:      pkgconfig(nspr) >= 4.16
-
 %description
 Mozilla Firefox is an open-source web browser, designed for standards
 compliance, performance and portability.
@@ -856,6 +853,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 #---------------------------------------------------------------------
 
 %changelog
+* Thu Aug 24 2017 Martin Stransky <stransky@redhat.com> - 55.0.2-3
+- Enable to build with nspr-4.16.
+
 * Wed Aug 23 2017 Martin Stransky <stransky@redhat.com> - 55.0.2-2
 - Rebuilt to remove wrong dependency to nspr-4.16.