From de64ef64a92f470d82cf9685b81c5794b807abfe Mon Sep 17 00:00:00 2001
From: wk333 <13474090681@163.com>
Date: Wed, 3 Aug 2022 10:25:35 +0800
Subject: [PATCH] Rollback remove dist

---
 nodejs.spec | 25 ++++++++++++++-----------
 1 file changed, 14 insertions(+), 11 deletions(-)

diff --git a/nodejs.spec b/nodejs.spec
index cf83432..c8cbdb7 100644
--- a/nodejs.spec
+++ b/nodejs.spec
@@ -1,5 +1,5 @@
 %bcond_with bootstrap
-%global baserelease 2
+%global baserelease 3
 %{?!_pkgdocdir:%global _pkgdocdir %{_docdir}/%{name}-%{version}}
 %global nodejs_epoch 1
 %global nodejs_major 12
@@ -128,7 +128,7 @@ Provides: bundled(icu) = %{icu_version}
 Provides: bundled(uvwasi) = %{uvwasi_version}
 Provides: bundled(histogram) = %{histogram_version}
 Requires: (nodejs-packaging if rpm-build)
-Recommends: npm >= %{npm_epoch}:%{npm_version}-%{npm_release}
+Recommends: npm >= %{npm_epoch}:%{npm_version}-%{npm_release}%{?dist}
 
 %description
 Node.js is a platform built on Chrome's JavaScript runtime
@@ -140,7 +140,7 @@ real-time applications that run across distributed devices.
 %package devel
 Summary: JavaScript runtime - development headers
 Group: Development/Languages
-Requires: %{name}%{?_isa} = %{epoch}:%{nodejs_version}-%{nodejs_release}
+Requires: %{name}%{?_isa} = %{epoch}:%{nodejs_version}-%{nodejs_release}%{?dist}
 Requires: openssl-devel%{?_isa}
 Requires: zlib-devel%{?_isa}
 Requires: brotli-devel%{?_isa}
@@ -167,8 +167,8 @@ Provides: libv8_libbase.so.%{v8_major}
 Provides: libv8_libplatform.so.%{v8_major}
 %endif
 
-Provides: v8 = %{v8_epoch}:%{v8_version}-%{nodejs_release}
-Provides: v8%{?_isa} = %{v8_epoch}:%{v8_version}-%{nodejs_release}
+Provides: v8 = %{v8_epoch}:%{v8_version}-%{nodejs_release}%{?dist}
+Provides: v8%{?_isa} = %{v8_epoch}:%{v8_version}-%{nodejs_release}%{?dist}
 Obsoletes: v8 < 1:6.7.17-10
 
 %description libs
@@ -176,7 +176,7 @@ Libraries to support Node.js and provide stable v8 interfaces.
 
 %package full-i18n
 Summary: Non-English locale data for Node.js
-Requires: %{name}%{?_isa} = %{nodejs_epoch}:%{nodejs_version}-%{nodejs_release}
+Requires: %{name}%{?_isa} = %{nodejs_epoch}:%{nodejs_version}-%{nodejs_release}%{?dist}
 
 %description full-i18n
 Optional data files to provide full-icu support for Node.js. Remove this
@@ -187,7 +187,7 @@ Summary: v8 - development headers
 Epoch: %{v8_epoch}
 Version: %{v8_version}
 Release: %{v8_release}
-Requires: %{name}-devel%{?_isa} = %{nodejs_epoch}:%{nodejs_version}-%{nodejs_release}
+Requires: %{name}-devel%{?_isa} = %{nodejs_epoch}:%{nodejs_version}-%{nodejs_release}%{?dist}
 
 %description -n v8-devel
 Development headers for the v8 runtime.
@@ -200,8 +200,8 @@ Release: %{npm_release}
 
 Obsoletes: npm < 0:3.5.4-6
 Provides: npm = %{npm_epoch}:%{npm_version}
-Requires: nodejs = %{nodejs_epoch}:%{nodejs_version}-%{nodejs_release}
-Recommends: nodejs-docs = %{nodejs_epoch}:%{nodejs_version}-%{nodejs_release}
+Requires: nodejs = %{nodejs_epoch}:%{nodejs_version}-%{nodejs_release}%{?dist}
+Recommends: nodejs-docs = %{nodejs_epoch}:%{nodejs_version}-%{nodejs_release}%{?dist}
 Provides: npm(npm) = %{npm_version}
 
 %description -n npm
@@ -213,8 +213,8 @@ Summary: Node.js API documentation
 Group: Documentation
 BuildArch: noarch
 
-Conflicts: %{name} > %{nodejs_epoch}:%{nodejs_version}-%{nodejs_release}
-Conflicts: %{name} < %{nodejs_epoch}:%{nodejs_version}-%{nodejs_release}
+Conflicts: %{name} > %{nodejs_epoch}:%{nodejs_version}-%{nodejs_release}%{?dist}
+Conflicts: %{name} < %{nodejs_epoch}:%{nodejs_version}-%{nodejs_release}%{?dist}
 
 %description docs
 The API documentation for the Node.js JavaScript runtime.
@@ -487,6 +487,9 @@ end
 %{_pkgdocdir}/npm/docs
 
 %changelog
+* Wed Aug 03 2022 wangkai <wangkai385@h-partners.com> - 1:12.22.11-3
+- Rollback remove dist
+
 * Tue Aug 02 2022 wulei <wulei80@huawei.com> - 1:12.22.11-2
 - Dist is controlled by the version project, dist is deleted
 
-- 
Gitee