diff --git a/.gitignore b/.gitignore index 315cdcf..66976c4 100644 --- a/.gitignore +++ b/.gitignore @@ -112,3 +112,5 @@ /cockpit-machines-344.tar.xz /cockpit-machines-345.tar.xz /cockpit-machines-346.tar.xz +/cockpit-machines-347.tar.xz +/cockpit-machines-node-347.tar.xz diff --git a/README.packit b/README.packit index 1d2f35b..39e81ea 100644 --- a/README.packit +++ b/README.packit @@ -1,3 +1,3 @@ This repository is maintained by packit. https://packit.dev/ -The file was generated using packit 1.12.0.post1.dev22+gfe66fd850. +The file was generated using packit 1.14.0.post1.dev2+g6506c7467. diff --git a/cockpit-machines.spec b/cockpit-machines.spec index 4b6ef7f..078036d 100644 --- a/cockpit-machines.spec +++ b/cockpit-machines.spec @@ -16,13 +16,20 @@ # Name: cockpit-machines -Version: 346 +Version: 347 Release: 1%{?dist} Summary: Cockpit user interface for virtual machines License: LGPL-2.1-or-later AND MIT URL: https://github.com/cockpit-project/cockpit-machines -Source0: https://github.com/cockpit-project/%{name}/releases/download/%{version}/%{name}-%{version}.tar.xz +# distributions which ship nodejs-esbuild can rebuild the bundle during package build +%if 0%{?fedora} >= 42 +%define rebuild_bundle 1 +%endif + +Source0: https://github.com/cockpit-project/%{name}/releases/download/%{version}/%{name}-%{version}.tar.xz +Source1: https://github.com/cockpit-project/%{name}/releases/download/%{version}/%{name}-node-%{version}.tar.xz + BuildArch: noarch %if 0%{?suse_version} BuildRequires: appstream-glib @@ -34,6 +41,11 @@ BuildRequires: gettext %if 0%{?rhel} && 0%{?rhel} <= 8 BuildRequires: libappstream-glib-devel %endif +%if %{defined rebuild_bundle} +BuildRequires: nodejs +BuildRequires: %{_bindir}/node +BuildRequires: nodejs-esbuild +%endif Requires: cockpit-bridge >= 215 %if 0%{?suse_version} @@ -70,7 +82,6 @@ Recommends: python3-gobject-base Suggests: (qemu-virtiofsd or virtiofsd) Provides: bundled(npm(@novnc/novnc)) = 1.5.0 -Provides: bundled(npm(@patternfly/patternfly)) = 6.4.0 Provides: bundled(npm(@patternfly/react-core)) = 6.4.0 Provides: bundled(npm(@patternfly/react-icons)) = 6.4.0 Provides: bundled(npm(@patternfly/react-styles)) = 6.4.0 @@ -78,24 +89,15 @@ Provides: bundled(npm(@patternfly/react-table)) = 6.4.0 Provides: bundled(npm(@patternfly/react-tokens)) = 6.4.0 Provides: bundled(npm(@xterm/addon-canvas)) = 0.7.0 Provides: bundled(npm(@xterm/xterm)) = 5.5.0 -Provides: bundled(npm(attr-accept)) = 2.2.5 Provides: bundled(npm(dequal)) = 2.0.3 -Provides: bundled(npm(file-selector)) = 2.1.2 Provides: bundled(npm(focus-trap)) = 7.6.4 Provides: bundled(npm(ipaddr.js)) = 2.3.0 -Provides: bundled(npm(js-tokens)) = 4.0.0 -Provides: bundled(npm(lodash)) = 4.17.21 -Provides: bundled(npm(loose-envify)) = 1.4.0 -Provides: bundled(npm(object-assign)) = 4.1.1 +Provides: bundled(npm(lodash)) = 4.17.23 Provides: bundled(npm(prop-types)) = 15.8.1 -Provides: bundled(npm(react-dom)) = 18.3.1 -Provides: bundled(npm(react-dropzone)) = 14.3.8 -Provides: bundled(npm(react-is)) = 16.13.1 Provides: bundled(npm(react)) = 18.3.1 -Provides: bundled(npm(redux-thunk)) = 3.1.0 -Provides: bundled(npm(redux)) = 5.0.1 +Provides: bundled(npm(react-dom)) = 18.3.1 Provides: bundled(npm(scheduler)) = 0.23.2 -Provides: bundled(npm(tabbable)) = 6.3.0 +Provides: bundled(npm(tabbable)) = 6.4.0 Provides: bundled(npm(throttle-debounce)) = 5.0.2 Provides: bundled(npm(tslib)) = 2.8.1 @@ -104,9 +106,19 @@ Cockpit component for managing libvirt virtual machines. %prep %setup -q -n %{name} +%if %{defined rebuild_bundle} +%setup -q -D -T -a 1 -n %{name} +%endif %build -# Nothing to build +%if %{defined rebuild_bundle} +rm -rf dist +# HACK: node module packaging is broken in Fedora ≤ 43; should be in +# common location, not major version specific one +NODE_ENV=production NODE_PATH=/usr/lib/node_modules:$(echo /usr/lib/node_modules_*) ./build.js +%else +# Use pre-built bundle on distributions without nodejs-esbuild +%endif %install %make_install PREFIX=/usr @@ -120,6 +132,16 @@ appstream-util validate-relax --nonet %{buildroot}/%{_datadir}/metainfo/* # The changelog is automatically generated and merged %changelog +* Wed Jan 28 2026 Packit - 347-1 +- Bug fixes and translation updates + + +* Fri Jan 16 2026 Fedora Release Engineering - 346-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild + +* Fri Jan 16 2026 Fedora Release Engineering - 346-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild + * Wed Dec 10 2025 Packit - 346-1 - Performance improvements - Translation updates diff --git a/packit.yaml b/packit.yaml index 582b976..89777cb 100644 --- a/packit.yaml +++ b/packit.yaml @@ -7,13 +7,20 @@ downstream_package_name: cockpit-machines # use the nicely formatted release description from our upstream release, instead of git shortlog copy_upstream_release_description: true -srpm_build_deps: -- npm -- make - actions: - post-upstream-clone: make cockpit-machines.spec - create-archive: make dist + post-upstream-clone: + - make node-cache dist + + fix-spec-file: + # our locally built tarballs are not on the upstream releases page, point to the local files + sed -i 's|^\(Source[0-9]*:\s*\).*\/|\1|' cockpit-machines.spec + + get-current-version: make print-version + +srpm_build_deps: + - jq + - make + - nodejs jobs: - job: tests @@ -38,9 +45,9 @@ jobs: post-upstream-clone: make cockpit-machines.spec # HACK: tarball for releases (copr_build, koji, etc.), copying spec's Source0; this # really should be the default, see https://github.com/packit/packit-service/issues/1505 - create-archive: - - sh -exc "curl -L -O https://github.com/cockpit-project/cockpit-machines/releases/download/${PACKIT_PROJECT_VERSION}/${PACKIT_PROJECT_NAME_VERSION}.tar.xz" - - sh -exc "ls ${PACKIT_PROJECT_NAME_VERSION}.tar.xz" + fix-spec-file: + - sh -exc "curl -L --fail -O https://github.com/cockpit-project/${PACKIT_UPSTREAM_PACKAGE_NAME}/releases/download/${PACKIT_PROJECT_VERSION}/${PACKIT_PROJECT_NAME_VERSION}.tar.xz" + - sh -exc "curl -L --fail -O https://github.com/cockpit-project/${PACKIT_UPSTREAM_PACKAGE_NAME}/releases/download/${PACKIT_PROJECT_VERSION}/${PACKIT_UPSTREAM_PACKAGE_NAME}-node-${PACKIT_PROJECT_VERSION}.tar.xz" - job: propose_downstream trigger: release diff --git a/sources b/sources index fc6ec2c..6530507 100644 --- a/sources +++ b/sources @@ -1 +1,2 @@ -SHA512 (cockpit-machines-346.tar.xz) = 69bf2c56315ba998d61a96ebd2afa889b4205213cc1c50972834cb9941d112cac1a44e583fd180a4c5ce3b3cd4ce563b6c5795e781999eed1690c99d42d3e569 +SHA512 (cockpit-machines-347.tar.xz) = 2b940e9abd6e2393258aeb9231be32b210a2b3916b4d425e8dca2064f9957c1bbe04951d0c2cd77b7f748ac0dd60a6ab25a4473a9ccbd52504af5293461f8a64 +SHA512 (cockpit-machines-node-347.tar.xz) = ac139a054d6f57af2c210e6a5047247f182c4666829cbedbb29a63f6c738bd2bb97b9816feefab5e6779e123346f8631cffc76226a5925bb3d1c5520b51c0e74