From 7cfea04abbdb88eff4133101f06fa54ac220c309 Mon Sep 17 00:00:00 2001 From: Stephen Gallagher Date: Fri, 2 Aug 2019 08:35:06 -0400 Subject: [PATCH] Fix v8-devel release field The current approach would result in reusing the same ENVR for v8-devel any time the nodejs release field was reused and the v8 version provided did not change. This is the same approach we use for NPM to avoid this problem. We need to bump the v8-devel epoch because v8-devel-7.5.288.22-2.fc31 > v8-devel-7.5.288.22-1.12.7.0.1.fc31 Signed-off-by: Stephen Gallagher --- nodejs.spec | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/nodejs.spec b/nodejs.spec index a96b93d..5e9c9eb 100644 --- a/nodejs.spec +++ b/nodejs.spec @@ -8,7 +8,7 @@ # This is used by both the nodejs package and the npm subpackage thar # 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}} @@ -30,7 +30,7 @@ # == Bundled Dependency Versions == # v8 - from deps/v8/include/v8-version.h # Epoch is set to ensure clean upgrades from the old v8 package -%global v8_epoch 1 +%global v8_epoch 2 %global v8_major 7 %global v8_minor 5 %global v8_build 288 @@ -38,6 +38,7 @@ # V8 presently breaks ABI at least every x.y release while never bumping SONAME %global v8_abi %{v8_major}.%{v8_minor} %global v8_version %{v8_major}.%{v8_minor}.%{v8_build}.%{v8_patch} +%global v8_release %{nodejs_epoch}.%{nodejs_major}.%{nodejs_minor}.%{nodejs_patch}.%{nodejs_release} # c-ares - from deps/cares/include/ares_version.h # https://github.com/nodejs/node/pull/9332 @@ -285,6 +286,7 @@ Libraries to support Node.js and provide stable v8 interfaces. Summary: v8 - development headers Epoch: %{v8_epoch} Version: %{v8_version} +Release: %{v8_release}%{?dist} Requires: %{name}-devel%{?_isa} = %{epoch}:%{nodejs_version}-%{nodejs_release}%{?dist} %description -n v8-devel @@ -591,6 +593,9 @@ end %{_pkgdocdir}/npm/doc %changelog +* Fri Aug 02 2019 Stephen Gallagher - 1:12.7.0-2 +- Change v8-devel release field to avoid duplicated package names + * Thu Aug 01 2019 Stephen Gallagher - 1:12.7.0-1 - Update to 12.7.0 - https://nodejs.org/en/blog/release/v12.7.0/