[packages/nodejs-bindings] unshift module topdir into loadpath

glen glen at pld-linux.org
Sun Apr 7 19:35:50 CEST 2013


commit d18ec6634c99523da5431fef423f291e2114e1dd
Author: Elan Ruusamäe <glen at delfi.ee>
Date:   Sun Apr 7 20:35:15 2013 +0300

    unshift module topdir into loadpath

 load-path.patch      | 11 +++++++++++
 nodejs-bindings.spec |  5 +++--
 2 files changed, 14 insertions(+), 2 deletions(-)
---
diff --git a/nodejs-bindings.spec b/nodejs-bindings.spec
index 693c740..93abc05 100644
--- a/nodejs-bindings.spec
+++ b/nodejs-bindings.spec
@@ -8,6 +8,7 @@ Group:		Development/Libraries
 URL:		https://github.com/TooTallNate/node-bindings
 Source0:	http://registry.npmjs.org/bindings/-/%{pkg}-%{version}.tgz
 # Source0-md5:	52921674f0d3a9f69f058f99fa12847d
+Patch0:		load-path.patch
 BuildRequires:	rpmbuild(macros) >= 1.634
 BuildRequires:	sed >= 4.0
 Requires:	nodejs
@@ -31,12 +32,12 @@ would be built at, and returns the first one that loads successfully.
 %prep
 %setup -qc
 mv package/* .
+%patch0 -p1
 
 %install
 rm -rf $RPM_BUILD_ROOT
-
 install -d $RPM_BUILD_ROOT%{nodejs_libdir}/%{pkg}
-cp -pr bindings.js package.json $RPM_BUILD_ROOT%{nodejs_libdir}/%{pkg}
+cp -p bindings.js package.json $RPM_BUILD_ROOT%{nodejs_libdir}/%{pkg}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
diff --git a/load-path.patch b/load-path.patch
new file mode 100644
index 0000000..bbf3797
--- /dev/null
+++ b/load-path.patch
@@ -0,0 +1,11 @@
+--- nodejs-bindings-1.0.0/bindings.js~	2012-07-10 20:54:35.000000000 +0300
++++ nodejs-bindings-1.0.0/bindings.js	2013-04-07 20:29:01.117914415 +0300
+@@ -16,6 +16,8 @@
+       , version: process.versions.node
+       , bindings: 'bindings.node'
+       , try: [
++          // rpm installed binding
++          [ 'module_root', 'bindings' ],
+           // node-gyp's linked version in the "build" dir
+           [ 'module_root', 'build', 'bindings' ]
+           // node-waf and gyp_addon (a.k.a node-gyp)
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/nodejs-bindings.git/commitdiff/d18ec6634c99523da5431fef423f291e2114e1dd



More information about the pld-cvs-commit mailing list