[v8/master-restart] Fix jsmin.py which breaks nodejs building.

Matej Cepl mcepl at fedoraproject.org
Sat Aug 27 21:04:35 UTC 2011


commit 7bec737effd37c0aca2ac4b07092c949b5a510ea
Author: Matěj Cepl <mcepl at redhat.com>
Date:   Sat Aug 27 23:03:55 2011 +0200

    Fix jsmin.py which breaks nodejs building.

 v8.spec |   12 +++++++-----
 1 files changed, 7 insertions(+), 5 deletions(-)
---
diff --git a/v8.spec b/v8.spec
index 0313774..172adaa 100644
--- a/v8.spec
+++ b/v8.spec
@@ -17,7 +17,7 @@
 
 Name:		v8
 Version:	%{somajor}.%{sominor}.%{sobuild}
-Release:	3%{?dist}
+Release:	4%{?dist}
 Summary:	JavaScript Engine
 Group:		System Environment/Libraries
 License:	BSD
@@ -26,13 +26,14 @@ URL:		http://code.google.com/p/v8
 # Checkout script is Source1
 Source0:	v8-%{version}.tar.bz2
 Source1:	v8-daily-tarball.sh
-Source2: v8-js2c
 # Enable experimental i18n extension that chromium needs
 Patch0:		v8-3.3.10-enable-experimental.patch
 # Disable comparison check that gcc 4.5 thinks is always false
 Patch1:		v8-3.2.10-always-false.patch
 # Fix language-matcher.cc compile
 Patch2:		v8-3.3.10-language-matcher-fix.patch
+# Remove unnecessary shebangs
+Patch3:  v8-2.5.9-shebangs.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 ExclusiveArch:	%{ix86} x86_64 arm
 BuildRequires:	scons, readline-devel, libicu-devel
@@ -55,6 +56,7 @@ Development headers and libraries for v8.
 %patch0 -p1 -b .experimental
 %patch1 -p1 -b .always-false
 %patch2 -p1 -b .fix
+%patch3 -p1 -b .shebang
 
 # -fno-strict-aliasing is needed with gcc 4.4 to get past some ugly code
 PARSED_OPT_FLAGS=`echo \'$RPM_OPT_FLAGS -fPIC -fno-strict-aliasing -Wno-unused-parameter -Wno-unused-but-set-variable\'| sed "s/ /',/g" | sed "s/',/', '/g"`
@@ -149,8 +151,6 @@ chmod -x %{buildroot}%{_includedir}/v8/extensions/experimental/*.h
 # install Python JS minifier scripts for nodejs
 install -d %{buildroot}%{python_sitelib}
 install -p -m0744 tools/jsmin.py %{buildroot}%{python_sitelib}/
-install -p -m0744 tools/js2c.py %{buildroot}%{python_sitelib}/
-install -p %{SOURCE2} %{buildroot}%{_bindir}/js2c
 
 %clean
 rm -rf %{buildroot}
@@ -167,13 +167,15 @@ rm -rf %{buildroot}
 
 %files devel
 %defattr(-,root,root,-)
-%{_bindir}/js2c
 %{_includedir}/*.h
 %{_includedir}/v8/extensions/
 %{_libdir}/*.so
 %{python_sitelib}/j*.py*
 
 %changelog
+* Sat Aug 27 2011 Matěj Cepl <mcepl at redhat.com> - 3.3.10-4
+- Make jsmin.py working.
+
 * Wed Aug 24 2011 Matěj Cepl <mcepl at redhat.com> - 3.3.10-3
 - A bit of cleanup, include also /usr/bin/j2sc when we have it.
 - I don't see the reason why Python files shouldn't be in the


More information about the scm-commits mailing list