public inbox for git-commits@fedoraproject.org
help / color / mirror / Atom feed
* [rpms/grafana] rawhide: Build with latest nodejs
@ 2026-08-31 20:49 Yaakov Selkowitz
  0 siblings, 0 replies; only message in thread
From: Yaakov Selkowitz @ 2026-08-31 20:49 UTC (permalink / raw)
  To: git-commits

            A new commit has been pushed.

            Repo   : rpms/grafana
            Branch : rawhide
            Commit : a415d37462e11676a9849a478744720a0efd200b
            Author : Yaakov Selkowitz <yselkowi@redhat.com>
            Date   : 2026-08-27T17:57:44-04:00
            Stats  : +6/-8 in 1 file(s)
            URL    : https://src.fedoraproject.org/rpms/grafana/c/a415d37462e11676a9849a478744720a0efd200b?branch=rawhide

            Log:
            Build with latest nodejs

Fedora 45 and ELN (the future RHEL 11) prefer the latest nodejs26.

---
diff --git a/grafana.spec b/grafana.spec
index b1d20e3..d3fe13a 100644
--- a/grafana.spec
+++ b/grafana.spec
@@ -22,7 +22,7 @@ end}
 
 Name:             grafana
 Version:          12.4.3
-Release:          5%{?dist}
+Release:          6%{?dist}
 Summary:          Metrics dashboard and graph editor
 License:          AGPL-3.0-only
 URL:              https://grafana.org
@@ -86,8 +86,8 @@ BuildRequires:    go-srpm-macros
 BuildRequires:    go-rpm-macros
 
 %ifarch x86_64
-BuildRequires:    nodejs24
-BuildRequires:    nodejs24-npm
+BuildRequires:    /usr/bin/node
+BuildRequires:    /usr/bin/npm
 %endif
 
 %if %{enable_fips_mode}
@@ -923,12 +923,7 @@ Built from source on x86_64 and installable on all architectures.
 
 %build
 %ifarch x86_64
-# nodejs24 installs binaries as node-24, npm-24, and npx-24;
-# vendored tools (webpack, jest, nx, etc.) expect "node", "npm", and "npx"
 mkdir -p .nodejs_bin
-ln -s %{_bindir}/node-24 .nodejs_bin/node
-ln -s %{_bindir}/npm-24 .nodejs_bin/npm
-ln -s %{_bindir}/npx-24 .nodejs_bin/npx
 # upstream scripts call yarn directly (e.g. themes-generate); wrap it to use npm
 cat > .nodejs_bin/yarn <<'YARNWRAPPER'
 #!/bin/sh
@@ -1195,6 +1190,9 @@ done
 %endif
 
 %changelog
+* Thu Aug 27 2026 Yaakov Selkowitz <yselkowi@redhat.com> - 12.4.3-6
+- Build with latest nodejs
+
 * Thu Aug 27 2026 Sam Feifer <sfeifer@redhat.com> 12.4.3-5
 - Fix the rpmdeplint failure caused by the new grafana-frontend.noarch
 

^ permalink raw reply related	[flat|nested] only message in thread

only message in thread, other threads:[~2026-08-31 20:49 UTC | newest]

Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2026-08-31 20:49 [rpms/grafana] rawhide: Build with latest nodejs Yaakov Selkowitz

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox