From 8f718e1fac962ecc368cb3828d1650f81f06c2cd Mon Sep 17 00:00:00 2001 From: tomasmatus Date: Wed, 10 Dec 2025 14:10:02 +0100 Subject: [PATCH] Update to upstream release 34 Related: RHEL-112792 --- .gitignore | 5 +++++ README.packit | 2 +- cockpit-files.spec | 43 +++++++++++++++++++++++++++++++++++++------ packit.yaml | 21 ++++++++++----------- sources | 3 ++- 5 files changed, 55 insertions(+), 19 deletions(-) diff --git a/.gitignore b/.gitignore index c95e221..e83cb8a 100644 --- a/.gitignore +++ b/.gitignore @@ -30,3 +30,8 @@ /cockpit-files-29.tar.xz /cockpit-files-30.tar.xz /cockpit-files-31.1.tar.xz +/cockpit-files-32.tar.xz +/cockpit-files-33.tar.xz +/cockpit-files-node-33.tar.xz +/cockpit-files-34.tar.xz +/cockpit-files-node-34.tar.xz diff --git a/README.packit b/README.packit index 2511bf4..1d2f35b 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. +The file was generated using packit 1.12.0.post1.dev22+gfe66fd850. diff --git a/cockpit-files.spec b/cockpit-files.spec index 4584708..3483146 100644 --- a/cockpit-files.spec +++ b/cockpit-files.spec @@ -1,10 +1,17 @@ Name: cockpit-files -Version: 31.1 +Version: 34 Release: 1%{?dist} Summary: A filesystem browser for Cockpit License: LGPL-2.1-or-later -Source0: https://github.com/cockpit-project/cockpit-files/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 BuildRequires: make %if 0%{?suse_version} @@ -14,6 +21,10 @@ BuildRequires: appstream-glib BuildRequires: libappstream-glib %endif BuildRequires: gettext +%if %{defined rebuild_bundle} +BuildRequires: nodejs +BuildRequires: nodejs-esbuild +%endif Requires: cockpit-bridge >= 318 @@ -29,13 +40,11 @@ Provides: bundled(npm(@patternfly/react-tokens)) = 6.4.0 Provides: bundled(npm(dequal)) = 2.0.3 Provides: bundled(npm(focus-trap)) = 7.6.4 Provides: bundled(npm(lodash)) = 4.17.21 -Provides: bundled(npm(object-assign)) = 4.1.1 Provides: bundled(npm(prop-types)) = 15.8.1 Provides: bundled(npm(react)) = 18.3.1 Provides: bundled(npm(react-dom)) = 18.3.1 -Provides: bundled(npm(react-is)) = 16.13.1 Provides: bundled(npm(scheduler)) = 0.23.2 -Provides: bundled(npm(tabbable)) = 6.2.0 +Provides: bundled(npm(tabbable)) = 6.3.0 Provides: bundled(npm(throttle-debounce)) = 5.0.2 Provides: bundled(npm(tslib)) = 2.8.1 @@ -44,9 +53,19 @@ A filesystem browser for Cockpit %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 currently broken in Fedora, should be in +# common location, not major version specific one +NODE_ENV=production NODE_PATH=$(echo /usr/lib/node_modules_*) ./build.js +%else +# Use pre-built bundle on distributions without nodejs-esbuild +%endif %install %make_install PREFIX=/usr @@ -67,6 +86,18 @@ appstream-util validate-relax --nonet %{buildroot}/%{_datadir}/metainfo/* %{_datadir}/metainfo/* %changelog +* Wed Dec 10 2025 Packit - 34-1 +- Bug fixes and translation updates + + +* Thu Nov 27 2025 Packit - 33-1 +- Bug fixes and translation updates + + +* Wed Nov 12 2025 Packit - 32-1 +- Performance and stability improvements + + * Fri Oct 31 2025 Packit - 31.1-1 - don't initialise a git repo in gating tests (fixes fedora gating) diff --git a/packit.yaml b/packit.yaml index 89046cf..50753d7 100644 --- a/packit.yaml +++ b/packit.yaml @@ -7,18 +7,17 @@ specfile_path: cockpit-files.spec copy_upstream_release_description: true srpm_build_deps: + - jq - make - - nodejs-npm + - nodejs actions: post-upstream-clone: - - make cockpit-files.spec - # replace Source1 manually, as create-archive: can't handle multiple tarballs - - make node-cache - - sh -c 'sed -i "/^Source1:/ s/https:.*/$(ls *-node*.tar.xz)/" cockpit-*.spec' - create-archive: make dist - # files.git has no release tags; your project can drop this once you have a release - get-current-version: make print-version + - 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-files.spec jobs: - job: tests @@ -51,9 +50,9 @@ jobs: post-upstream-clone: make cockpit-files.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-files/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/cockpit-files/releases/download/${PACKIT_PROJECT_VERSION}/${PACKIT_PROJECT_NAME_VERSION}.tar.xz" + - sh -exc "curl -L --fail -O https://github.com/cockpit-project/cockpit-files/releases/download/${PACKIT_PROJECT_VERSION}/cockpit-files-node-${PACKIT_PROJECT_VERSION}.tar.xz" - job: copr_build trigger: commit diff --git a/sources b/sources index d9d51de..3faba06 100644 --- a/sources +++ b/sources @@ -1 +1,2 @@ -SHA512 (cockpit-files-31.1.tar.xz) = 719ce5b83be771e8d2a369753d5be1c7b15cd391cb547262f47b9d5935893cecc5ded612bece16d4cbb26ea89d715645415b88c3e2aeea70ca7bbf860538fbd5 +SHA512 (cockpit-files-34.tar.xz) = 6cfdaca2d1065e2fe1cbf871a195f41ff4228db9090e58673bad9c63b365bda1060d91b9ef01923c862c462d43bd5c79afc806a4fa9003dcd96cf00be1f73460 +SHA512 (cockpit-files-node-34.tar.xz) = 8d5fe2d8ecb363bed7f045e76bab2b4c061e0ac781b88f267a4a89274ee682a8eda69e84428001fb99c56111f1f1e18fccb9e9c8d04bb79ce5764fdf7ceb2216