rpms/nodejs20
7
0
Fork 0
Code Issues Pull Requests Releases Activity

revert to %{_rpmconfigdir} for RPM helper scripts

Browse Source 
per discussion with wider FPC
This commit is contained in:
T.C. Hollingsworth 2013-01-23 12:50:13 -07:00
parent 4e5a2f6e67
commit a3faf37d42
2 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
macros.nodejs
View File

@ -14,11 +14,11 @@
# symlink dependencies so `npm link` works # symlink dependencies so `npm link` works
# this should be run in every module's %%install section # this should be run in every module's %%install section
# pass the module name if the npm metadata is incorrect (e.g. multiple versions) # 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 # patch package.json to fix a dependency
# see `man npm-json` for details on writing dependencies for package.json files # see `man npm-json` for details on writing dependencies for package.json files
# e.g. `%%nodejs_fixdep frobber` makes any version of frobber do # e.g. `%%nodejs_fixdep frobber` makes any version of frobber do
# `%%nodejs_fixdep frobber '>1.0'` requires frobber > 1.0 # `%%nodejs_fixdep frobber '>1.0'` requires frobber > 1.0
# `%%nodejs_fixdep -r frobber removes the frobber dep # `%%nodejs_fixdep -r frobber removes the frobber dep
%nodejs_fixdep %{_libexecdir}/nodejs/nodejs-fixdep %nodejs_fixdep %{_rpmconfigdir}/nodejs-fixdep

5
nodejs.spec
View File

@ -132,8 +132,8 @@ install -Dpm0644 %{SOURCE1} %{buildroot}%{_sysconfdir}/rpm/macros.nodejs
install -Dpm0644 %{SOURCE2} %{buildroot}%{_rpmconfigdir}/fileattrs/nodejs.attr install -Dpm0644 %{SOURCE2} %{buildroot}%{_rpmconfigdir}/fileattrs/nodejs.attr
install -pm0755 %{SOURCE3} %{buildroot}%{_rpmconfigdir}/nodejs.prov install -pm0755 %{SOURCE3} %{buildroot}%{_rpmconfigdir}/nodejs.prov
install -pm0755 %{SOURCE4} %{buildroot}%{_rpmconfigdir}/nodejs.req install -pm0755 %{SOURCE4} %{buildroot}%{_rpmconfigdir}/nodejs.req
install -Dpm0755 %{SOURCE5} %{buildroot}%{_libexecdir}/nodejs/nodejs-symlink-deps install -pm0755 %{SOURCE5} %{buildroot}%{_rpmconfigdir}/nodejs-symlink-deps
install -pm0755 %{SOURCE6} %{buildroot}%{_libexecdir}/nodejs/nodejs-fixdep install -pm0755 %{SOURCE6} %{buildroot}%{_rpmconfigdir}/nodejs-fixdep
#install documentation #install documentation
mkdir -p %{buildroot}%{_defaultdocdir}/%{name}-docs-%{version}/html 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 - nodejs-symlink-deps: don't create an empty node_modules dir when a module
has no dependencies has no dependencies
- nodes-fixdep: support adding deps when none exist - 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. - 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 This way `npm install` for native modules that assume the stuff bundled with
node exists will usually "just work". node exists will usually "just work".