From 20b7ca1862c5f1bd7b4b769c755c1d82c24f8b49 Mon Sep 17 00:00:00 2001
From: Nathaniel McCallum <nathaniel@natemccallum.com>
Date: Dec 23 2010 19:33:43 +0000
Subject: fix SpiderMonkey; rename -libs to libnatus


---

diff --git a/natus.spec b/natus.spec
index a2d280b..a50c460 100644
--- a/natus.spec
+++ b/natus.spec
@@ -7,7 +7,7 @@
 
 Name:           natus
 Version:        0.1.3
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        A robust JavaScript shell built on the Natus meta-engine
 
 Group:          Development/Languages
@@ -26,32 +26,36 @@ BuildRequires:  xulrunner-devel >= 2.0
 BuildRequires:  v8-devel
 }
 
-Requires: %{name}-libs = %{version}-%{release}
+Requires: lib%{name} = %{version}-%{release}
 
 %description
 A robust JavaScript shell built on the Natus meta-engine
 
-%package libs
+%package -n lib%{name}
 Summary: Libraries for embedding the Natus meta-engine
 Group: Development/Languages
 Requires: %{name}-engine = %{version}-%{release}
+Provides: %{name}-libs = %{version}-%{release}
+Obsoletes: %{name}-libs < 0.1.3-4
 
-%description libs
+%description -n lib%{name}
 Libraries for embedding the Natus meta-engine
 
-%package libs-devel
+%package -n lib%{name}-devel
 Summary: Development files for embedding the Natus meta-engine
 Group: Development/Languages
-Requires: %{name}-libs = %{version}-%{release}
+Requires: lib%{name} = %{version}-%{release}
 Requires: pkgconfig
+Provides: %{name}-libs-devel = %{version}-%{release}
+Obsoletes: %{name}-libs-devel < 0.1.3-4
 
-%description libs-devel
+%description -n lib%{name}-devel
 Development files for embedding the Natus meta-engine
 
 %package engine-JavaScriptCore
 Summary: JavaScriptCore engine for Natus
 Group: Development/Languages
-Requires: %{name}-libs = %{version}-%{release}
+Requires: lib%{name} = %{version}-%{release}
 Provides: %{name}-engine = %{version}-%{release}
 
 %description engine-JavaScriptCore
@@ -61,7 +65,7 @@ JavaScriptCore engine for Natus
 %package engine-SpiderMonkey
 Summary: SpiderMonkey engine for Natus
 Group: Development/Languages
-Requires: %{name}-libs = %{version}-%{release}
+Requires: lib%{name} = %{version}-%{release}
 Provides: %{name}-engine = %{version}-%{release}
 
 %description engine-SpiderMonkey
@@ -72,7 +76,7 @@ SpiderMonkey engine for Natus
 %package engine-V8
 Summary: V8 engine for Natus
 Group: Development/Languages
-Requires: %{name}-libs = %{version}-%{release}
+Requires: lib%{name} = %{version}-%{release}
 Provides: %{name}-engine = %{version}-%{release}
 
 %description engine-V8
@@ -82,7 +86,7 @@ V8 engine for Natus
 %package python
 Summary: Python module for Natus
 Group: Development/Languages
-Requires: %{name}-libs = %{version}-%{release}
+Requires: lib%{name} = %{version}-%{release}
 
 %description python
 Python module for Natus
@@ -90,7 +94,7 @@ Python module for Natus
 %package -n python-natus
 Summary: Natus JavaScript module for Python
 Group: Development/Languages
-Requires: %{name}-libs = %{version}-%{release}
+Requires: lib%{name} = %{version}-%{release}
 
 %description -n python-natus
 Natus JavaScript module for Python
@@ -101,6 +105,10 @@ Natus JavaScript module for Python
 %build
 # Fix version requirement, already fixed upstream
 sed -i 's|>= 2.0|>= 2|' configure
+
+# Fix deprecated symbols, already fixed upstream
+sed -i 's|JS_GetStringBytes|JS_EncodeString|' natus/engines/SpiderMonkey.cc
+
 %configure
 make
 
@@ -114,15 +122,15 @@ cp natus/natusc.h $RPM_BUILD_ROOT%{_includedir}/%{name}
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%post libs -p /sbin/ldconfig
+%post -n lib%{name} -p /sbin/ldconfig
 
-%postun libs -p /sbin/ldconfig
+%postun -n lib%{name} -p /sbin/ldconfig
 
 %files
 %defattr(-,root,root,-)
 %{_bindir}/natus
 
-%files libs
+%files -n lib%{name}
 %defattr(-,root,root,-)
 %doc ChangeLog COPYING AUTHORS README
 %{_libdir}/lib%{name}.so*
@@ -131,7 +139,7 @@ rm -rf $RPM_BUILD_ROOT
 %exclude %{_libdir}/%{name}/%{version}/modules/python.so
 %exclude %{_libdir}/%{name}/engines/*
 
-%files libs-devel
+%files -n lib%{name}-devel
 %defattr(-,root,root,-)
 %{_includedir}/%{name}
 %{_libdir}/lib%{name}.so
@@ -162,6 +170,10 @@ rm -rf $RPM_BUILD_ROOT
 %{python_sitearch}/%{name}.so
 
 %changelog
+* Thu Dec 23 2010 Nathaniel McCallum <nathaniel@natemccallum.com> - 0.1.3-4
+- Rename natus-libs -> libnatus, natus-libs-devel -> libnatus-devel
+- Apply upstream fix for deprecated symbol in SpiderMonkey
+
 * Thu Dec 23 2010 Nathaniel McCallum <nathaniel@natemccallum.com> - 0.1.3-3
 - Enable the V8 engine on Fedora >=15