The package rpms/nodejs-bcrypt.git has added or updated architecture specific content in
its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/nodejs-bcrypt.git/commit/?id=6eb3....
Change:
+ExclusiveArch: %{nodejs_arches}
Thanks.
Full change:
============
commit 6eb3cb16d9f909fb5df561a90482fc1332a0ff24
Author: Tom Hughes <tom(a)compton.nu>
Date: Thu Feb 6 09:15:18 2020 +0000
Update to 3.0.8 upstream release
diff --git a/.gitignore b/.gitignore
index 53e1a96..9c481e6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
/bcrypt-0.8.7.tgz
/bcrypt-3.0.6.tgz
+/bcrypt-3.0.8.tgz
diff --git a/nodejs-bcrypt-pregyp.patch b/nodejs-bcrypt-pregyp.patch
new file mode 100644
index 0000000..6de95da
--- /dev/null
+++ b/nodejs-bcrypt-pregyp.patch
@@ -0,0 +1,62 @@
+commit 5c854ba39ef5cbb86a3863b173909afcfc3c7f7b
+Author: Tom Hughes <tom(a)compton.nu>
+Date: Thu Feb 6 09:06:41 2020 +0000
+
+ Patch out use of node-pre-gyp
+
+diff --git a/bcrypt.js b/bcrypt.js
+index fb08225..073b5e3 100644
+--- a/bcrypt.js
++++ b/bcrypt.js
+@@ -1,8 +1,7 @@
+ 'use strict';
+
+-var binary = require('node-pre-gyp');
+ var path = require('path');
+-var binding_path = binary.find(path.resolve(path.join(__dirname,
'./package.json')));
++var binding_path = path.join(__dirname, 'lib/binding/bcrypt_lib.node');
+ var bindings = require(binding_path);
+
+ var crypto = require('crypto');
+diff --git a/binding.gyp b/binding.gyp
+index f6536fc..232b444 100644
+--- a/binding.gyp
++++ b/binding.gyp
+@@ -8,7 +8,7 @@
+ 'src/bcrypt_node.cc'
+ ],
+ 'include_dirs' : [
+- "<!(node -e \"require('nan')\")"
++ "node_modules/nan"
+ ],
+ 'conditions': [
+ [ 'OS=="win"', {
+@@ -21,11 +21,11 @@
+ {
+ "target_name": "action_after_build",
+ "type": "none",
+- "dependencies": [ "<(module_name)" ],
++ "dependencies": [ "bcrypt_lib" ],
+ "copies": [
+ {
+- "files": [ "<(PRODUCT_DIR)/<(module_name).node" ],
+- "destination": "<(module_path)"
++ "files": [ "./build/Release/bcrypt_lib.node" ],
++ "destination": "./lib/binding/"
+ }
+ ]
+ }
+diff --git a/package.json b/package.json
+index a1f3ace..66f6e49 100644
+--- a/package.json
++++ b/package.json
+@@ -29,8 +29,7 @@
+ "install": "node-pre-gyp install --fallback-to-build"
+ },
+ "dependencies": {
+- "nan": "2.14.0",
+- "node-pre-gyp": "0.14.0"
++ "nan": "2.14.0"
+ },
+ "devDependencies": {
+ "nodeunit": "^0.11.3"
diff --git a/nodejs-bcrypt.spec b/nodejs-bcrypt.spec
index 40942a1..6afc6c8 100644
--- a/nodejs-bcrypt.spec
+++ b/nodejs-bcrypt.spec
@@ -1,27 +1,18 @@
%{?nodejs_find_provides_and_requires}
-%global packagename bcrypt
-%global enable_tests 0
+%global enable_tests 1
-Name: nodejs-bcrypt
-Version: 3.0.6
-Release: 3%{?dist}
+Name: nodejs-bcrypt
+Version: 3.0.8
+Release: 1%{?dist}
Summary: A bcrypt library for NodeJS
License: MIT
-URL:
https://github.com/ncb000gt/node.bcrypt.js
-Source0:
https://registry.npmjs.org/%{packagename}/-/%{packagename}-%{version}.tgz
-# This package ordinarily requires node-pre-gyp, but we don't have all those
-# dependencies in Fedora yet, so we'll use a creative patch to get around
-# that silly reuiqrement
-Patch1: nodejs-bcrypt_build-without-node-pre-gyp.patch
-
-
-%if 0%{?fedora} >= 19
-ExclusiveArch: %{nodejs_arches}
-%else
-ExclusiveArch: %{ix86} x86_64 %{arm}
-%endif
+URL:
https://www.npmjs.com/package/bcrypt
+Source0:
https://registry.npmjs.org/bcrypt/-/bcrypt-%{version}.tgz
+# Patch out use of node-pre-gyp
+Patch1: nodejs-bcrypt-pregyp.patch
+ExclusiveArch: %{nodejs_arches}
BuildRequires: nodejs-packaging
BuildRequires: node-gyp
@@ -39,9 +30,9 @@ A bcrypt library for NodeJS.
%prep
%autosetup -p 1 -n package
-%nodejs_fixdep bindings "^1.2.1"
%nodejs_fixdep --dev --move nan
-%nodejs_fixdep -r node-pre-gyp
+rm -rf node_modules
+
%build
%nodejs_symlink_deps --build
@@ -49,30 +40,33 @@ A bcrypt library for NodeJS.
node-gyp rebuild
rm -rf node_modules
-%install
-mkdir -p %{buildroot}%{nodejs_sitelib}/%{packagename}
-cp -pr package.json *.js lib/ build/ \
- %{buildroot}%{nodejs_sitelib}/%{packagename}
+%install
+mkdir -p %{buildroot}%{nodejs_sitelib}/bcrypt
+cp -pr package.json *.js lib build %{buildroot}%{nodejs_sitelib}/bcrypt
%nodejs_symlink_deps
+
%check
%nodejs_symlink_deps --check
-# Can no longer run this, due to npm(node-pre-gyp) missing
-#%%{__nodejs} -e 'require("./")'
+%{__nodejs} -e 'require("./")'
%if 0%{?enable_tests}
%{_bindir}/nodeunit test
%else
%{_bindir}/echo -e "\e[101m -=#=- Tests disabled -=#=- \e[0m"
%endif
+
%files
-%{!?_licensedir:%global license %doc}
%doc *.md examples/
%license LICENSE
-%{nodejs_sitelib}/%{packagename}
+%{nodejs_sitelib}/bcrypt
+
%changelog
+* Thu Feb 6 2020 Tom Hughes <tom(a)compton.nu> - 3.0.8-1
+- Update to 3.0.8 upstream release
+
* Wed Jan 29 2020 Fedora Release Engineering <releng(a)fedoraproject.org> - 3.0.6-3
- Rebuilt for
https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
diff --git a/nodejs-bcrypt_build-without-node-pre-gyp.patch
b/nodejs-bcrypt_build-without-node-pre-gyp.patch
deleted file mode 100644
index 834ed3a..0000000
--- a/nodejs-bcrypt_build-without-node-pre-gyp.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-diff --git a/binding.gyp b/binding.gyp
-index f6536fc..232b444 100644
---- a/binding.gyp
-+++ b/binding.gyp
-@@ -8,7 +8,7 @@
- 'src/bcrypt_node.cc'
- ],
- 'include_dirs' : [
-- "<!(node -e \"require('nan')\")"
-+ "node_modules/nan"
- ],
- 'conditions': [
- [ 'OS=="win"', {
-@@ -21,11 +21,11 @@
- {
- "target_name": "action_after_build",
- "type": "none",
-- "dependencies": [ "<(module_name)" ],
-+ "dependencies": [ "bcrypt_lib" ],
- "copies": [
- {
-- "files": [ "<(PRODUCT_DIR)/<(module_name).node" ],
-- "destination": "<(module_path)"
-+ "files": [ "./build/Release/bcrypt_lib.node" ],
-+ "destination": "./lib/binding/"
- }
- ]
- }
diff --git a/sources b/sources
index 846a150..81fa876 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (bcrypt-3.0.6.tgz) =
b5a0396c24df5deec55232aba0a932f445e9761915be1139a307f17cb62875bac0475525de3b8b98842621004ae0bf5ae41b94704e9caa6c13f836b6d2517db6
+SHA512 (bcrypt-3.0.8.tgz) =
8ca57a46f2e1237e934273c3bd416a0449c65fd73c75147280ac4266eec4f8c80b7ca65b9a65cbf1aeff48514ec87a0f357f6757cd5c2910b9b5b41fbc442da7