From da3f7c98fb36600a86f0c3d3e418c521e282b735 Mon Sep 17 00:00:00 2001 From: Stephen Gallagher Date: Thu, 9 Jun 2022 12:45:46 -0400 Subject: [PATCH] Fix conflict between x86_64 and i686 installs of nodejs-devel Signed-off-by: Stephen Gallagher --- nodejs.spec | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/nodejs.spec b/nodejs.spec index ae0c979..b212905 100644 --- a/nodejs.spec +++ b/nodejs.spec @@ -40,7 +40,7 @@ # This is used by both the nodejs package and the npm subpackage that # has a separate version - the name is special so that rpmdev-bumpspec # will bump this rather than adding .1 to the end. -%global baserelease 1 +%global baserelease 2 %{?!_pkgdocdir:%global _pkgdocdir %{_docdir}/%{name}-%{version}} @@ -523,6 +523,10 @@ rm -f %{buildroot}%{_pkgdocdir}/html/nodejs.1 mkdir -p %{buildroot}%{_datadir}/node cp -p common.gypi %{buildroot}%{_datadir}/node +# The config.gypi file is platform-dependent, so rename it to not conflict +mv %{buildroot}%{_includedir}/node/config.gypi \ + %{buildroot}%{_includedir}/node/config-%{_arch}.gypi + # Install the GDB init tool into the documentation directory mv %{buildroot}/%{_datadir}/doc/node/gdbinit %{buildroot}/%{_pkgdocdir}/gdbinit @@ -691,6 +695,9 @@ end %changelog +* Thu Jun 09 2022 Stephen Gallagher - 1:18.3.0-2 +- Fix conflict between x86_64 and i686 installs of nodejs-devel + * Tue Jun 07 2022 Stephen Gallagher - 1:18.3.0-1 - Update to Node.js 18.3.0 - https://github.com/nodejs/node/blob/master/doc/changelogs/CHANGELOG_V18.md#18.3.0