[natus] Don't use libjs or v8 in F17; use libjs otherwise

[Nathaniel McCallum]

commit 4b45b8218ae4f3858e861c866105538f2a7a6233
Author: Nathaniel McCallum <nathaniel at themccallums.org>
Date:   Fri Jan 27 11:19:05 2012 -0500

    Don't use libjs or v8 in F17; use libjs otherwise

 natus.spec |   18 +++++++++++-------
 1 files changed, 11 insertions(+), 7 deletions(-)
---
diff --git a/natus.spec b/natus.spec
index d30f9df..f0ef428 100644
--- a/natus.spec
+++ b/natus.spec
@@ -1,7 +1,7 @@
 %{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
-%if 0%{?fedora} >= 15
-%global _with_xulrunner 1
+%if 0%{?fedora} < 17
+%global _with_js 1
 %ifarch %{ix86} x86_64 %{arm}
 %global _with_v8 1
 %endif
@@ -9,7 +9,7 @@
 
 Name:           natus
 Version:        0.1.5
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        A robust JavaScript shell built on the Natus meta-engine
 
 Group:          Development/Languages
@@ -21,8 +21,8 @@ BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  readline-devel
 BuildRequires:  python-devel
 BuildRequires:  webkitgtk-devel
-%{?_with_xulrunner:
-BuildRequires:  xulrunner-devel >= 2.0
+%{?_with_js:
+BuildRequires:  js-devel >= 2.0
 }
 %{?_with_v8:
 BuildRequires:  v8-devel
@@ -66,7 +66,7 @@ Obsoletes: %{name}-engine-JavaScriptCore < 0.1.3-5
 %description -n lib%{name}-JavaScriptCore
 JavaScriptCore engine for Natus
 
-%{?_with_xulrunner:
+%{?_with_js:
 %package -n lib%{name}-SpiderMonkey
 Summary: SpiderMonkey engine for Natus
 Group: Development/Languages
@@ -152,7 +152,7 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(-,root,root,-)
 %{_libdir}/%{name}/%{version}/engines/JavaScriptCore.so
 
-%{?_with_xulrunner:
+%{?_with_js:
 %files -n lib%{name}-SpiderMonkey
 %defattr(-,root,root,-)
 %{_libdir}/%{name}/%{version}/engines/SpiderMonkey.so
@@ -173,6 +173,10 @@ rm -rf $RPM_BUILD_ROOT
 %{python_sitearch}/%{name}.so
 
 %changelog
+* Fri Jan 27 2012 Nathaniel McCallum <nathaniel at natemccallum.com> - 0.1.5-5
+- Link SpiderMonkey against libjs
+- Don't use libjs or v8 in F17
+
 * Fri Jan 13 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.1.5-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild