diff --git a/macros.nodejs b/macros.nodejs index f86891c..94eae4b 100644 --- a/macros.nodejs +++ b/macros.nodejs @@ -1,16 +1,17 @@ # nodejs binary %__nodejs %{_bindir}/node +# currently installed nodejs version +%nodejs_version %(%{__nodejs} -v | sed s/v//) +%_nodejs_major_version %(echo %{nodejs_version} | sed 's#^\\([0-9]\\+\\).*#\\1#') + # nodejs library directory -%nodejs_sitelib %{_prefix}/lib/node_modules +%nodejs_sitelib %{_prefix}/lib/node_modules_%{_nodejs_major_version} #arch specific library directory #for future-proofing only; we don't do multilib %nodejs_sitearch %{nodejs_sitelib} -# currently installed nodejs version -%nodejs_version %(%{__nodejs} -v | sed s/v//) - # symlink dependencies so `npm link` works # this should be run in every module's %%install section # pass --check to work in the current directory instead of the buildroot @@ -25,7 +26,7 @@ %nodejs_fixdep %{_rpmconfigdir}/nodejs-fixdep # patch package.json to set the package version -# e.g. `%%nodejs_setversion 1.2.3` +# e.g. `%%nodejs_setversion 1.2.3` %nodejs_setversion %{_rpmconfigdir}/nodejs-setversion # macro to filter unwanted provides from Node.js binary native modules