Copy headers on install instead of symlinking. Release 2

diff --git a/mozjs38-copy-headers.patch b/mozjs38-copy-headers.patch
new file mode 100644 (file)
index 0000000..7f352a7
--- /dev/null
+++ b/mozjs38-copy-headers.patch
@@ -0,0 +1,20 @@
+Description: Copy headers on install instead of symlinking
+Author: Rico Tzschichholz <ricotz@ubuntu.com>
+Forwarded: no
+Last-Update: 2014-10-29
+
+---
+
+Index: b/python/mozbuild/mozbuild/backend/recursivemake.py
+===================================================================
+--- a/python/mozbuild/mozbuild/backend/recursivemake.py
++++ b/python/mozbuild/mozbuild/backend/recursivemake.py
+@@ -796,7 +796,7 @@
+             return
+ 
+         for source, dest, _ in self._walk_hierarchy(obj, exports):
+-            self._install_manifests['dist_include'].add_symlink(source, dest)
++            self._install_manifests['dist_include'].add_copy(source, dest)
+ 
+             if not os.path.exists(source):
+                 raise Exception('File listed in EXPORTS does not exist: %s' % source)

diff --git a/mozjs38.spec b/mozjs38.spec
index a8679e75baa25ad63a05632b6bc71a5e6d5f6c13..6597ce4b6d997a2d261c7abbfadd1461397e53c0 100644 (file)
--- a/mozjs38.spec
+++ b/mozjs38.spec
@@ -2,7 +2,7 @@ Summary:        SpiderMonkey 38 - JavaScript implementation
 Summary(pl.UTF-8):     SpiderMonkey 38 - implementacja języka JavaScript
 Name:          mozjs38
 Version:       38.8.0
 Summary(pl.UTF-8):     SpiderMonkey 38 - implementacja języka JavaScript
 Name:          mozjs38
 Version:       38.8.0

-Release:       1
+Release:       2

 License:       MPL v2.0
 Group:         Libraries
 Source0:       https://ftp.mozilla.org/pub/firefox/releases/%{version}esr/source/firefox-%{version}esr.source.tar.bz2
 License:       MPL v2.0
 Group:         Libraries
 Source0:       https://ftp.mozilla.org/pub/firefox/releases/%{version}esr/source/firefox-%{version}esr.source.tar.bz2


@@ -13,6 +13,7 @@ Patch2:               %{name}-1269317.patch
 Patch3:                %{name}-system-virtualenv.patch
 Patch4:                Disable-js-JIT-on-x32.patch
 Patch5:                %{name}-x32.patch
 Patch3:                %{name}-system-virtualenv.patch
 Patch4:                Disable-js-JIT-on-x32.patch
 Patch5:                %{name}-x32.patch

+Patch6:                %{name}-copy-headers.patch

 URL:           https://developer.mozilla.org/en-US/docs/Mozilla/Projects/SpiderMonkey/Releases/38
 BuildRequires: libffi-devel >= 5:3.0.9
 BuildRequires: libstdc++-devel >= 6:4.4
 URL:           https://developer.mozilla.org/en-US/docs/Mozilla/Projects/SpiderMonkey/Releases/38
 BuildRequires: libffi-devel >= 5:3.0.9
 BuildRequires: libstdc++-devel >= 6:4.4


@@ -65,6 +66,7 @@ Pliki nagłówkowe do biblioteki JavaScript.
 %patch3 -p1
 %patch4 -p1
 %patch5 -p1
 %patch3 -p1
 %patch4 -p1
 %patch5 -p1

+%patch6 -p1

 
 cd js/src
 
 
 cd js/src