[packages/mozjs24] - make sure we're using correct virtualenv flavor - fix syntax error in version extraction script -

[baggins]

commit ae88bea3a80c4c0f3101b6d88a8f5fddd20daae5
Author: Jan Rękorajski <baggins at pld-linux.org>
Date:   Tue Oct 18 20:36:28 2016 +0200

    - make sure we're using correct virtualenv flavor
    - fix syntax error in version extraction script
    - rel 3

 mozjs24-system-virtualenv.patch |  2 +-
 mozjs24.spec                    |  2 ++
 perl.patch                      | 11 +++++++++++
 3 files changed, 14 insertions(+), 1 deletion(-)
---
diff --git a/mozjs24.spec b/mozjs24.spec
index 73f70e3..2f918f6 100644
--- a/mozjs24.spec
+++ b/mozjs24.spec
@@ -10,6 +10,7 @@ Source0:	http://ftp.mozilla.org/pub/mozilla.org/js/mozjs-%{version}.tar.bz2
 # Source0-md5:	5db79c10e049a2dc117a6e6a3bc78a8e
 Patch0:		%{name}-system-virtualenv.patch
 Patch1:		Disable-js-JIT-on-x32.patch
+Patch2:		perl.patch
 URL:		http://www.mozilla.org/js/
 BuildRequires:	gcc-c++ >= 6:4.4
 BuildRequires:	libffi-devel >= 5:3.0.9
@@ -72,6 +73,7 @@ Statyczna wersja biblioteki JavaScript.
 %setup -q -n mozjs-%{version}
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
 
 %build
 cd js/src
diff --git a/mozjs24-system-virtualenv.patch b/mozjs24-system-virtualenv.patch
index 89efb6b..36a0115 100644
--- a/mozjs24-system-virtualenv.patch
+++ b/mozjs24-system-virtualenv.patch
@@ -6,7 +6,7 @@
          """Path to virtualenv's own populator script."""
 -        return os.path.join(self.topsrcdir, 'python', 'virtualenv',
 -            'virtualenv.py')
-+        return '/usr/bin/virtualenv'
++        return '/usr/bin/virtualenv-2'
  
      @property
      def python_path(self):
diff --git a/perl.patch b/perl.patch
new file mode 100644
index 0000000..0115168
--- /dev/null
+++ b/perl.patch
@@ -0,0 +1,11 @@
+--- mozjs17.0.0/js/src/config/milestone.pl~	2013-02-11 23:33:22.000000000 +0100
++++ mozjs17.0.0/js/src/config/milestone.pl	2016-10-18 20:12:20.567112653 +0200
+@@ -55,7 +55,7 @@
+ #
+ my $milestone = Moz::Milestone::getOfficialMilestone($MILESTONE_FILE);
+ 
+-if (defined(@TEMPLATE_FILE)) {
++if (@TEMPLATE_FILE) {
+   my $TFILE;
+ 
+   foreach $TFILE (@TEMPLATE_FILE) {
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/mozjs24.git/commitdiff/ae88bea3a80c4c0f3101b6d88a8f5fddd20daae5