[xulrunner] Use nss and nspr version from buildroot

Jan Horak xhorak at fedoraproject.org
Tue Oct 16 08:50:18 UTC 2012


commit ec23a95c1f74bdcbc31174e7b5d3bdcbe8d8dc71
Author: Jan Horak <jhorak at redhat.com>
Date:   Tue Oct 16 10:50:07 2012 +0200

    Use nss and nspr version from buildroot

 xulrunner.spec |   14 ++++++++------
 1 files changed, 8 insertions(+), 6 deletions(-)
---
diff --git a/xulrunner.spec b/xulrunner.spec
index dbbfb32..580cb11 100644
--- a/xulrunner.spec
+++ b/xulrunner.spec
@@ -21,8 +21,10 @@
 %global libvpx_version 1.0.0
 
 %if %{?system_nss}
-%global nspr_version %(pkg-config --silence-errors --modversion nspr 2>/dev/null || echo 65536)
-%global nss_version %(pkg-config --silence-errors --modversion nss 2>/dev/null || echo 65536)
+%global nspr_version 4.9.2
+%global nspr_build_version %(pkg-config --silence-errors --modversion nspr 2>/dev/null || echo 65536)
+%global nss_version 3.13.5
+%global nss_build_version %(pkg-config --silence-errors --modversion nss 2>/dev/null || echo 65536)
 %endif
 
 %if %{?system_sqlite}
@@ -131,8 +133,8 @@ BuildRequires:  libvpx-devel >= %{libvpx_version}
 
 Requires:       mozilla-filesystem
 %if %{?system_nss}
-Requires:       nspr >= %{nspr_version}
-Requires:       nss >= %{nss_version}
+Requires:       nspr >= %{nspr_build_version}
+Requires:       nss >= %{nss_build_version}
 %endif
 Provides:       gecko-libs = %{gecko_verrel}
 Provides:       gecko-libs%{?_isa} = %{gecko_verrel}
@@ -163,8 +165,8 @@ Provides: gecko-devel-unstable%{?_isa} = %{gecko_verrel}
 
 Requires: xulrunner = %{version}-%{release}
 %if %{?system_nss}
-Requires: nspr-devel >= %{nspr_version}
-Requires: nss-devel >= %{nss_version}
+Requires: nspr-devel >= %{nspr_build_version}
+Requires: nss-devel >= %{nss_build_version}
 %endif
 %if %{?system_cairo}
 Requires: cairo-devel >= %{cairo_version}


More information about the scm-commits mailing list