diff --git a/macros.nodejs b/macros.nodejs index f1762cb..75393a6 100644 --- a/macros.nodejs +++ b/macros.nodejs @@ -14,11 +14,11 @@ # symlink dependencies so `npm link` works # this should be run in every module's %%install section # pass the module name if the npm metadata is incorrect (e.g. multiple versions) -%nodejs_symlink_deps %{_libexecdir}/nodejs/nodejs-symlink-deps %{nodejs_sitelib} +%nodejs_symlink_deps %{_rpmconfigdir}/nodejs-symlink-deps %{nodejs_sitelib} # patch package.json to fix a dependency # see `man npm-json` for details on writing dependencies for package.json files # e.g. `%%nodejs_fixdep frobber` makes any version of frobber do # `%%nodejs_fixdep frobber '>1.0'` requires frobber > 1.0 # `%%nodejs_fixdep -r frobber removes the frobber dep -%nodejs_fixdep %{_libexecdir}/nodejs/nodejs-fixdep +%nodejs_fixdep %{_rpmconfigdir}/nodejs-fixdep diff --git a/nodejs.spec b/nodejs.spec index 40f84df..138a0f2 100644 --- a/nodejs.spec +++ b/nodejs.spec @@ -132,8 +132,8 @@ install -Dpm0644 %{SOURCE1} %{buildroot}%{_sysconfdir}/rpm/macros.nodejs install -Dpm0644 %{SOURCE2} %{buildroot}%{_rpmconfigdir}/fileattrs/nodejs.attr install -pm0755 %{SOURCE3} %{buildroot}%{_rpmconfigdir}/nodejs.prov install -pm0755 %{SOURCE4} %{buildroot}%{_rpmconfigdir}/nodejs.req -install -Dpm0755 %{SOURCE5} %{buildroot}%{_libexecdir}/nodejs/nodejs-symlink-deps -install -pm0755 %{SOURCE6} %{buildroot}%{_libexecdir}/nodejs/nodejs-fixdep +install -pm0755 %{SOURCE5} %{buildroot}%{_rpmconfigdir}/nodejs-symlink-deps +install -pm0755 %{SOURCE6} %{buildroot}%{_rpmconfigdir}/nodejs-fixdep #install documentation mkdir -p %{buildroot}%{_defaultdocdir}/%{name}-docs-%{version}/html @@ -174,7 +174,6 @@ cp -p common.gypi %{buildroot}%{_datadir}/node - nodejs-symlink-deps: don't create an empty node_modules dir when a module has no dependencies - nodes-fixdep: support adding deps when none exist -- use libexecdir for RPM helper scripts (per packaging guidelines discussion) - Add the full set of headers usually bundled with node as deps to nodejs-devel. This way `npm install` for native modules that assume the stuff bundled with node exists will usually "just work".