Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package cockpit for openSUSE:Factory checked in at 2024-01-04 15:56:13 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/cockpit (Old) and /work/SRC/openSUSE:Factory/.cockpit.new.28375 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "cockpit" Thu Jan 4 15:56:13 2024 rev:37 rq:1135660 version:307 Changes: -------- --- /work/SRC/openSUSE:Factory/cockpit/cockpit.changes 2023-09-26 22:19:47.179698940 +0200 +++ /work/SRC/openSUSE:Factory/.cockpit.new.28375/cockpit.changes 2024-01-04 15:57:23.452504392 +0100 @@ -1,0 +2,14 @@ +Thu Dec 21 15:22:27 UTC 2023 - Adam Majer <[email protected]> - 307 + +- new version 307: + https://cockpit-project.org/blog/cockpit-307.html + https://cockpit-project.org/blog/cockpit-306.html + https://cockpit-project.org/blog/cockpit-305.html + https://cockpit-project.org/blog/cockpit-304.html + https://cockpit-project.org/blog/cockpit-303.html + https://cockpit-project.org/blog/cockpit-302.html + https://cockpit-project.org/blog/cockpit-301.html + +- css-overrides.patch, storage-btrfs.patch: refreshed + +------------------------------------------------------------------- Old: ---- cockpit-300.1.obscpio New: ---- cockpit-307.obscpio vendor.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ cockpit.spec ++++++ --- /var/tmp/diff_new_pack.SNyYK9/_old 2024-01-04 15:57:28.200677846 +0100 +++ /var/tmp/diff_new_pack.SNyYK9/_new 2024-01-04 15:57:28.204677992 +0100 @@ -34,6 +34,10 @@ %define rhel %{centos} %endif +%if 0%{?suse_version} +%define enable_old_bridge 1 +%endif + %define _hardened_build 1 %define __lib lib @@ -50,12 +54,13 @@ License: LGPL-2.1-or-later URL: https://cockpit-project.org/ -Version: 300.1 +Version: 307 Release: 0 Source0: cockpit-%{version}.tar Source1: cockpit.pam Source2: cockpit-rpmlintrc Source3: cockpit-suse-theme.tar +Source10: vendor.tar.gz Source99: README.packaging Source98: package-lock.json Source97: node_modules.spec.inc @@ -113,6 +118,14 @@ %define disallow_root 1 %endif +# pcp stopped building on ix86 +%define build_pcp 1 +%if 0%{?fedora} >= 40 || 0%{?rhel} >= 10 || 0%{?suse_version} > 1500 +%ifarch %ix86 +%define build_pcp 0 +%endif +%endif + # Ship custom SELinux policy (but not for cockpit-appstream) %if 0%{?rhel} >= 9 || 0%{?fedora} || 0%{?suse_version} >= 1600 || 0%{?is_smo} %if "%{name}" == "cockpit" @@ -131,6 +144,7 @@ BuildRequires: autoconf automake BuildRequires: make BuildRequires: /usr/bin/python3 +BuildRequires: python3-devel %if ( 0%{?rhel} && 0%{?rhel} <= 8 ) || 0%{?suse_version} <= 1500 # RHEL 8's gettext does not yet have metainfo.its BuildRequires: gettext >= 0.19.7 @@ -159,17 +173,21 @@ BuildRequires: pkgconfig(libsystemd) >= 235 %if 0%{?suse_version} BuildRequires: distribution-release +%if %{build_pcp} BuildRequires: libpcp-devel BuildRequires: pcp-devel BuildRequires: libpcp3 BuildRequires: libpcp_import1 +%endif BuildRequires: openssh BuildRequires: distribution-logos BuildRequires: wallpaper-branding # needed for /var/lib/pcp directory ownership BuildRequires: pcp %else +%if %{build_pcp} BuildRequires: pcp-libs-devel +%endif BuildRequires: openssh-clients BuildRequires: docbook-style-xsl %endif @@ -212,10 +230,10 @@ Requires: subscription-manager-cockpit %endif -%if %{cockpit_enable_python} +%if 0%{?enable_old_bridge} == 0 BuildRequires: python3-devel BuildRequires: python3-pip -%if 0%{?rhel} == 0 +%if 0%{?rhel} == 0 && 0%{?suse_version} == 0 # All of these are only required for running pytest (which we only do on Fedora) BuildRequires: procps-ng BuildRequires: pyproject-rpm-macros @@ -252,6 +270,7 @@ # rm -rf node_modules package-lock.json local-npm-registry %{_sourcedir} install --also=dev --legacy-peer-deps +cd vendor; tar zxfO %SOURCE10 | tar xvi; cd .. %build find node_modules -name \*.node -print -delete @@ -270,12 +289,16 @@ --docdir=%_defaultdocdir/%{name} \ %endif --with-pamdir='%{pamdir}' \ -%if %{cockpit_enable_python} - --enable-pybridge \ +%if 0%{?enable_old_bridge} + --enable-old-bridge \ %endif %if 0%{?build_basic} == 0 --disable-ssh \ %endif +%if %{build_pcp} == 0 + --disable-pcp \ +%endif + %if 0%{?with_selinux} make -f /usr/share/selinux/devel/Makefile cockpit.pp @@ -287,7 +310,7 @@ %check make -j$(nproc) check -%if %{cockpit_enable_python} && 0%{?rhel} == 0 +%if 0%{?enable_old_bridge} == 0 && 0%{?rhel} == 0 && 0%{?suse_version} == 0 %tox %endif @@ -329,12 +352,16 @@ find %{buildroot}%{_datadir}/cockpit/base1 -type f -o -type l >> base.list echo '%{_sysconfdir}/cockpit/machines.d' >> base.list echo %{buildroot}%{_datadir}/polkit-1/actions/org.cockpit-project.cockpit-bridge.policy >> base.list +%if 0%{?enable_old_bridge} && 0%{?build_basic} echo '%dir %{_datadir}/cockpit/ssh' >> base.list find %{buildroot}%{_datadir}/cockpit/ssh -type f >> base.list +%endif echo '%{_libexecdir}/cockpit-ssh' >> base.list +%if %{build_pcp} echo '%dir %{_datadir}/cockpit/pcp' > pcp.list find %{buildroot}%{_datadir}/cockpit/pcp -type f >> pcp.list +%endif echo '%dir %{_datadir}/cockpit/shell' >> system.list find %{buildroot}%{_datadir}/cockpit/shell -type f >> system.list @@ -378,7 +405,7 @@ # when not building basic packages, remove their files %if 0%{?build_basic} == 0 -for pkg in base1 branding motd kdump networkmanager selinux shell sosreport ssh static systemd users metrics; do +for pkg in base1 branding motd kdump networkmanager selinux shell sosreport static systemd users metrics; do rm -r %{buildroot}/%{_datadir}/cockpit/$pkg rm -f %{buildroot}/%{_datadir}/metainfo/org.cockpit-project.cockpit-${pkg}.metainfo.xml done @@ -387,7 +414,7 @@ done rm -r %{buildroot}/%{_prefix}/%{__lib}/tmpfiles.d find %{buildroot}/%{_unitdir}/ -type f ! -name 'cockpit-session*' -delete -for libexec in cockpit-askpass cockpit-beiboot cockpit-session cockpit-ws cockpit-tls cockpit-wsinstance-factory cockpit-client cockpit-client.ui cockpit-desktop cockpit-certificate-helper cockpit-certificate-ensure; do +for libexec in cockpit-askpass cockpit-session cockpit-ws cockpit-tls cockpit-wsinstance-factory cockpit-client cockpit-client.ui cockpit-desktop cockpit-certificate-helper cockpit-certificate-ensure; do rm -f %{buildroot}/%{_libexecdir}/$libexec done rm -r %{buildroot}/%{_sysconfdir}/pam.d %{buildroot}/%{_sysconfdir}/motd.d %{buildroot}/%{_sysconfdir}/issue.d @@ -500,9 +527,8 @@ %doc %{_mandir}/man1/cockpit-bridge.1.gz %{_bindir}/cockpit-bridge %{_libexecdir}/cockpit-askpass -%if %{cockpit_enable_python} +%if 0%{?enable_old_bridge} == 0 %{python3_sitelib}/%{name}* -%{_libexecdir}/cockpit-beiboot %endif %package doc @@ -835,7 +861,6 @@ The Cockpit component for managing storage. This package uses udisks. %files -n cockpit-storaged -f storaged.list -%dir %{_datadir}/cockpit/storaged/images %{_datadir}/metainfo/org.cockpit-project.cockpit-storaged.metainfo.xml %if 0%{?build_tests} @@ -867,6 +892,7 @@ %files devel %{_datadir}/cockpit/devel +%if %{build_pcp} %package -n cockpit-pcp Summary: Cockpit PCP integration Requires: cockpit-bridge >= %{required_base} @@ -882,6 +908,8 @@ %post -n cockpit-pcp systemctl reload-or-try-restart pmlogger +%endif + %package -n cockpit-packagekit Summary: Cockpit user interface for packages BuildArch: noarch ++++++ _service ++++++ --- /var/tmp/diff_new_pack.SNyYK9/_old 2024-01-04 15:57:28.260680038 +0100 +++ /var/tmp/diff_new_pack.SNyYK9/_new 2024-01-04 15:57:28.264680184 +0100 @@ -15,8 +15,8 @@ <param name="versionformat">@PARENT_TAG@</param> <param name="url">https://github.com/cockpit-project/cockpit.git/</param> <param name="scm">git</param> - <param name="revision">300.1</param> - <param name="submodules">disable</param> + <param name="revision">307</param> + <param name="submodules">enable</param> </service> <service name="node_modules" mode="manual"> <param name="cpio">node_modules.obscpio</param> ++++++ cockpit-300.1.obscpio -> cockpit-307.obscpio ++++++ /work/SRC/openSUSE:Factory/cockpit/cockpit-300.1.obscpio /work/SRC/openSUSE:Factory/.cockpit.new.28375/cockpit-307.obscpio differ: char 48, line 1 ++++++ cockpit.obsinfo ++++++ --- /var/tmp/diff_new_pack.SNyYK9/_old 2024-01-04 15:57:28.336682814 +0100 +++ /var/tmp/diff_new_pack.SNyYK9/_new 2024-01-04 15:57:28.340682960 +0100 @@ -1,5 +1,5 @@ name: cockpit -version: 300.1 -mtime: 1694073805 -commit: bfd923947db1fc27141e4ce418c7ef6d2a13ad3f +version: 307 +mtime: 1702553092 +commit: 508d13d593475780a9627d0eda1052a08859e941 ++++++ css-overrides.patch ++++++ --- /var/tmp/diff_new_pack.SNyYK9/_old 2024-01-04 15:57:28.372684129 +0100 +++ /var/tmp/diff_new_pack.SNyYK9/_new 2024-01-04 15:57:28.376684275 +0100 @@ -209,7 +209,7 @@ + <link href="../../static/css-overrides.css" type="text/css" rel="stylesheet" /> <script src="../base1/cockpit.js"></script> <script src="../manifests.js"></script> - <script src="../*/po.js"></script> + <!-- HACK: C bridge loads translations via glob and Python via manifest.js --> Index: cockpit/pkg/shell/shell.html =================================================================== --- cockpit.orig/pkg/shell/shell.html ++++++ node_modules.obscpio ++++++ /work/SRC/openSUSE:Factory/cockpit/node_modules.obscpio /work/SRC/openSUSE:Factory/.cockpit.new.28375/node_modules.obscpio differ: char 4333, line 17 ++++++ node_modules.spec.inc ++++++ ++++ 932 lines (skipped) ++++ between /work/SRC/openSUSE:Factory/cockpit/node_modules.spec.inc ++++ and /work/SRC/openSUSE:Factory/.cockpit.new.28375/node_modules.spec.inc ++++++ package-lock.json ++++++ ++++ 3130 lines (skipped) ++++ between /work/SRC/openSUSE:Factory/cockpit/package-lock.json ++++ and /work/SRC/openSUSE:Factory/.cockpit.new.28375/package-lock.json ++++++ storage-btrfs.patch ++++++ --- /var/tmp/diff_new_pack.SNyYK9/_old 2024-01-04 15:57:28.480688075 +0100 +++ /var/tmp/diff_new_pack.SNyYK9/_new 2024-01-04 15:57:28.484688221 +0100 @@ -1,7 +1,7 @@ diff --git a/pkg/storaged/format-dialog.jsx b/pkg/storaged/format-dialog.jsx index 05b1096..22db61b 100644 ---- a/pkg/storaged/format-dialog.jsx -+++ b/pkg/storaged/format-dialog.jsx +--- a/pkg/storaged/block/format-dialog.jsx ++++ b/pkg/storaged/block/format-dialog.jsx @@ -162,7 +162,8 @@ export function format_dialog(client, path, start, size, enable_dos_extended) { }
