PR#216: Update f38 to upstream release 306 - rpms/cockpit

rpms / cockpit

#216 Update f38 to upstream release 306

Merged 6 months ago by martinpitt. Opened 6 months ago by packit.

rpms/ packit/cockpit 306-f38-update-propose_downstream into f38

Packit • 6 months ago

2267494

.gitignore

file modified

		`@@ -275,3 +275,4 @@`
		`/cockpit-303.tar.xz`
		`/cockpit-304.tar.xz`
		`/cockpit-305.tar.xz`
		`+ /cockpit-306.tar.xz`

README.packit

file modified

+1 -1

		`@@ -1,3 +1,3 @@`
		`This repository is maintained by packit.`
		`https://packit.dev/`
		`- The file was generated using packit 0.85.0.post1.dev17+g1f3036b1.`
		`+ The file was generated using packit 0.87.0.`

cockpit.spec

file modified

+26 -2

		`@@ -49,7 +49,7 @@`
		`License: LGPL-2.1-or-later`
		`URL: https://cockpit-project.org/`

		`- Version: 305`
		`+ Version: 306`
		`Release: 1%{?dist}`
		`Source0: https://github.com/cockpit-project/cockpit/releases/download/%{version}/cockpit-%{version}.tar.xz`

		`@@ -86,6 +86,14 @@`
		`%define disallow_root 1`
		`%endif`

		`+ # pcp stopped building on ix86`
		`+ %define build_pcp 1`
		`+ %if 0%{?fedora} >= 40 \|\| 0%{?rhel} >= 10`
		`+ %ifarch %ix86`
		`+ %define build_pcp 0`
		`+ %endif`
		`+ %endif`
		`+`
		`# Ship custom SELinux policy (but not for cockpit-appstream)`
		`%if "%{name}" == "cockpit"`
		`%define selinuxtype targeted`
		`@@ -124,15 +132,19 @@`
		`BuildRequires: systemd-devel >= 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`
		`%else`
		`+ %if %{build_pcp}`
		`BuildRequires: pcp-libs-devel`
		`+ %endif`
		`BuildRequires: openssh-clients`
		`BuildRequires: docbook-style-xsl`
		`%endif`
		`@@ -199,6 +211,9 @@`
		`%if 0%{?build_basic} == 0`
		`--disable-ssh \`
		`%endif`
		`+ %if %{build_pcp} == 0`
		`+ --disable-pcp \`
		`+ %endif`

		`%make_build`

		`@@ -230,8 +245,10 @@`
		`%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`
		`@@ -424,7 +441,7 @@`
		`Recommends: (reportd if abrt)`
		`%endif`

		`- Provides: bundled(npm(@babel/runtime)) = 7.23.2`
		`+ Provides: bundled(npm(@babel/runtime)) = 7.23.4`
		`Provides: bundled(npm(@patternfly/patternfly)) = 5.1.0`
		`Provides: bundled(npm(@patternfly/react-core)) = 5.1.1`
		`Provides: bundled(npm(@patternfly/react-icons)) = 5.1.1`
		`@@ -755,6 +772,8 @@`
		`%{_unitdir}/cockpit-session.socket`
		`%{_unitdir}/cockpit-session@.service`

		`+ %if %{build_pcp}`
		`+`
		`%package -n cockpit-pcp`
		`Summary: Cockpit PCP integration`
		`Requires: cockpit-bridge >= %{required_base}`
		`@@ -770,6 +789,8 @@`
		`%post -n cockpit-pcp`
		`systemctl reload-or-try-restart pmlogger`

		`+ %endif`
		`+`
		`%package -n cockpit-packagekit`
		`Summary: Cockpit user interface for packages`
		`BuildArch: noarch`
		`@@ -790,6 +811,9 @@`

		`# The changelog is automatically generated and merged`
		`%changelog`
		`+ * Wed Nov 29 2023 Packit <hello@packit.dev> - 306-1`
		`+ - Kdump: Add Ansible/shell automation`
		`+`
		`* Wed Nov 15 2023 Packit <hello@packit.dev> - 305-1`
		`- Performance and stability improvements`

sources

file modified

+1 -1

		`@@ -1,1 +1,1 @@`
		`- SHA512 (cockpit-305.tar.xz) = d1fc38b4f1566bcab79fc4558a072955ba100fbda9f13af694fe060225ee3c84de5d15a146784ba816711bf51d0203986192c7ab720f4ec6a7044125340204a7`
		`+ SHA512 (cockpit-306.tar.xz) = aed080a00d4cac50a87fdf22b92635e9f63b0944103868d0e666798380309acdc06de62ff26846f87c5d894b2383b4fee6ad720f4a4105ebe8e75b8ff768c8b8`

packit commented 6 months ago

Upstream tag: 306
Upstream commit: 516cc081

If you need to do any change in this pull request, you can clone Packit's fork and push directly to the source branch of this PR (provided you have commit access to this repository):

git clone ssh://$YOUR_USER@pkgs.fedoraproject.org/forks/packit/rpms/cockpit.git
cd cockpit
git checkout 306-f38-update-propose_downstream
git push origin 306-f38-update-propose_downstream

Alternatively, if you already have the package repository cloned, you can just fetch the Packit's fork:

cd cockpit
git remote add packit ssh://$YOUR_USER@pkgs.fedoraproject.org/forks/packit/rpms/cockpit.git
git fetch packit refs/heads/306-f38-update-propose_downstream
git checkout 306-f38-update-propose_downstream
git push packit 306-f38-update-propose_downstream

If you have the koji_build job configured as well, make sure to configure the allowed_pr_authors and/or allowed_committers (see the docs) since by default, Packit reacts only to its own PRs.

Before pushing builds/updates, please remember to check the new version against the packaging guidelines.

For example, please: