diff --git a/.gitignore b/.gitignore index 35f0ac1..3fdd18d 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ /natus-0.1.3.tar.gz +/natus-0.1.4.tar.gz diff --git a/natus.spec b/natus.spec index 45b1fc5..9b20971 100644 --- a/natus.spec +++ b/natus.spec @@ -8,8 +8,8 @@ %endif Name: natus -Version: 0.1.3 -Release: 7%{?dist} +Version: 0.1.4 +Release: 1%{?dist} Summary: A robust JavaScript shell built on the Natus meta-engine Group: Development/Languages @@ -114,22 +114,13 @@ Natus JavaScript module for Python %setup -q %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(ctx, |' natus/engines/SpiderMonkey.cc - %configure -make +make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT -# Copy missing header, already fixed upstream -cp natus/natusc.h $RPM_BUILD_ROOT%{_includedir}/%{name} - %clean rm -rf $RPM_BUILD_ROOT @@ -148,7 +139,7 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/%{name} %exclude %{_libdir}/lib%{name}.so %exclude %{_libdir}/%{name}/%{version}/modules/python.so -%exclude %{_libdir}/%{name}/engines/* +%exclude %{_libdir}/%{name}/%{version}/engines/* %files -n lib%{name}-devel %defattr(-,root,root,-) @@ -158,18 +149,18 @@ rm -rf $RPM_BUILD_ROOT %files -n lib%{name}-JavaScriptCore %defattr(-,root,root,-) -%{_libdir}/%{name}/engines/JavaScriptCore.so +%{_libdir}/%{name}/%{version}/engines/JavaScriptCore.so %{?_with_xulrunner: %files -n lib%{name}-SpiderMonkey %defattr(-,root,root,-) -%{_libdir}/%{name}/engines/SpiderMonkey.so +%{_libdir}/%{name}/%{version}/engines/SpiderMonkey.so } %{?_with_v8: %files -n lib%{name}-V8 %defattr(-,root,root,-) -%{_libdir}/%{name}/engines/V8.so +%{_libdir}/%{name}/%{version}/engines/V8.so } %files python @@ -181,6 +172,11 @@ rm -rf $RPM_BUILD_ROOT %{python_sitearch}/%{name}.so %changelog +* Sun Feb 06 2011 Nathaniel McCallum - 0.1.4-1 +- Update to 0.1.4 +- Remove upstreamed fixes +- Re-enable smp build + * Fri Dec 24 2010 Dan HorĂ¡k - 0.1.3-7 - v8 is available on selected architectures diff --git a/sources b/sources index 29457ee..b5ce80b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -01a907b6b94ff11cb5f1e2d9f5a51a9a natus-0.1.3.tar.gz +c5d1196eb5c746d087f55941f3e4cf5f natus-0.1.4.tar.gz