From c3676e0ebbb1245a90f9cf6d2f5939258316d8db21b5003ff3c15db1e3b33c87 Mon Sep 17 00:00:00 2001 From: Adam Majer Date: Tue, 5 Sep 2023 11:21:21 +0000 Subject: [PATCH] - nodejs.keyring: updated to include current upstream releasers OBS-URL: https://build.opensuse.org/package/show/devel:languages:nodejs/nodejs20?expand=0&rev=30 --- nodejs.keyring | Bin 55415 -> 58457 bytes nodejs20.changes | 1 + nodejs20.spec | 64 ++++++++++++++++++----------------------------- 3 files changed, 25 insertions(+), 40 deletions(-) diff --git a/nodejs.keyring b/nodejs.keyring index dddabb788b530af43efb1192a67c711ebdb15ab4745481faf99ca749afd7993d..716fe6a0508ecdc95d63d4bc91aa593b7fd0865abdc82862ae1efb2954b9d037 100644 GIT binary patch delta 2552 zcmZ{kc{CJk8;57c%wP;-HzGUnj-^7`NmFu+VG= z1gG$TrDn?D%h(SxoD<89U9au7j*I;yfZ*SqPWBAdu^MLj`&#R&fkpQSmzb@)NIp9# z1IGyZ26Pt7PS~+bjtL`M$out>avcfF6iG$Btl^a*7@N7y~s6?86<7ieopW163>H5aNslK&x+dHH2WzAZh6`Z#BwS%0O1^>SAQ@M?fJ_sqCKeUWQJ=fR4gI;oUah z)uE^Di({ikdfFElEY25|t}C$bm@CJ{w&0^25{PP#zQ$fhADa>yeg4{imDuy8`nLN#t(vo@jJSlzcIMg-G_k)HexTJmo=?l$Z0N$NZ6mL>ciJ?4^K$mTv?MqizwJ%DAjc)hBTFssaj0RiQmKz77IqDwd+RBdXE6AVQpZN6?iT}{D&7)rL z^b*_Yo`y;i#RZ1lXs38aY>&2;bO(BZqJoWdu4B?7ex?;~{ z7GV=yh0{`)0Y(759~oW)4BGcDzS}XKsD4tw5@&9(>okzyOi(_fv?Za(1rKf%SyUg3 zXgE2r4W}~KXGIo}=Yf9zIbwyv*PP7n?*sg3H`WjnconG)VZx?Om~S$2-A zffGlNhdn#TQmdkQVa-2|Wk`BvvuQS=T%fB^np#8%ZbGDmrb?3Xaw<+CSOkE=7Jt{o zJ6O1#F@0ifH`5NS$gptAV!}_;E6MZOEBi)ct3UZ%AD!0?wag>j5oA-=zQa&V++dBR zSM-JN{eob4En~c=cGPr?SlS0ywm!|f>? zSu0mQ6HV3aCKnRB1H|93CfFPQ7N^aH4+xh90I>d8An>q#8i*DeBIK{Gub@O!u@n@- z%8}Q;M8sbc#Jf?GT8=athsqikRRf#`Em;6rLm|Q$w|ILc@3Vn+==}aCzS*Td8|onW z8;rz$@J_5X=ABBn+Wm4n-QtU> z-A~a8l1ApP+>hcXaRhy&kEWpO`Fmk0EnPc9dip#X8n-vxU8ZHdX))3l&2P*08!yb@ zG4Zm~#x+Cr7q2*9xT%Oq36u-AEq^i0xFL5{G6QnZysL|;Q1DO*$U=YTo|s)!Mb8e| zZsy&#W)v3H+LMyd#y3!6mF^lM2OG36uC7NA57_}IGWwo@USdYKys_8-F)g>l0poYa z5Bq!8!}?;paf#=Xqj~1BYZNuWj|MC?RORf(dzI5#U3;Z40hl7ccUh%nenV7^a%N=U*Mzu*P`k=y% zO^`554_s6sa=IZUHS+`ua`&T3P-aouUKqC-k8%NfHPy!Z2z(n zW$sY#(|%a0YIS&gQ0@=R+QMaxb{H%RDf*BY zEsQigGl?%7k$pK=*As;`b`qC6pgCoY`=^8!nTRR7P;wBQ(~Y?%5$m_3zZO@Au#N9J zaVX;e{gyp}=;IH{U>@`Hp`LV<2)yg^{Gy>s)9FqM)|Z*-svV+B8Kc%oL7|Rc3){5` z-k2hT#;4-oFP~yXgbDUcXKYXih?2TWtKtN6z(#{r7x<%ui=6ki6EHj;MnkNq9 zwS=tr*iJslNP+zO?^@J;r{#wIPMdid2sw)TlubCY-Er_Pwc883>9LKK})n9-LpRRx#GFdu#=4mOiy{df8Q0DYyP AMgRZ+ delta 60 zcmV-C0K@;;$OHGV1F%avlXK4^vu!&1A+yb2R|B(aWf1`kB>(_taAyGlV>NDOlbxL# Sv!-Um2D4#s;Q diff --git a/nodejs20.changes b/nodejs20.changes index 0237d61..6b89b0b 100644 --- a/nodejs20.changes +++ b/nodejs20.changes @@ -5,6 +5,7 @@ Tue Sep 5 09:29:49 UTC 2023 - Adam Majer - 20.6.0 * add support for .env files to configure envrionment variables * import.meta.resolve unflagged * deps: npm updated to 9.8.1 +- nodejs.keyring: updated to include current upstream releasers ------------------------------------------------------------------- Fri Aug 25 14:34:21 UTC 2023 - Adam Majer diff --git a/nodejs20.spec b/nodejs20.spec index d664994..1c5a93d 100644 --- a/nodejs20.spec +++ b/nodejs20.spec @@ -1,7 +1,7 @@ # # spec file for package nodejs20 # -# Copyright (c) 2022 SUSE LLC +# Copyright (c) 2023 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -15,17 +15,7 @@ # Please submit bugfixes or comments via https://bugs.opensuse.org/ # -########################################################### -# -# WARNING! WARNING! WARNING! WARNING! WARNING! WARNING! -# -# This spec file is generated from a template hosted at -# https://github.com/AdamMajer/nodejs-packaging -# -########################################################### -# Fedora doesn't have rpm-config-SUSE which provides -# ext_man in /usr/lib/rpm/macros.d/macros.obs %if 0%{?fedora_version} %define ext_man .gz %endif @@ -129,12 +119,12 @@ Source1: https://nodejs.org/dist/v%{version}/SHASUMS256.txt Source2: https://nodejs.org/dist/v%{version}/SHASUMS256.txt.sig Source3: nodejs.keyring -# Python 3.4 compatible node-gyp -### https://github.com/nodejs/node-gyp.git -### git archive v7.1.2 | xz > node-gyp_7.1.2.tar.xz -Source5: node-gyp_7.1.2.tar.xz -# Only required to run unit tests in NodeJS 10+ -Source10: update_npm_tarball.sh +# Python 3.4 compatible node-gyp +### https://github.com/nodejs/node-gyp.git +### git archive v7.1.2 | xz > node-gyp_7.1.2.tar.xz +Source5: node-gyp_7.1.2.tar.xz +# Only required to run unit tests in NodeJS 10+ +Source10: update_npm_tarball.sh Source11: node_modules.tar.xz Source20: bash_output_helper.bash @@ -145,8 +135,6 @@ Patch5: sle12_python3_compat.patch Patch7: manual_configure.patch Patch13: openssl_binary_detection.patch - - ## Patches specific to SUSE and openSUSE Patch100: linker_lto_jobs.patch # PATCH-FIX-OPENSUSE -- set correct path for dtrace if it is built @@ -174,8 +162,8 @@ Patch308: node-gyp-config.patch Patch309: gcc13.patch Patch311: z13.patch -BuildRequires: pkg-config BuildRequires: fdupes +BuildRequires: pkg-config BuildRequires: procps BuildRequires: xz BuildRequires: zlib-devel @@ -195,10 +183,10 @@ BuildRequires: config(netcfg) %if 0%{?suse_version} == 1110 # GCC 5 is only available in the SUSE:SLE-11:SP4:Update repository (SDK). %if %node_version_number >= 8 -BuildRequires: gcc5-c++ +BuildRequires: gcc5-c++ %define forced_gcc_version 5 %else -BuildRequires: gcc48-c++ +BuildRequires: gcc48-c++ %define forced_gcc_version 4.8 %endif %endif @@ -208,15 +196,15 @@ BuildRequires: gcc48-c++ # for SLE-12:Update targets %if 0%{?suse_version} == 1315 %if %node_version_number >= 17 -BuildRequires: gcc12-c++ +BuildRequires: gcc12-c++ %define forced_gcc_version 12 %else %if %node_version_number >= 14 -BuildRequires: gcc9-c++ +BuildRequires: gcc9-c++ %define forced_gcc_version 9 %else %if %node_version_number >= 8 -BuildRequires: gcc7-c++ +BuildRequires: gcc7-c++ %define forced_gcc_version 7 %endif %endif @@ -225,7 +213,7 @@ BuildRequires: gcc7-c++ %if 0%{?suse_version} == 1500 %if %node_version_number >= 17 -BuildRequires: gcc12-c++ +BuildRequires: gcc12-c++ %define forced_gcc_version 12 %endif %endif @@ -236,7 +224,6 @@ BuildRequires: gcc12-c++ BuildRequires: gcc-c++ %endif - # Python dependencies %if %node_version_number >= 14 @@ -262,8 +249,8 @@ BuildRequires: python %endif %if 0%{?suse_version} >= 1500 && %{node_version_number} >= 10 -BuildRequires: user(nobody) BuildRequires: group(nobody) +BuildRequires: user(nobody) %endif # shared openssl @@ -278,11 +265,10 @@ BuildRequires: openssl >= %{openssl_req_ver} BuildRequires: (libopenssl1_1-hmac if libopenssl-1_1-devel) BuildRequires: (libopenssl3-hmac if libopenssl-3-devel) %else -BuildRequires: openssl-1_1 >= %{openssl_req_ver} BuildRequires: libopenssl1_1-hmac +BuildRequires: openssl-1_1 >= %{openssl_req_ver} %endif - # /suse_version %endif @@ -326,7 +312,7 @@ BuildRequires: valgrind %if %{with libalternatives} Suggests: alts %else -Requires(postun): %{_sbindir}/update-alternatives +Requires(postun):%{_sbindir}/update-alternatives %endif # either for update-alternatives, or their removal Requires(post): %{_sbindir}/update-alternatives @@ -365,8 +351,8 @@ ExclusiveArch: not_buildable %endif %endif -Provides: bundled(uvwasi) = 0.0.18 Provides: bundled(libuv) = 1.46.0 +Provides: bundled(uvwasi) = 0.0.18 Provides: bundled(v8) = 11.3.244.8 %if %{with intree_brotli} Provides: bundled(brotli) = 1.0.9 @@ -374,10 +360,9 @@ Provides: bundled(brotli) = 1.0.9 BuildRequires: pkgconfig(libbrotlidec) %endif - +Provides: bundled(base64) = 0.5.0 Provides: bundled(llhttp) = 8.1.1 Provides: bundled(ngtcp2) = 0.8.1 -Provides: bundled(base64) = 0.5.0 Provides: bundled(simdutf) = 3.2.17 # bundled url-ada parser, not ada Provides: bundled(ada) = 2.6.0 @@ -402,8 +387,8 @@ provided by npm. Summary: Development headers for NodeJS 20.x Group: Development/Languages/NodeJS Provides: nodejs-devel = %{version} -Requires: npm20 = %{version} Requires: %{name} = %{version} +Requires: npm20 = %{version} %description devel This package provides development headers for Node.js needed for creation @@ -420,12 +405,12 @@ Requires: nodejs-common Requires: nodejs20 = %{version} Provides: nodejs-npm = %{version} Obsoletes: nodejs-npm < 4.0.0 -Provides: npm(npm) = 9.8.1 Provides: npm = %{version} +Provides: npm(npm) = 9.8.1 %if 0%{?suse_version} >= 1500 %if %{node_version_number} >= 10 -Requires: user(nobody) Requires: group(nobody) +Requires: user(nobody) %endif %endif Provides: bundled(node-abbrev) = 1.1.1 @@ -611,9 +596,9 @@ Provides: bundled(node-spdx-exceptions) = 2.3.0 Provides: bundled(node-spdx-expression-parse) = 3.0.1 Provides: bundled(node-spdx-license-ids) = 3.0.13 Provides: bundled(node-ssri) = 10.0.4 -Provides: bundled(node-string_decoder) = 1.3.0 Provides: bundled(node-string-width) = 4.2.3 Provides: bundled(node-string-width) = 5.1.2 +Provides: bundled(node-string_decoder) = 1.3.0 Provides: bundled(node-strip-ansi) = 6.0.1 Provides: bundled(node-strip-ansi) = 7.1.0 Provides: bundled(node-supports-color) = 9.4.0 @@ -735,8 +720,6 @@ find -name \*~ -print0 -delete # abnormalities from patching find \( -name \*.js.orig -or -name \*.md.orig -or -name \*.1.orig \) -delete - - %build # normalize shebang %if %{node_version_number} >= 12 @@ -1096,6 +1079,7 @@ update-alternatives --remove npm-default %{_bindir}/npm%{node_version_number} update-alternatives --remove npx-default %{_bindir}/npx%{node_version_number} %else + %pre # remove files that are no longer owned but provided by update-alternatives if ! [ -L %{_mandir}/man1/node.1%{ext_man} ]; then