Ralf S. Engelschall před 4 roky
rodič
revize
8b66db9df2
1 změnil soubory, kde provedl 8 přidání a 17 odebrání
  1. 8 17
      npm/npm.spec

+ 8 - 17
npm/npm.spec

@@ -23,10 +23,9 @@
 
 #   package version
 %define       V_npm     8.7.0
-%define       V_node17  17.9.0
-%define       V_node16  16.14.2
+%define       V_node18  18.0.0
+%define       V_node16  16.15.0
 %define       V_node14  14.19.1
-%define       V_node12  12.22.12
 
 #   package information
 Name:         npm
@@ -39,14 +38,13 @@ Class:        PLUS
 Group:        Archiver
 License:      MIT
 Version:      %{V_npm}
-Release:      20220415
+Release:      20220427
 
 #   list of sources
 Source0:      https://github.com/npm/cli/archive/v%{V_npm}.tar.gz
-Source1:      http://nodejs.org/download/release/v%{V_node17}/node-v%{V_node17}-headers.tar.gz
+Source1:      http://nodejs.org/download/release/v%{V_node18}/node-v%{V_node18}-headers.tar.gz
 Source2:      http://nodejs.org/download/release/v%{V_node16}/node-v%{V_node16}-headers.tar.gz
 Source3:      http://nodejs.org/download/release/v%{V_node14}/node-v%{V_node14}-headers.tar.gz
-Source4:      http://nodejs.org/download/release/v%{V_node12}/node-v%{V_node12}-headers.tar.gz
 Patch0:       npm.patch
 
 #   build information
@@ -63,10 +61,10 @@ PreReq:       OpenPKG, openpkg >= 20160101, node, python
         url       = https://github.com/npm/cli/releases
         regex     = v(__VER__)\.tar\.gz
     }
-    prog npm:node17 = {
-        version   = %{V_node17}
+    prog npm:node18 = {
+        version   = %{V_node18}
         url       = https://nodejs.org/download/release/
-        regex     = v(17.\d+\.\d+)
+        regex     = v(18.\d+\.\d+)
     }
     prog npm:node16 = {
         version   = %{V_node16}
@@ -78,11 +76,6 @@ PreReq:       OpenPKG, openpkg >= 20160101, node, python
         url       = https://nodejs.org/download/release/
         regex     = v(14\.\d+\.\d+)
     }
-    prog npm:node12 = {
-        version   = %{V_node12}
-        url       = https://nodejs.org/download/release/
-        regex     = v(12.\d+\.\d+)
-    }
 
 %prep
     %setup -q -n cli-%{V_npm}
@@ -156,13 +149,11 @@ PreReq:       OpenPKG, openpkg >= 20160101, node, python
     #   provide an unpacked verson of the Node sources
     (   cd $RPM_BUILD_ROOT%{l_prefix}/share/npm/node-gyp
         %{l_gzip} -d -c %{SOURCE1} | %{l_tar} xf -
-        mv node-v%{V_node17} %{V_node17}
+        mv node-v%{V_node18} %{V_node18}
         %{l_gzip} -d -c %{SOURCE2} | %{l_tar} xf -
         mv node-v%{V_node16} %{V_node16}
         %{l_gzip} -d -c %{SOURCE3} | %{l_tar} xf -
         mv node-v%{V_node14} %{V_node14}
-        %{l_gzip} -d -c %{SOURCE4} | %{l_tar} xf -
-        mv node-v%{V_node12} %{V_node12}
     ) || exit $?
 
     #   determine installation files