diff --git a/nodejs-packaging.spec b/nodejs-packaging.spec index db55720..7441bfe 100644 --- a/nodejs-packaging.spec +++ b/nodejs-packaging.spec @@ -19,8 +19,6 @@ Source0007: nodejs-symlink-deps Source0008: nodejs.attr Source0009: nodejs.prov Source0010: nodejs.req -Source0011: nodejs_abi.attr -Source0012: nodejs_abi.req Source0111: nodejs-packaging-bundler @@ -29,9 +27,6 @@ Source0101: test.tar.gz BuildRequires: python3 -# Several of the macros require the /usr/bin/node command, so we need to -# ensure that it is present when packaging. -Requires: /usr/bin/node Requires: redhat-rpm-config %description @@ -65,10 +60,8 @@ popd %install install -Dpm0644 macros.nodejs %{buildroot}%{macrosdir}/macros.nodejs install -Dpm0644 nodejs.attr %{buildroot}%{_rpmconfigdir}/fileattrs/nodejs.attr -install -Dpm0644 nodejs_abi.attr %{buildroot}%{_rpmconfigdir}/fileattrs/nodejs_abi.attr install -pm0755 nodejs.prov %{buildroot}%{_rpmconfigdir}/nodejs.prov install -pm0755 nodejs.req %{buildroot}%{_rpmconfigdir}/nodejs.req -install -pm0755 nodejs_abi.req %{buildroot}%{_rpmconfigdir}/nodejs_abi.req install -pm0755 nodejs-symlink-deps %{buildroot}%{_rpmconfigdir}/nodejs-symlink-deps install -pm0755 nodejs-fixdep %{buildroot}%{_rpmconfigdir}/nodejs-fixdep install -pm0755 nodejs-setversion %{buildroot}%{_rpmconfigdir}/nodejs-setversion diff --git a/nodejs_abi.attr b/nodejs_abi.attr deleted file mode 100644 index d161239..0000000 --- a/nodejs_abi.attr +++ /dev/null @@ -1,2 +0,0 @@ -%__nodejs_native_requires %{_rpmconfigdir}/nodejs_abi.req -%__nodejs_native_path ^/usr/lib.*/node_modules/.*\\.node$ diff --git a/nodejs_abi.req b/nodejs_abi.req deleted file mode 100755 index a33a7b5..0000000 --- a/nodejs_abi.req +++ /dev/null @@ -1,8 +0,0 @@ -#!/bin/bash - -# Get the ABI version -abi_version=$(/usr/bin/node -p process.versions.modules) - -# Write out the Virtual Requires -echo "nodejs(abi) = ${abi_version}" -