commit 858b5dea498d343d44dfe363b1791f58e5232733
Author: Elan Ruusamäe <[email protected]>
Date: Mon Apr 8 21:25:27 2013 +0300
up to 0.0.10
load-native.patch | 10 ++++++++++
nodejs-dbus.spec | 41 +++++++++++++++++++++++++----------------
2 files changed, 35 insertions(+), 16 deletions(-)
---
diff --git a/nodejs-dbus.spec b/nodejs-dbus.spec
index bf92f1a..08a6782 100644
--- a/nodejs-dbus.spec
+++ b/nodejs-dbus.spec
@@ -5,21 +5,27 @@
%define pkg dbus
Summary: D-Bus binding for node.js
Name: nodejs-%{pkg}
-Version: 0.0.4
-Release: 2
+Version: 0.0.10
+Release: 1
License: MIT
Group: Development/Libraries
-URL: https://github.com/Shouqun/node-dbus
Source0: http://registry.npmjs.org/dbus/-/%{pkg}-%{version}.tgz
-# Source0-md5: 1a31a9aca3367897684a491a548d1f08
+# Source0-md5: 6af3be618225f5596bd9778ebd90b85a
+Patch0: load-native.patch
+URL: https://github.com/Shouqun/node-dbus
BuildRequires: dbus-devel
BuildRequires: dbus-glib-devel
BuildRequires: expat-devel
+BuildRequires: nodejs >= 0.8
BuildRequires: nodejs-devel
-BuildRequires: rpmbuild(macros) >= 1.634
-Requires: nodejs
+BuildRequires: nodejs-gyp
+BuildRequires: rpmbuild(macros) >= 1.657
+BuildRequires: sed >= 4.0
+Requires: nodejs >= 0.8
+Requires: nodejs-gcontext >= 0.0.2
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
+# redefine for arch specific
%define nodejs_libdir %{_libdir}/node
%description
@@ -27,31 +33,33 @@ D-Bus binding for node.js.
Has the following capabilities:
- call D-Bus methods
+- asynchronous method call
- receive D-Bus signals
- export D-Bus services
%prep
%setup -qc
mv package/* .
+%patch0 -p1
+
+rm lib/.travis.yml
%build
-NODE_PATH=%{nodejs_libdir}/%{pkg} \
-node-waf configure build
+node-gyp configure --nodedir=/usr/src/nodejs --gyp=/usr/bin/gyp
+node-gyp build --jobs=%{?__jobs} --verbose
%if %{with tests}
-NODE_PATH=lib node -e 'require("%{pkg}")'
+node -e 'require("./build/Release/%{pkg}")'
%endif
%install
rm -rf $RPM_BUILD_ROOT
-node-waf install \
- --destdir=$RPM_BUILD_ROOT
-
install -d $RPM_BUILD_ROOT%{nodejs_libdir}/%{pkg}
-cp -a lib package.json $RPM_BUILD_ROOT%{nodejs_libdir}/%{pkg}
+cp -pr lib package.json $RPM_BUILD_ROOT%{nodejs_libdir}/%{pkg}
+install -p build/Release/%{pkg}.node $RPM_BUILD_ROOT%{nodejs_libdir}/%{pkg}
-# waf installed to wrong dir
-rm $RPM_BUILD_ROOT%{nodejs_libdir}/%{pkg}/dbus.node
+install -d $RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version}
+cp -a examples/* $RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version}
%clean
rm -rf $RPM_BUILD_ROOT
@@ -64,4 +72,5 @@ rm -rf $RPM_BUILD_ROOT
%dir %{nodejs_libdir}/%{pkg}/lib
%{nodejs_libdir}/%{pkg}/lib/dbus.js
%{nodejs_libdir}/%{pkg}/lib/dbus_register.js
-%attr(755,root,root) %{nodejs_libdir}/%{pkg}/lib/%{pkg}.node
+%attr(755,root,root) %{nodejs_libdir}/%{pkg}/%{pkg}.node
+%{_examplesdir}/%{name}-%{version}
diff --git a/load-native.patch b/load-native.patch
new file mode 100644
index 0000000..316a0f4
--- /dev/null
+++ b/load-native.patch
@@ -0,0 +1,10 @@
+--- nodejs-dbus-0.0.10/lib/dbus.js~ 2012-12-15 11:17:58.000000000 +0200
++++ nodejs-dbus-0.0.10/lib/dbus.js 2013-04-08 21:06:26.660486280 +0300
+@@ -1,6 +1,6 @@
+ var util = require('util');
+ var EventEmitter = require('events').EventEmitter;
+-var dbuslib = require('../build/Release/dbus.node');
++var dbuslib = require('./dbus.node');
+ var GContext = require('gcontext');
+
+ function DBusConnection() {
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/nodejs-dbus.git/commitdiff/858b5dea498d343d44dfe363b1791f58e5232733
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
