Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions comps/comps-foreman-el9.xml
Original file line number Diff line number Diff line change
Expand Up @@ -106,6 +106,7 @@
<packagereq type="default">nodejs-patternfly-react-icons</packagereq>
<packagereq type="default">nodejs-patternfly-react-styles</packagereq>
<packagereq type="default">nodejs-patternfly-react-table</packagereq>
<packagereq type="default">nodejs-patternfly-react-templates</packagereq>
<packagereq type="default">nodejs-patternfly-react-tokens</packagereq>
<packagereq type="default">nodejs-performance-now</packagereq>
<packagereq type="default">nodejs-prop-types</packagereq>
Expand Down
1 change: 1 addition & 0 deletions package_manifest.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -444,6 +444,7 @@ foreman_nodejs_packages:
nodejs-patternfly-react-extensions: {}
nodejs-patternfly-react-icons: {}
nodejs-patternfly-react-styles: {}
nodejs-patternfly-react-templates: {}
nodejs-patternfly-react-tokens: {}
nodejs-patternfly-react-table: {}
nodejs-performance-now: {}
Expand Down
22 changes: 12 additions & 10 deletions packages/foreman/foreman/foreman.spec
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
%global dynflow_sidekiq_service_name dynflow-sidekiq@
%global rake /usr/bin/rake

%global release 4
%global release 5
%global prereleasesource develop
%global prerelease %{?prereleasesource}

Expand Down Expand Up @@ -240,11 +240,12 @@ Requires: (npm(@module-federation/utilities) >= 1.7.0 with npm(@module-federatio
Requires: npm(@novnc/novnc) = 1.3.0
Requires: (npm(@patternfly/patternfly) >= 5.4.2 with npm(@patternfly/patternfly) < 6.0.0)
Requires: (npm(@patternfly/react-charts) >= 7.4.5 with npm(@patternfly/react-charts) < 7.5.0)
Requires: (npm(@patternfly/react-core) >= 5.2.0 with npm(@patternfly/react-core) < 6.0.0)
Requires: (npm(@patternfly/react-icons) >= 5.2.0 with npm(@patternfly/react-icons) < 6.0.0)
Requires: (npm(@patternfly/react-styles) >= 5.2.0 with npm(@patternfly/react-styles) < 6.0.0)
Requires: (npm(@patternfly/react-table) >= 5.2.0 with npm(@patternfly/react-table) < 6.0.0)
Requires: (npm(@patternfly/react-tokens) >= 5.2.0 with npm(@patternfly/react-tokens) < 6.0.0)
Requires: (npm(@patternfly/react-core) >= 5.4.8 with npm(@patternfly/react-core) < 6.0.0)
Requires: (npm(@patternfly/react-icons) >= 5.4.2 with npm(@patternfly/react-icons) < 6.0.0)
Requires: (npm(@patternfly/react-styles) >= 5.4.1 with npm(@patternfly/react-styles) < 6.0.0)
Requires: (npm(@patternfly/react-table) >= 5.4.8 with npm(@patternfly/react-table) < 6.0.0)
Requires: (npm(@patternfly/react-templates) >= 1.1.8 with npm(@patternfly/react-templates) < 2.0.0)
Requires: (npm(@patternfly/react-tokens) >= 5.4.1 with npm(@patternfly/react-tokens) < 6.0.0)
Requires: (npm(@reduxjs/toolkit) >= 1.6.0 with npm(@reduxjs/toolkit) < 2.0.0)
Requires: (npm(@scalprum/core) >= 0.8.1 with npm(@scalprum/core) < 1.0.0)
Requires: (npm(@scalprum/react-core) >= 0.9.3 with npm(@scalprum/react-core) < 1.0.0)
Expand All @@ -261,7 +262,7 @@ Requires: (npm(core-js) >= 2.5.7 with npm(core-js) < 3.0.0)
Requires: npm(datatables.net) = 1.13.5
Requires: npm(datatables.net-bs) = 1.13.5
Requires: npm(datatables.net-dt) = 1.13.5
Requires: (npm(diff) >= 5.1.0 with npm(diff) < 6.0.0)
Requires: npm(diff) = 5.2.0
Comment on lines -264 to +265

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Where is this coming from?

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ah, thank you

Requires: (npm(dsmorse-gridster) >= 0.8.0 with npm(dsmorse-gridster) < 1.0.0)
Requires: (npm(file-saver) >= 2.0.1 with npm(file-saver) < 3.0.0)
Requires: (npm(formik) >= 1.5.8 with npm(formik) < 2.0.0)
Expand All @@ -287,13 +288,11 @@ Requires: (npm(prop-types) >= 15.6.0 with npm(prop-types) < 16.0.0)
Requires: (npm(rc-input-number) >= 6.0.0 with npm(rc-input-number) < 7.0.0)
Requires: (npm(react) >= 16.9.0 with npm(react) < 17.0.0)
Requires: (npm(react-ace) >= 9.5.0 with npm(react-ace) < 10.0.0)
Requires: (npm(react-bootstrap) >= 0.32.0 with npm(react-bootstrap) < 1.0.0)

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

note: Removed in theforeman/foreman@38fecf3

Requires: (npm(react-debounce-input) >= 3.2.0 with npm(react-debounce-input) < 4.0.0)
Requires: (npm(react-diff-view) >= 2.6.0 with npm(react-diff-view) < 3.0.0)
Requires: (npm(react-dnd) >= 14.0.2 with npm(react-dnd) < 15.0.0)
Requires: (npm(react-dnd-html5-backend) >= 14.0.0 with npm(react-dnd-html5-backend) < 15.0.0)
Requires: (npm(react-dom) >= 16.8.1 with npm(react-dom) < 17.0.0)
Requires: (npm(react-ellipsis-with-tooltip) >= 1.0.8 with npm(react-ellipsis-with-tooltip) < 2.0.0)

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

note: Removed in theforeman/foreman@68c236f

Requires: (npm(react-helmet) >= 6.1.0 with npm(react-helmet) < 7.0.0)
Requires: (npm(react-intl) >= 2.8.0 with npm(react-intl) < 3.0.0)
Requires: (npm(react-loading-skeleton) >= 1.1.2 with npm(react-loading-skeleton) < 2.0.0)
Expand All @@ -306,7 +305,7 @@ Requires: (npm(react-router-dom) >= 5.1.2 with npm(react-router-dom) < 6.0.0)
Requires: (npm(redux) >= 4.0.4 with npm(redux) < 5.0.0)
Requires: (npm(redux-logger) >= 2.8.1 with npm(redux-logger) < 3.0.0)
Requires: (npm(redux-thunk) >= 2.2.0 with npm(redux-thunk) < 3.0.0)
Requires: (npm(regenerator-runtime) >= 0.13.3 with npm(regenerator-runtime) < 1.0.0)
Requires: npm(regenerator-runtime) = 0.14.1
Comment on lines -309 to +308

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

note: Pinned in theforeman/foreman@d2dc1d9

Requires: (npm(reselect) >= 3.0.1 with npm(reselect) < 4.0.0)
Requires: npm(sanitize-html) = 2.3.2
Requires: (npm(seamless-immutable) >= 7.1.2 with npm(seamless-immutable) < 8.0.0)
Expand Down Expand Up @@ -839,6 +838,9 @@ exit 0
%systemd_postun %{name}.socket

%changelog
* Wed Jan 14 2026 MariaAga - 3.18.0-0.5.develop
- Add nodejs-patternfly-react-templates package

* Thu Jan 08 2026 Adam Lazik - 3.18.0-0.4.develop
- Require NodeJS 22

Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,57 @@
%{?scl:%scl_package nodejs-%{npm_name}}
%{!?scl:%global pkg_name %{name}}
Comment on lines +1 to +2

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We do not use scl anymore. It does not hurt anything, but it is dead code. Assuming the spec was generated from our templates, I'd be willing to let it slide.

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I ran ./update-requirements npm "../foreman/package.json" "./packages/foreman/foreman/foreman.spec"

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Adam, seems you have a context about SCL usage. Would you mind creating an issue in this project to remove it from our specs and the template(s)?

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Redmine is better, of course. :) Thank you!


%global npm_name @patternfly/react-templates

Name: %{?scl_prefix}nodejs-patternfly-react-templates
Version: 1.1.8
Release: 1%{?dist}
Summary: This package provides wrapped component demos for ease of use
License: MIT
Group: Development/Libraries
URL: https://github.com/patternfly/patternfly-react/tree/main/packages/react-templates#readme
Source0: https://registry.npmjs.org/@patternfly/react-templates/-/react-templates-%{version}.tgz
%if 0%{?!scl:1}
BuildRequires: nodejs-packaging
%endif
Requires: npm(@patternfly/react-core) >= 5.4.8
Requires: npm(@patternfly/react-core) < 6.0.0
Requires: npm(@patternfly/react-icons) >= 5.4.2
Requires: npm(@patternfly/react-icons) < 6.0.0
Requires: npm(@patternfly/react-styles) >= 5.4.1
Requires: npm(@patternfly/react-styles) < 6.0.0
Requires: npm(@patternfly/react-tokens) >= 5.4.1
Requires: npm(@patternfly/react-tokens) < 6.0.0
Requires: npm(tslib) >= 2.7.0
Requires: npm(tslib) < 3.0.0
BuildArch: noarch
ExclusiveArch: %{nodejs_arches} noarch
Provides: %{?scl_prefix}npm(%{npm_name}) = %{version}

%description
%{summary}

%prep
%setup -q -n package

%install
mkdir -p %{buildroot}%{nodejs_sitelib}/%{npm_name}
cp -pfr components %{buildroot}%{nodejs_sitelib}/%{npm_name}
cp -pfr dist %{buildroot}%{nodejs_sitelib}/%{npm_name}
cp -pfr package.json %{buildroot}%{nodejs_sitelib}/%{npm_name}
cp -pfr rollup.config.mjs %{buildroot}%{nodejs_sitelib}/%{npm_name}
cp -pfr single-packages.config.json %{buildroot}%{nodejs_sitelib}/%{npm_name}
cp -pfr src %{buildroot}%{nodejs_sitelib}/%{npm_name}
cp -pfr subpaths.config.json %{buildroot}%{nodejs_sitelib}/%{npm_name}


%files
%{nodejs_sitelib}/%{npm_name}
%license LICENSE
%doc CHANGELOG.md
%doc README.md

%changelog
* Wed Jan 07 2026 MariaAga <mariaaga@redhat.com> 1.1.8-1
- Add nodejs-patternfly-react-templates generated by npm2rpm using the single strategy